openstax_accounts 9.0.3 → 9.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e72c48eba4d6dc3bc31f1cb7ad25496a3d2f53e8ad52e5b349183e5bf996a9b7
-  data.tar.gz: 52623f98c2f678ead905489f7deddfc8dfd20f47fb030a04e906caaee56e04e1
+  metadata.gz: c0afe5b4c7d13abc030803addf862691d260ea3036361a2043d8f85bf88fa7fb
+  data.tar.gz: 24502a41f6cb02271869bdff9869ed3f8efedbe1b393227193746ae6c5d8fc0c
 SHA512:
-  metadata.gz: 32f5094752249a7514a5cbaaf496e329c250fa7af61e369476aef43277bc7e00216877d3e2331b01abbda6580f8e767a72bbdf2ddec2d612a8ebf2bfc0d2d855
-  data.tar.gz: 8c264b7bd7259c7a88a3e746ed4cfd68bb56a605e1a1d6c5a514fa64e34986fa50f8941ad11370227b6b23bc84e0511bcf3d8bcf9f284fecb90f9affe1ad24db
+  metadata.gz: 31573e6b6cef57ee9fb3e8cef36b20ffed6a0e122cf667857daedc1c4049753f7a7bdfcee67f8400711708c9aed795f474dddc194fb1876aa71d654a75ee42e0
+  data.tar.gz: ecd575021a0091b2f6f75d93416b09be0335e499498448b10383091ea4aa8eec1d110718b41a50486c54e6b8649fac45e9d06feed7fb0e3916c51461e677c5c0

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,6 +34,7 @@ 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,6 +12,7 @@ module OpenStax::Accounts
       :self_reported_role,
       :faculty_status,
       :school_type,
+      :school_location,
       :salesforce_contact_id,
       :support_identifier,
       :is_test,
@@ -26,6 +27,7 @@ module OpenStax::Accounts
       :confirmed_faculty,
       :rejected_faculty
     ]
+
     enum role: [
       :unknown_role,
       :student,
@@ -37,15 +39,23 @@ module OpenStax::Accounts
       :adjunct,
       :homeschool
     ]
+
     enum school_type: [
       :unknown_school_type,
       :other_school_type,
       :college,
       :high_school,
-      :k12_school
+      :k12_school,
+      :home_school
+    ]
+
+    enum school_location: [
+      :unknown_school_location,
+      :domestic_school,
+      :foreign_school
     ]
 
-    validates :faculty_status, :role, :school_type, presence: true
+    validates :faculty_status, :role, :school_type, :school_location, 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

@@ -9,8 +9,9 @@ module OpenStax
           # and so must allow read/write on all properties
           # Do not use it in create/update APIs!
 
-          # 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
+          # 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
 
           include Roar::JSON
 
@@ -85,6 +86,14 @@ 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: {

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

@@ -32,6 +32,8 @@ 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, is_test: nil)
+               role: nil, school_type: nil, school_location: nil, is_kip: nil, is_test: nil)
         raise(
           ArgumentError,
           'You must specify either an email address or a username (and an optional password)'
@@ -23,7 +23,8 @@ 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, is_test: is_test
+            role: role, school_type: school_type, school_location: school_location,
+            is_kip: is_kip, is_test: is_test
           )
           fatal_error(code: :invalid_inputs) unless (200..202).include?(response.status)
 
@@ -45,7 +46,9 @@ 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/db/migrate/17_add_school_location_to_openstax_accounts_accounts.rb

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

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.3'
+    VERSION = '9.3.0'
   end
 end

data/spec/factories/openstax_accounts_account.rb

@@ -6,6 +6,7 @@ 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.3
+  version: 9.3.0
 platform: ruby
 authors:
 - JP Slavinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-23 00:00:00.000000000 Z
+date: 2020-07-22 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
@@ -342,6 +342,7 @@ files:
 - 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