openstax_accounts 9.0.5 → 9.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52c5a3872725bd1198629d59c0660cdcc7f75d7bf09e32640deb56d772922477
-  data.tar.gz: f48649499a41fa83f48ae34274cab542166bb61401d5edb3583c07f38c29c5bb
+  metadata.gz: 48ae6fdbc68368694770f436f5a7a4e57dea39b18c93b2791308aace6b07a02a
+  data.tar.gz: bbfbe2609b86b3b216ad0a94c7bf41b7c6bc1b29ea65e4a99388288dfcc80f7f
 SHA512:
-  metadata.gz: 5a266e70528d538b2dabf9722ec10e20423e5e7e47e86846019db502e5079276e216d18347985f20b22bbacfdaecd25e6263b0a38b7032289ed25cf2cbbde4ca
-  data.tar.gz: ea546ef8e9fddb0d245ceeb8cbf6c9e4b9e0856eef81976c80b7f70ebac9b6aee3e1fcc56df1e7b9c9f708ca9178898173f5da7a46ce4e2191f25f4708eb960f
+  metadata.gz: 29b93ef99bbb0ee170f4619269e79dd94fd89634a328985d55a057b9f0c85980480fdf8bfe47d4e946fb9dfc42e3a91c7e087a1825b8067c7c4a68d27e56f70f
+  data.tar.gz: dd689a226b1f8c92be65d8543c917b35af81eafa9a90f9de3b718fc2cf7b14e4df0ed7f64aff883bc2cf2141bfe1122dffadb9841a7cf0b1df9147e7b419779c

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

@@ -10,8 +10,7 @@ module OpenStax
         if configuration.enable_stubbing?
           redirect_to dev_accounts_path
         else
-          forwardable_params =
-            params.permit(*configuration.forwardable_login_param_keys.map(&:to_s)).to_h
+          forwardable_params = params.permit(*configuration.forwardable_login_params).to_h
           redirect_to openstax_login_path(forwardable_params)
         end
       end
@@ -28,14 +27,18 @@ module OpenStax
       end
 
       def destroy
-        sign_out!
-
-        # Unless we are stubbing, we redirect to a configurable URL, which is normally
-        # (or at least eventually) the Accounts logout URL so that users can't sign back
-        # in automagically.
-        redirect_to configuration.enable_stubbing? ?
-                    main_app.root_url :
-                    configuration.logout_redirect_url(request)
+        # if a handler is configured, let it handle everything
+        if configuration.logout_handler
+          configuration.logout_handler.call(self)
+        else
+          # Unless we are stubbing, we redirect to a configurable URL, which is normally
+          # (or at least eventually) the Accounts logout URL so that users can't sign back
+          # in automagically.
+          sign_out!
+          redirect_to configuration.enable_stubbing? ?
+                        main_app.root_url :
+                        configuration.logout_redirect_url(request)
+        end
       end
 
       def failure

data/app/models/openstax/accounts/account.rb

@@ -16,7 +16,8 @@ module OpenStax::Accounts
       :salesforce_contact_id,
       :support_identifier,
       :is_test,
-      :is_kip
+      :is_kip,
+      :grant_tutor_access
     ]
 
     attr_accessor :syncing

data/app/representers/openstax/accounts/api/v1/account_representer.rb

@@ -117,6 +117,12 @@ module OpenStax
                    schema_info: {
                      description: 'Whether or not this is a Key Institutional Partner account'
                    }
+
+          property :grant_tutor_access,
+                   type: :boolean,
+                   schema_info: {
+                     description: 'Whether or not the account should be granted Tutor access'
+                   }
         end
       end
     end

data/app/routines/openstax/accounts/find_or_create_account.rb

