[jira_http_authentication] 09/13: JIRA 7 compatibility; change from User to ApplicationUser

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch master
in repository jira_http_authentication.

View the commit online:
http://git.shibboleth.net/view/?p=jira_http_authentication.git;a=commit;h=4ed25a8485e5c08e16f29d50ddd9e02aa4116538

commit 4ed25a8485e5c08e16f29d50ddd9e02aa4116538
Author: Jaakko Linnosaari <jaakko.linnosaari at polarshift.fi>
AuthorDate: Wed Dec 23 16:22:48 2015 +0200

    JIRA 7 compatibility; change from User to ApplicationUser
    
     - https://developer.atlassian.com/jiradev/latest-updates/preparing-for-jira-7-0/jira-7-0-api-changes
     - https://developer.atlassian.com/jiradev/latest-updates/preparing-for-jira-7-0/jira-7-0-platform-changes
---
 pom.xml                                                              | 4 ++--
 .../net/shibboleth/tools/jira/authn/RemoteUserAuthenticator.java     | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0b54156..698649b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
-            <version>2.3</version>
+            <version>2.5</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -35,7 +35,7 @@
         <dependency>
             <groupId>com.atlassian.jira</groupId>
             <artifactId>jira-core</artifactId>
-            <version>6.2</version>
+            <version>7.0.0</version>
             <scope>provided</scope>
             <exclusions>
                 <exclusion>
diff --git a/src/main/java/net/shibboleth/tools/jira/authn/RemoteUserAuthenticator.java b/src/main/java/net/shibboleth/tools/jira/authn/RemoteUserAuthenticator.java
index 41b6dd4..515ed4d 100644
--- a/src/main/java/net/shibboleth/tools/jira/authn/RemoteUserAuthenticator.java
+++ b/src/main/java/net/shibboleth/tools/jira/authn/RemoteUserAuthenticator.java
@@ -52,6 +52,8 @@ import com.atlassian.jira.component.ComponentAccessor;
 import com.atlassian.jira.security.groups.GroupManager;
 import com.atlassian.jira.security.login.JiraSeraphAuthenticator;
 import com.atlassian.jira.security.login.LoginManager;
+import com.atlassian.jira.user.ApplicationUser;
+import com.atlassian.jira.user.ApplicationUsers;
 import com.atlassian.jira.user.util.UserManager;
 import com.atlassian.seraph.auth.AuthenticatorException;
 import com.atlassian.seraph.auth.LoginReason;
@@ -292,9 +294,10 @@ public class RemoteUserAuthenticator extends JiraSeraphAuthenticator {
             }
 
             User crowdUser = crowdService.getUser(user.getName());
+            ApplicationUser applicationUser = ApplicationUsers.from(crowdUser);
             Collection purgeMappers = config.getPurgeMappings();
 
-            Collection<String> roles = groupManager.getGroupNamesForUser(crowdUser);
+            Collection<String> roles = groupManager.getGroupNamesForUser(applicationUser);
             Iterator<String> i = roles.iterator();
             while (i.hasNext()) {
                 String role = i.next();

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.