dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 22140
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2016-03-04 11:27:51 +0100
message:
  User details service, minor
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	2016-03-04 10:12:52 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/DefaultUserDetailsService.java	2016-03-04 10:27:51 +0000
@@ -84,9 +84,7 @@
 
         boolean credentialsNonExpired = userService.credentialsNonExpired( credentials );
 
-        boolean enabled = !credentials.isDisabled() && !credentials.isExternalAuth();
-        
         return new User( credentials.getUsername(), credentials.getPassword(),
-            enabled, true, credentialsNonExpired, true, SecurityUtils.getGrantedAuthorities( credentials ) );
+            !credentials.isDisabled(), true, credentialsNonExpired, true, SecurityUtils.getGrantedAuthorities( credentials ) );
     }
 }