@@ -7,7 +7,8 @@ module OpenStax
 
       def exec(email: nil, username: nil, password: nil, first_name: nil, last_name: nil,
                full_name: nil, title: nil, salesforce_contact_id: nil, faculty_status: nil,
-               role: nil, school_type: nil, school_location: nil, is_kip: nil, is_test: nil)
+               role: nil, school_type: nil, school_location: nil, is_kip: nil,
+               grant_tutor_access: nil, is_test: nil)
         raise(
           ArgumentError,
           'You must specify either an email address or a username (and an optional password)'
@@ -24,7 +25,7 @@ module OpenStax
             first_name: first_name, last_name: last_name, full_name: full_name,
             salesforce_contact_id: salesforce_contact_id, faculty_status: faculty_status,
             role: role, school_type: school_type, school_location: school_location,
-            is_kip: is_kip, is_test: is_test
+            is_kip: is_kip, grant_tutor_access: grant_tutor_access, is_test: is_test
           )
           fatal_error(code: :invalid_inputs) unless (200..202).include?(response.status)
 
@@ -49,6 +50,7 @@ module OpenStax
           account.school_location = school_location || :unknown_school_location
           account.support_identifier = support_identifier
           account.is_kip = is_kip
+          account.grant_tutor_access = grant_tutor_access
           account.is_test = is_test
         end
 

data/db/migrate/18_add_grant_tutor_access_to_openstax_accounts_accounts.rb

@@ -0,0 +1,5 @@
+class AddGrantTutorAccessToOpenStaxAccountsAccounts < ActiveRecord::Migration[5.2]
+  def change
+    add_column :openstax_accounts_accounts, :grant_tutor_access, :boolean
+  end
+end

data/lib/openstax/accounts/configuration.rb

@@ -53,16 +53,23 @@ module OpenStax
       # If more would be returned, the result will be empty instead
       attr_accessor :max_search_items
 
+      # logout_handler
+      # Handles logging out and redirecting user when they've requested logout
+      # if specified, the logout_redirect_url has no effect
+      attr_accessor :logout_handler
+
       # logout_redirect_url
       # A URL to redirect to after the app logs out, can be a string or a Proc.
       # If a Proc (or lambda), it will be called with the logout request.
+      #
+      # Only used if the logout_handler above is not specified
       # If this field is nil or if the Proc returns nil, the logout will redirect
       # to the default Accounts logout URL.
       attr_writer :logout_redirect_url
 
-      # forwardable_login_param_keys
+      # forwardable_login_params
       # Which params are forwarded on the accounts login path
-      attr_accessor :forwardable_login_param_keys
+      attr_accessor :forwardable_login_params
 
       # max_user_updates_per_request
       # When the user profile sync operation is called, this parameter will limit
@@ -117,12 +124,13 @@ module OpenStax
         @account_user_mapper = OpenStax::Accounts::DefaultAccountUserMapper
         @min_search_characters = 3
         @max_search_items = 10
+        @logout_handler = nil
         @logout_redirect_url = nil
         @return_to_url_approver = nil
-        @forwardable_login_param_keys = [
+        @forwardable_login_params = [
           :signup_at,
           :go,
-          :sp          # "signed payload"; "sp" for short to keep nested parameter names short
+          sp: {} # "signed payload"; "sp" to keep nested parameter names short.
         ]
         @max_user_updates_per_request = 250
         @sso_cookie_name = 'ox'

data/lib/openstax/accounts/version.rb

@@ -1,5 +1,5 @@
 module OpenStax
   module Accounts
-    VERSION = '9.0.5'
+    VERSION = '9.5.0'
   end
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: openstax_accounts
 version: !ruby/object:Gem::Version
-  version: 9.0.5
+  version: 9.5.0
 platform: ruby
 authors:
 - JP Slavinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-29 00:00:00.000000000 Z
+date: 2020-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: omniauth
   requirement: !ruby/object:Gem::Requirement
@@ -343,6 +343,7 @@ files:
 - db/migrate/15_drop_accounts_groups.rb
 - db/migrate/16_add_is_kip_to_openstax_accounts_accounts.rb
 - db/migrate/17_add_school_location_to_openstax_accounts_accounts.rb
+- db/migrate/18_add_grant_tutor_access_to_openstax_accounts_accounts.rb
 - db/migrate/1_create_openstax_accounts_groups.rb
 - db/migrate/2_create_openstax_accounts_group_members.rb
 - db/migrate/3_create_openstax_accounts_group_owners.rb