v0.1.31.beta7. fixes #90

lynndylanhurley · Jan 7, 2015 · 9634a82 · 9634a82
1 parent 3506fd8
commit 9634a82
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -31,7 +31,7 @@ GIT
 PATH
   remote: .
   specs:
-    devise_token_auth (0.1.31.beta6)
+    devise_token_auth (0.1.31.beta7)
       devise (~> 3.3)
       rails (~> 4.2)
 

diff --git a/app/models/devise_token_auth/concerns/user.rb b/app/models/devise_token_auth/concerns/user.rb
@@ -169,13 +169,13 @@ def build_auth_header(token, client_id='default')
 
     # client may use expiry to prevent validation request if expired
     # must be cast as string or headers will break
-    expiry = self.tokens[client_id]['expiry'].to_s
+    expiry = self.tokens[client_id]['expiry'] || self.tokens[client_id][:expiry]
 
     return {
       "access-token" => token,
       "token-type"   => "Bearer",
       "client"       => client_id,
-      "expiry"       => expiry,
+      "expiry"       => expiry.to_s,
       "uid"          => self.uid
     }
   end

diff --git a/lib/devise_token_auth/version.rb b/lib/devise_token_auth/version.rb
@@ -1,3 +1,3 @@
 module DeviseTokenAuth
-  VERSION = "0.1.31.beta6"
+  VERSION = "0.1.31.beta7"
 end