openstax_connect 0.0.5 → 0.0.6

data/lib/openstax/connect/current_user_manager.rb

@@ -49,9 +49,22 @@ module OpenStax::Connect
       if @request.ssl? && @cookies.signed[:secure_user_id] != "secure#{@session[:user_id]}"
         sign_out! # hijacked
       else
-        @connect_current_user = @session[:user_id] ?
-          User.where(id: @session[:user_id]).first :
-          User.anonymous
+        # If there is a session user_id, load up that user, otherwise set the anonymous user.
+       
+        if @session[:user_id]
+          @connect_current_user = User.where(id: @session[:user_id]).first
+
+          # It could happen (normally in development) that there is a session user_id that 
+          # doesn't map to a User in the db.  In such a case, sign_out! to reset the state
+          if @connect_current_user.nil?
+            sign_out!
+            return
+          end
+        else
+          @connect_current_user = User.anonymous
+        end
+
+        # bring the app user inline with the connect user
         @app_current_user = user_provider.connect_user_to_app_user(@connect_current_user)
       end
     end

data/lib/openstax/connect/version.rb

@@ -1,5 +1,5 @@
 module OpenStax
   module Connect
-    VERSION = "0.0.5"
+    VERSION = "0.0.6"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openstax_connect
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-11 00:00:00.000000000 Z
+date: 2013-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -189,7 +189,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1060826092135377802
+      hash: 1536200191300701933
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -198,7 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1060826092135377802
+      hash: 1536200191300701933
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25