Merge branch 'release/1.5.1'

grails · May 6, 2015 · d681aae · d681aae
2 parents 5709f2d + c710b91
commit d681aae
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/SpringSecurityRestGrailsPlugin.groovy b/SpringSecurityRestGrailsPlugin.groovy
@@ -31,7 +31,7 @@ import javax.servlet.http.HttpServletResponse
 
 class SpringSecurityRestGrailsPlugin {
 
-    String version = "1.5.0"
+    String version = "1.5.1"
     String grailsVersion = "2.0 > *"
     List loadAfter = ['springSecurityCore']
     List pluginExcludes = [

diff --git a/src/docs/guide/introduction.gdoc b/src/docs/guide/introduction.gdoc
@@ -36,6 +36,8 @@ h4. Release History
 
 You can view all releases at https://github.com/alvarosanchez/grails-spring-security-rest/releases.
 
+* 6 May 2015
+** [1.5.1|https://github.com/alvarosanchez/grails-spring-security-rest/issues?q=milestone%3A1.5.1+is%3Aclosed]
 * 6 May 2015
 ** [1.5.0|https://github.com/alvarosanchez/grails-spring-security-rest/issues?q=milestone%3A1.5.0+is%3Aclosed]
 * 21 April 2015

diff --git a/src/groovy/grails/plugin/springsecurity/rest/RestAuthenticationProvider.groovy b/src/groovy/grails/plugin/springsecurity/rest/RestAuthenticationProvider.groovy
@@ -63,7 +63,7 @@ class RestAuthenticationProvider implements AuthenticationProvider {
                 log.debug "Now is ${now} and token expires at ${expiry}"
 
                 TimeDuration timeDuration = TimeCategory.minus(expiry, now)
-                expiration = timeDuration.seconds
+                expiration = Math.round(timeDuration.toMilliseconds() / 1000)
                 log.debug "Expiration: ${expiration}"
             }