openstax_accounts 9.0.5 → 9.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52c5a3872725bd1198629d59c0660cdcc7f75d7bf09e32640deb56d772922477
-  data.tar.gz: f48649499a41fa83f48ae34274cab542166bb61401d5edb3583c07f38c29c5bb
+  metadata.gz: 94c7f3a9d37b020069be2c39b96a1f7beacb918d50e87aa84d70fe24d437025c
+  data.tar.gz: 9a857efcee527418bd4287d6b8a61c369fa424541358de01b3dc41f1ae8e3aa7
 SHA512:
-  metadata.gz: 5a266e70528d538b2dabf9722ec10e20423e5e7e47e86846019db502e5079276e216d18347985f20b22bbacfdaecd25e6263b0a38b7032289ed25cf2cbbde4ca
-  data.tar.gz: ea546ef8e9fddb0d245ceeb8cbf6c9e4b9e0856eef81976c80b7f70ebac9b6aee3e1fcc56df1e7b9c9f708ca9178898173f5da7a46ce4e2191f25f4708eb960f
+  metadata.gz: 831790e591d38994596ff471d0828b773a8fd770253bf7040ed4c1106b2979e944b9a5ce5777cc89271c552cdb8fb50b7cfb239e316b1251713fe81f960e9237
+  data.tar.gz: fa14a2404033df1bc6131f6a1b91c134c98bda24d16af737f3442b52ea9b3de1c1933f463ac7c46060cef64fac02e73628990d936f35a7a0bdf1b93a99d6290c

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

data/app/handlers/openstax/accounts/sessions_callback.rb

@@ -34,7 +34,6 @@ module OpenStax
             account.faculty_status ||= :no_faculty_info
             account.role ||= :unknown_role
             account.school_type ||= :unknown_school_type
-            account.school_location ||= :unknown_school_location
           end
 
           outputs.account.save if outputs.account.changed?

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

@@ -12,22 +12,14 @@ module OpenStax::Accounts
       :self_reported_role,
       :faculty_status,
       :school_type,
-      :school_location,
       :salesforce_contact_id,
       :support_identifier,
-      :is_test,
-      :is_kip
+      :is_test
     ]
 
     attr_accessor :syncing
 
-    enum faculty_status: [
-      :no_faculty_info,
-      :pending_faculty,
-      :confirmed_faculty,
-      :rejected_faculty
-    ]
-
+    enum faculty_status: [:no_faculty_info, :pending_faculty, :confirmed_faculty, :rejected_faculty]
     enum role: [
       :unknown_role,
       :student,
@@ -39,23 +31,9 @@ module OpenStax::Accounts
       :adjunct,
       :homeschool
     ]
+    enum school_type: [:unknown_school_type, :other_school_type, :college]
 
-    enum school_type: [
-      :unknown_school_type,
-      :other_school_type,
-      :college,
-      :high_school,
-      :k12_school,
-      :home_school
-    ]
-
-    enum school_location: [
-      :unknown_school_location,
-      :domestic_school,
-      :foreign_school
-    ]
-
-    validates :faculty_status, :role, :school_type, :school_location, presence: true
+    validates :faculty_status, :role, :school_type, presence: true
 
     validates :uuid, presence: true, uniqueness: true
     validates :support_identifier, uniqueness: { allow_nil: true }

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

@@ -5,13 +5,13 @@ module OpenStax
     module Api
       module V1
         class AccountRepresenter < Roar::Decorator
+
           # This representer is used to communicate with Accounts
           # and so must allow read/write on all properties
           # Do not use it in create/update APIs!
 
-          # This representer can be used directly or subclassed for an object that delegates
-          # openstax_uid, username, first_name, last_name, full_name, title, faculty_status,
-          # role, school_type, school_location and salesforce_contact_id to an account
+          # Otherwise, this representer can be used directly or subclassed
+          # for an object that delegates openstax_uid, username, first_name, last_name, full_name, # title, faculty_status, role, school_type and salesforce_contact_id to an account
 
           include Roar::JSON
 
@@ -86,37 +86,24 @@ module OpenStax
                      }"
                    }
 
