openstax_connect 0.0.4 → 0.0.5

data/app/controllers/openstax/connect/application_controller.rb

@@ -5,7 +5,7 @@ module OpenStax
   module Connect
 
     # Inherit from the applications ApplicationController to share some methods
-    class ApplicationController < ::ApplicationController
+    class ApplicationController < ActionController::Base
       include Lev::HandleWith
     end
 

data/app/controllers/openstax/connect/sessions_controller.rb

@@ -15,30 +15,34 @@ module OpenStax
         handle_with(SessionsOmniauthAuthenticated,
                     complete: lambda { 
                       sign_in(@handler_result.outputs[:connect_user_to_sign_in])
-                      redirect_to return_path(true)
+                      redirect_to return_url(true)
                     })
       end
 
       def destroy
         sign_out!
-        redirect_to return_path, notice: "Signed out!"
+        # Need to sign out on the services site so can't log back in automagically
+        redirect_to OpenStax::Utilities.generate_url(
+                      OpenStax::Connect.configuration.openstax_services_url + "/logout",
+                      return_to: return_url
+                    )
       end
 
       def failure
-        redirect_to return_path, alert: "Authentication failed, please try again."
+        redirect_to return_url, alert: "Authentication failed, please try again."
       end
 
       def become
         raise SecurityTransgression unless !Rails.env.production? || current_user.is_administrator?
         sign_in(User.find(params[:user_id]))
-        redirect_to return_path(true)
+        redirect_to return_url(true)
       end
 
     protected
 
-      def return_path(include_referrer=false)
+      def return_url(include_referrer=false)
         referrer = include_referrer ? request.referrer : nil
-        params[:return_to] || session.delete(:return_to) || referrer || main_app.root_path
+        params[:return_to] || session.delete(:return_to) || referrer || main_app.root_url
       end
 
     end

data/app/handlers/openstax/connect/dev/users_create.rb

@@ -2,6 +2,8 @@ module OpenStax::Connect::Dev
   class UsersCreate
     lev_handler
 
+  # this code might be OBE
+
   protected
 
     def authorized?
@@ -13,7 +15,7 @@ module OpenStax::Connect::Dev
         user.first_name = params[:register][:first_name]
         user.last_name = params[:register][:last_name]
         user.username = params[:register][:username]
-        user.is_administrator = params[:register][:is_administrator]
+        # user.is_administrator = params[:register][:is_administrator]
         user.openstax_uid = available_openstax_uid
       end
     

data/app/routines/openstax/connect/dev/create_user.rb

@@ -0,0 +1,33 @@
+module OpenStax::Connect::Dev
+  class CreateUser
+    lev_routine
+
+  protected
+
+    def exec(inputs={})
+
+      username = inputs[:username]
+
+      if username.nil? || inputs[:ensure_no_errors]
+        loop do 
+          break if !username.nil? && OpenStax::Connect::User.where(username: username).none?
+          username = "#{inputs[:username] || 'user'}#{rand(1000000)}"
+        end
+      end
+
+      outputs[:user] = OpenStax::Connect::User.create do |user|
+        user.first_name = inputs[:first_name]
+        user.last_name = inputs[:last_name]
+        user.username = username
+        user.openstax_uid = available_negative_openstax_uid
+      end
+    
+      transfer_errors_from(outputs[:user], {type: :verbatim})
+    end
+
+    def available_negative_openstax_uid
+      (OpenStax::Connect::User.order("openstax_uid DESC").last.try(:openstax_uid) || 0) - 1
+    end
+
+  end
+end

data/lib/openstax/connect/current_user_manager.rb

@@ -12,8 +12,8 @@ module OpenStax::Connect
 
     # Returns the current app user
     def current_user
-      refresh_current_users if @current_app_user.nil?
-      @current_app_user
+      load_current_users
+      @app_current_user
     end
 
     # Signs in the given user; the argument can be either a connect user or
@@ -36,51 +36,46 @@ module OpenStax::Connect
 
   protected
 
