Merge pull request #375 from gschueler/feature/issue-327-api-token-ro…

…les-column Fix too-long value for api token roles, fixes #327
rundeck · Apr 24, 2013 · f81228a · f81228a
2 parents 16e35f0 + 29d8c9f
commit f81228a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/rundeckapp/grails-app/controllers/rundeck/controllers/UserController.groovy b/rundeckapp/grails-app/controllers/rundeck/controllers/UserController.groovy
@@ -184,8 +184,7 @@ class UserController {
                 while(AuthToken.findByToken(newtoken) != null){
                     newtoken = genRandomString()
                 }
-                final userroles = request.subject?.getPrincipals(com.dtolabs.rundeck.core.authentication.Group.class).collect { it.name }
-                AuthToken token = new AuthToken(token:newtoken,authRoles: userroles.join(","),user:u)
+                AuthToken token = new AuthToken(token:newtoken, authRoles: 'api_token_group',user:u)
 
                 if(token.save()){
                     log.debug("GENERATE TOKEN ${newtoken} for User ${login} with roles: ${token.authRoles}")

diff --git a/rundeckapp/grails-app/domain/rundeck/AuthToken.groovy b/rundeckapp/grails-app/domain/rundeck/AuthToken.groovy
@@ -25,4 +25,7 @@ class AuthToken {
         authRoles(nullable:false)
         user(nullable:false)
     }
+    static mapping = {
+        authRoles type: 'text'
+    }
 }