-          property :school_location,
-                   type: String,
-                   schema_info: {
-                     description: "One of #{
-                       OpenStax::Accounts::Account.school_locations.keys.map(&:to_s).inspect
-                     }"
-                   }
-
           property :uuid,
                    type: String,
                    schema_info: {
-                     description: 'The UUID as set by Accounts'
+                     description: "The UUID as set by Accounts"
                    }
 
           property :support_identifier,
                    type: String,
                    schema_info: {
-                     description: 'The support_identifier as set by Accounts'
+                     description: "The support_identifier as set by Accounts"
                    }
 
           property :is_test,
                    type: :boolean,
                    schema_info: {
-                     description: 'Whether or not this is a test account'
+                     description: "Whether or not this is a test account"
                    }
 
-          property :is_kip,
-                   type: :boolean,
-                   schema_info: {
-                     description: 'Whether or not this is a Key Institutional Partner account'
-                   }
         end
       end
     end

data/app/routines/openstax/accounts/dev/create_account.rb

@@ -32,8 +32,6 @@ module OpenStax
             role: inputs[:role] || :unknown_role,
             uuid: SecureRandom.uuid,
             support_identifier: "cs_#{SecureRandom.hex(4)}",
-            school_type: inputs[:school_type] || :unknown_school_type,
-            school_location: inputs[:school_location] || :unknown_school_location,
             is_test: true
           )
 

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

@@ -7,7 +7,7 @@ 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, is_test: nil)
         raise(
           ArgumentError,
           'You must specify either an email address or a username (and an optional password)'
@@ -23,8 +23,7 @@ module OpenStax
             email: email, username: username, password: password,
             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
+            role: role, school_type: school_type, is_test: is_test
           )
           fatal_error(code: :invalid_inputs) unless (200..202).include?(response.status)
 
@@ -46,9 +45,7 @@ module OpenStax
           account.faculty_status = faculty_status || :no_faculty_info
           account.role = role || :unknown_role
           account.school_type = school_type || :unknown_school_type
-          account.school_location = school_location || :unknown_school_location
           account.support_identifier = support_identifier
-          account.is_kip = is_kip
           account.is_test = is_test
         end
 

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

@@ -10,6 +10,7 @@ module OpenStax
       protected
 
       def exec(options={})
+
         return if OpenStax::Accounts.configuration.enable_stubbing?
 
         response = OpenStax::Accounts::Api.get_application_account_updates

data/lib/openstax/accounts/configuration.rb

@@ -60,9 +60,9 @@ module OpenStax
       # 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
@@ -119,10 +119,10 @@ module OpenStax
         @max_search_items = 10
         @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.1.0'
   end
 end

data/spec/factories/openstax_accounts_account.rb

@@ -6,7 +6,6 @@ FactoryBot.define do
     faculty_status     { OpenStax::Accounts::Account.faculty_statuses[:no_faculty_info] }
     role               { OpenStax::Accounts::Account.roles[:unknown_role] }
     school_type        { OpenStax::Accounts::Account.school_types[:unknown_school_type] }
-    school_location    { OpenStax::Accounts::Account.school_locations[:unknown_school_location] }
     uuid               { SecureRandom.uuid }
     support_identifier { "cs_#{SecureRandom.hex(4)}" }
     is_test            { true }

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: openstax_accounts
 version: !ruby/object:Gem::Version
-  version: 9.0.5
+  version: 9.1.0
 platform: ruby
 authors:
 - JP Slavinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-29 00:00:00.000000000 Z
+date: 2020-04-10 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
@@ -341,8 +341,6 @@ files:
 - db/migrate/13_add_school_type_to_accounts_accounts.rb
 - db/migrate/14_drop_openstax_uid_and_username_uniqueness.rb
 - 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/1_create_openstax_accounts_groups.rb
 - db/migrate/2_create_openstax_accounts_group_members.rb
 - db/migrate/3_create_openstax_accounts_group_owners.rb

data/db/migrate/16_add_is_kip_to_openstax_accounts_accounts.rb

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

data/db/migrate/17_add_school_location_to_openstax_accounts_accounts.rb

@@ -1,5 +0,0 @@
-class AddSchoolLocationToOpenStaxAccountsAccounts < ActiveRecord::Migration[5.2]
-  def change
-    add_column :openstax_accounts_accounts, :school_location, :integer, default: 0, null: false
-  end
-end