Commits

Matt Ryall committed 6e0a285 Draft Merge

Merge latest from Bitbucket

Comments (0)

Files changed (3)

 443e27a5bad0c657413f65a4b6097cad96ec499b confluence-tokengroups-plugin-1.0
 280e1588ad01dd84f9888a844032439ef3fb101b confluence-tokengroups-plugin-1.1
 740a6fb594f4b8be49624c6a93af6685a56efd9e confluence-tokengroups-plugin-1.2
+cc315ea173d8e6a0a6483d6720f6ee17afdeb0a5 confluence-tokengroups-plugin-1.3
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.atlassian.confluence.user.tokengroups</groupId>
     <artifactId>confluence-tokengroups-plugin</artifactId>
-    <version>1.3-SNAPSHOT</version>
+    <version>1.4-SNAPSHOT</version>
 
     <organization>
         <name>Atlassian</name>

src/main/java/com/atlassian/confluence/user/tokengroups/TokenGroupsAutoGroupAdderListener.java

 {
     private static final org.slf4j.Logger log = LoggerFactory.getLogger(TokenGroupsAutoGroupAdderListener.class);
 
-    private static final String TOKEN_GROUPS_ATTRIBUTE = "tokenGroups";
-    private static final String AUTO_GROUPS_ADDED = "autoGroupsAdded";
+    private static final String TOKEN_GROUPS_ADDED = "tokenGroupsAdded";
 
     private DirectoryInstanceLoader directoryInstanceLoader;
     private LDAPDirectoryInstanceLoader ldapDirectoryInstanceLoader;
 
             // Do not proceed if the user has authenticated successfully before
             UserWithAttributes localUser = delegatedDirectory.findUserWithAttributesByName(user.getName());
-            if (!settingsManager.isAlwaysUpdate() && Boolean.parseBoolean(localUser.getValue(AUTO_GROUPS_ADDED)))
+            if (!settingsManager.isAlwaysUpdate() && Boolean.parseBoolean(localUser.getValue(TOKEN_GROUPS_ADDED)))
                 return;
 
             log.info("Finding token groups for user '{}'", user.getName());
             }
 
             delegatedDirectory.storeUserAttributes(user.getName(),
-                ImmutableMap.of(AUTO_GROUPS_ADDED, Collections.singleton(Boolean.TRUE.toString())));
+                ImmutableMap.of(TOKEN_GROUPS_ADDED, Collections.singleton(Boolean.TRUE.toString())));
         }
         catch (DirectoryInstantiationException e)
         {