lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #274 from bsinno/fix_dialog_window_must_not_close_after_save_if_duplicate_exists

Browse Source 
Fix for the dialog window must not close after save if duplicate exists.
This commit is contained in:
Kai Zimmermann
2016-09-01 11:37:58 +02:00
committed by GitHub
parent 63b12b0ac1 1620385e35
commit 2f415c4839
29 changed files with 510 additions and 432 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpControllerAuthentfication.java
View File

@@ -24,7 +24,7 @@ import org.eclipse.hawkbit.security.ControllerPreAuthenticatedGatewaySecurityTok
import org.eclipse.hawkbit.security.ControllerPreAuthenticatedSecurityHeaderFilter;
import org.eclipse.hawkbit.security.DdiSecurityProperties;
import org.eclipse.hawkbit.security.PreAuthTokenSourceTrustAuthenticationProvider;
import org.eclipse.hawkbit.security.PreAuthenficationFilter;
import org.eclipse.hawkbit.security.PreAuthentificationFilter;
import org.eclipse.hawkbit.security.SystemSecurityContext;
import org.eclipse.hawkbit.tenancy.TenantAware;
import org.slf4j.Logger;
@@ -45,7 +45,7 @@ public class AmqpControllerAuthentfication {
private final PreAuthTokenSourceTrustAuthenticationProvider preAuthenticatedAuthenticationProvider;
private final List<PreAuthenficationFilter> filterChain = new ArrayList<>();
private final List<PreAuthentificationFilter> filterChain = new ArrayList<>();
@Autowired
private ControllerManagement controllerManagement;
@@ -107,7 +107,7 @@ public class AmqpControllerAuthentfication {
*/
public Authentication doAuthenticate(final TenantSecurityToken secruityToken) {
PreAuthenticatedAuthenticationToken authentication = new PreAuthenticatedAuthenticationToken(null, null);
for (final PreAuthenficationFilter filter : filterChain) {
for (final PreAuthentificationFilter filter : filterChain) {
final PreAuthenticatedAuthenticationToken authenticationRest = createAuthentication(filter, secruityToken);
if (authenticationRest != null) {
authentication = authenticationRest;
@@ -119,7 +119,7 @@ public class AmqpControllerAuthentfication {
}
private static PreAuthenticatedAuthenticationToken createAuthentication(final PreAuthenficationFilter filter,
private static PreAuthenticatedAuthenticationToken createAuthentication(final PreAuthentificationFilter filter,
final TenantSecurityToken secruityToken) {
if (!filter.isEnable(secruityToken)) {