------------------------------------------------------------
revno: 20995
committer: Lars Helge Overland <[email protected]>
branch nick: dhis2
timestamp: Mon 2015-11-09 16:44:27 +0100
message:
User, disabled if external auth
modified:
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/DefaultUserDetailsService.java
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/DefaultUserDetailsService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/DefaultUserDetailsService.java 2015-11-08 13:56:42 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/DefaultUserDetailsService.java 2015-11-09 15:44:27 +0000
@@ -56,7 +56,9 @@
boolean credentialsExpired = userService.credentialsNonExpired( credentials );
+ boolean enabled = !credentials.isDisabled() && !credentials.isExternalAuth();
+
return new User( credentials.getUsername(), credentials.getPassword(),
- !credentials.isDisabled(), true, credentialsExpired, true, SecurityUtils.getGrantedAuthorities( credentials ) );
+ enabled, true, credentialsExpired, true, SecurityUtils.getGrantedAuthorities( credentials ) );
}
}
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : [email protected]
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
