uber_login 2.2.0 → 2.2.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZGRhZTQ5MjJjMDllYzc1NWIyZGVlZDA5MzczZmMwYjA2YjJkMGZhNw==
+    ZTkxZWIxMGZiMzM0MTVjMzE2YTFkODEyMTk5NTQ4MWVhMTg0ZmU4MA==
   data.tar.gz: !binary |-
-    MTdjMjU4OTM5ZGM2ZWE0NGFiZjcwZTU1ZGY0MGFjYzYzMGUxZDM4OA==
+    NTRiY2EwNjc3Njk0MDBlYjQ2YWYwZjkzNmUwZDU2MjRhNDM3OGQ0ZQ==
 SHA512:
   metadata.gz: !binary |-
-    ZmUxY2NmOWZkMTYwNDAxZjYyMzEwMTkxMzgwZmQ2MGZlMzNjZTNlMDhhYzJh
-    MDE0NTAzMjlkZGE5MjIwMzdjODJlMGRlMGQxNGYzN2Y2Yjk1NWY4ZjY0YTcw
-    ODNjZmVjYzVkNDAxMGE3ZDE0YWRlZGJlMDcyYWI5ZjU4MWU3M2M=
+    NWFlODA0OThhOGIxYzgzNGY0MWI5OTM4Njc0ZmE1OTgzMzA0MjVlNzFlMzEw
+    ODZhMDJhZTVmMzMzYTdkN2I0ODYxNzc2NDhjYTcwYTc1NTEwOTc0YjZjNDEw
+    MmU5YjNhZjllN2VlY2MxODljMzk0MWFjNTE4YjczNzE1ZGFiZDc=
   data.tar.gz: !binary |-
-    YjU3MjE4MzkzNGI0NmM3N2FlNjcwN2QxNTJjYmJhODQ2NGQwMDgyN2ExMWEy
-    YTI1NWNmNjljYjNiM2QxYTBlMDk4NmRmZjJkZTZhZTUzZmRjZWY2MjM2OWQ3
-    NDJjNWY4YmZkYzM1MTI2ZWZlYjhkMTQ0MjdjMmQwODBkNDA0YWE=
+    ZGMyOGJjYzVhYmQ4YzlmMzFhOGU1YWJhN2Y0MTZjYzZhMjFlNGM0OWFiMTgx
+    NjVkNzZmODUzODEzNDM3OWU1NTFhZWFmZmU0NmUwMWMwNmVjNDIzYTU5ZjZm
+    MDdlMTI1YWM1N2Q4ZDVmNzQyYTMxYmM5ODczZGJiOWYxZjg5ZjU=

data/lib/uber_login/storage.rb

@@ -2,7 +2,7 @@ module UberLogin
   class Storage
     class << self
       def find(uid, sequence)
-        LoginToken.find_by(uid: uid, sequence: sequence)
+        LoginToken.where(uid: uid, sequence: sequence).first
       end
 
       def find_composite(uid, composite)

data/lib/uber_login/version.rb

@@ -1,3 +1,3 @@
 module UberLogin
-  VERSION = '2.2.0'
+  VERSION = '2.2.1'
 end

data/lib/uber_login.rb

@@ -43,17 +43,18 @@ module UberLogin
   def login(user, remember = false)
     logout_all unless UberLogin.configuration.allow_multiple_login
     @login_from_cookies = false
+    uid = get_uid(user)
 
     run_callbacks :login do
       if strong_sessions or remember
-        composite = generate_and_save_token(user.id)
-        cookie_manager.persistent_login(user.id, composite) if remember
+        composite = generate_and_save_token(uid)
+        cookie_manager.persistent_login(uid, composite) if remember
       else
         composite = nil
       end
 
       reset_session
-      session_manager.login(user.id, composite)
+      session_manager.login(uid, composite)
     end
   end
 
@@ -194,6 +195,11 @@ module UberLogin
     UberLogin.configuration.strong_sessions
   end
 
+  def get_uid(user)
+    uid = user.id
+    uid = uid.to_s if uid.is_a? BSON::ObjectId
+  end
+
   def current_sequence
     TokenEncoder.sequence(cookies[:ulogin] || session[:ulogin])
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uber_login
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Francesco Boffa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-02 00:00:00.000000000 Z
+date: 2014-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: useragent