-    # Refreshes the current connect user (if needed) and returns it.
+    # Returns the current connect user
     def connect_current_user
-      refresh_current_users if @connect_current_user.nil?
+      load_current_users
       @connect_current_user
     end  
 
-    def refresh_current_users
+    # If they are nil (unset), sets the current users based on the session state
+    def load_current_users
+      return if !@connect_current_user.nil?
+
       if @request.ssl? && @cookies.signed[:secure_user_id] != "secure#{@session[:user_id]}"
         sign_out! # hijacked
       else
-        new_connect_current_user = @connect_current_user || User.anonymous
-        new_connect_current_user = User.where(id: @session[:user_id]).first \
-          if new_connect_current_user.is_anonymous? && @session[:user_id]
-
-        # changes both current and app user
-        self.connect_current_user = new_connect_current_user
+        @connect_current_user = @session[:user_id] ?
+          User.where(id: @session[:user_id]).first :
+          User.anonymous
+        @app_current_user = user_provider.connect_user_to_app_user(@connect_current_user)
       end
     end
 
     # Sets (signs in) the provided app user.
     def current_user=(user)
       self.connect_current_user = user_provider.app_user_to_connect_user(user)
-      @current_app_user
+      @app_current_user
     end
 
-    # Sets the current connect user, updating the session and cookie state, also 
-    # updates the cache of the current app user.
+    # Sets the current connect user, updates the app user, and also updates the
+    # session and cookie state.
     def connect_current_user=(user)
-      user ||= User.anonymous
-      @connect_current_user ||= User.anonymous
-
-      if user != @connect_current_user
-        @connect_current_user = user
-        @current_app_user = nil # changed connect user so invalidate the app user
-
-        if @connect_current_user.is_anonymous?
-          @session[:user_id] = nil
-          @cookies.delete(:secure_user_id)
-        else
-          @session[:user_id] = @connect_current_user.id
-          @cookies.signed[:secure_user_id] = {secure: true, value: "secure#{@connect_current_user.id}"}
-        end
+      @connect_current_user = user || User.anonymous
+      @app_current_user = user_provider.connect_user_to_app_user(@connect_current_user)
+
+      if @connect_current_user.is_anonymous?
+        @session[:user_id] = nil
+        @cookies.delete(:secure_user_id)
+      else
+        @session[:user_id] = @connect_current_user.id
+        @cookies.signed[:secure_user_id] = {secure: true, value: "secure#{@connect_current_user.id}"}
       end
 
-      @current_app_user ||= user_provider.connect_user_to_app_user(@connect_current_user)
       @connect_current_user
     end
 

data/lib/openstax/connect/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openstax_connect
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-09 00:00:00.000000000 Z
+date: 2013-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -146,11 +146,11 @@ files:
 - app/helpers/openstax/connect/application_helper.rb
 - app/helpers/openstax/connect/sessions_helper.rb
 - app/models/openstax/connect/user.rb
+- app/routines/openstax/connect/dev/create_user.rb
 - app/routines/openstax/connect/search_users.rb
 - app/views/layouts/openstax/connect/application.html.erb
 - app/views/openstax/connect/dev/users/index.html.erb
 - app/views/openstax/connect/dev/users/search.js.erb
-- app/views/openstax/connect/sessions/create.html.erb
 - app/views/openstax/connect/shared/_attention.html.erb
 - app/views/openstax/connect/users/_action_create_form.html.erb
 - app/views/openstax/connect/users/_action_dialog.html.erb
@@ -189,7 +189,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3664854018823148928
+      hash: 1060826092135377802
 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: 3664854018823148928
+      hash: 1060826092135377802
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25

data/app/views/openstax/connect/sessions/create.html.erb

@@ -1,10 +0,0 @@
-<h1>Sessions#create</h1>
-<p>Find me in app/views/openstax/connect/sessions/create.html.erb</p>
-
-<hr/>
-
-<%= request.env['omniauth.auth'] %>
-
-<hr/>
-
-<%= session.inspect %>