Updated accounts-rails to handle path-prefixed OpenStax Accounts (#2407)

Author: Dantemss

Gemfile

@@ -68,15 +68,15 @@ gem 'whenever'
 gem 'omniauth-oauth2', '~> 1.3.1'
 
 # OpenStax Accounts integration
-gem 'openstax_accounts', '~> 9.5.1'
+gem 'openstax_accounts'
 
 gem 'action_interceptor'
 
 # Datetime parsing
 gem 'chronic'
 
 # API versioning and documentation
-gem 'openstax_api'
+gem 'openstax_api', '< 9.4.0'
 
 # Used to fetch and parse OpenStax book content
 gem 'openstax_content'

Gemfile.lock

@@ -36,50 +36,50 @@ GEM
     action_interceptor (1.2.0)
       addressable
       rails (>= 3.1)
-    actioncable (5.2.4.5)
-      actionpack (= 5.2.4.5)
+    actioncable (5.2.6)
+      actionpack (= 5.2.6)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.4.5)
-      actionpack (= 5.2.4.5)
-      actionview (= 5.2.4.5)
-      activejob (= 5.2.4.5)
+    actionmailer (5.2.6)
+      actionpack (= 5.2.6)
+      actionview (= 5.2.6)
+      activejob (= 5.2.6)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.4.5)
-      actionview (= 5.2.4.5)
-      activesupport (= 5.2.4.5)
+    actionpack (5.2.6)
+      actionview (= 5.2.6)
+      activesupport (= 5.2.6)
       rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.4.5)
-      activesupport (= 5.2.4.5)
+    actionview (5.2.6)
+      activesupport (= 5.2.6)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    active_attr (0.15.2)
+    active_attr (0.15.3)
       actionpack (>= 3.0.2, < 7.0)
       activemodel (>= 3.0.2, < 7.0)
       activesupport (>= 3.0.2, < 7.0)
     active_record_query_trace (1.6.2)
-    activejob (5.2.4.5)
-      activesupport (= 5.2.4.5)
+    activejob (5.2.6)
+      activesupport (= 5.2.6)
       globalid (>= 0.3.6)
-    activemodel (5.2.4.5)
-      activesupport (= 5.2.4.5)
-    activerecord (5.2.4.5)
-      activemodel (= 5.2.4.5)
-      activesupport (= 5.2.4.5)
+    activemodel (5.2.6)
+      activesupport (= 5.2.6)
+    activerecord (5.2.6)
+      activemodel (= 5.2.6)
+      activesupport (= 5.2.6)
       arel (>= 9.0)
     activerecord-import (1.0.1)
       activerecord (>= 3.2)
-    activestorage (5.2.4.5)
-      actionpack (= 5.2.4.5)
-      activerecord (= 5.2.4.5)
-      marcel (~> 0.3.1)
-    activesupport (5.2.4.5)
+    activestorage (5.2.6)
+      actionpack (= 5.2.6)
+      activerecord (= 5.2.6)
+      marcel (~> 1.0.0)
+    activesupport (5.2.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -96,17 +96,17 @@ GEM
     autoprefixer-rails (9.5.0)
       execjs
     awesome_print (1.8.0)
-    aws-eventstream (1.1.1)
-    aws-partitions (1.473.0)
-    aws-sdk-autoscaling (1.53.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-eventstream (1.2.0)
+    aws-partitions (1.530.0)
+    aws-sdk-autoscaling (1.72.0)
+      aws-sdk-core (~> 3, >= 3.122.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-cloudwatch (1.46.0)
       aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-core (3.115.0)
+    aws-sdk-core (3.122.1)
       aws-eventstream (~> 1, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.239.0)
+      aws-partitions (~> 1, >= 1.525.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
     aws-sdk-kms (1.44.0)
@@ -122,7 +122,7 @@ GEM
     aws-sdk-ssm (1.95.0)
       aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.2.3)
+    aws-sigv4 (1.4.0)
       aws-eventstream (~> 1, >= 1.0.2)
     axiom-types (0.1.1)
       descendants_tracker (~> 0.0.4)
@@ -210,7 +210,7 @@ GEM
       compass (~> 1.0.0)
       sass-rails (< 5.1)
       sprockets (< 4.0)
-    concurrent-ruby (1.1.8)
+    concurrent-ruby (1.1.9)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     crass (1.0.6)
@@ -238,7 +238,7 @@ GEM
     diff-lcs (1.3)
     diffy (3.4.0)
     docile (1.4.0)
-    doorkeeper (5.4.0)
+    doorkeeper (5.5.4)
       railties (>= 5)
     dotenv (2.7.1)
     dotenv-rails (2.7.1)
@@ -320,8 +320,8 @@ GEM
     formatador (0.2.5)
     get_process_mem (0.2.7)
       ffi (~> 1.0)
-    globalid (0.4.2)
-      activesupport (>= 4.2.0)
+    globalid (0.5.2)
+      activesupport (>= 5.0)
     guard (2.15.0)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
@@ -347,7 +347,7 @@ GEM
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
     httpclient (2.8.3)
-    i18n (1.8.9)
+    i18n (1.8.11)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
     ims-lti (2.2.3)
@@ -400,28 +400,28 @@ GEM
       activesupport (>= 4)
       railties (>= 4)
       request_store (~> 1.0)
-    loofah (2.9.0)
+    loofah (2.12.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     lumberjack (1.0.13)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
-    marcel (0.3.3)
-      mimemagic (~> 0.3.2)
+    marcel (1.0.2)
     maruku (0.7.3)
     method_source (0.8.2)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2020.1104)
-    mimemagic (0.3.8)
+    mimemagic (0.4.3)
       nokogiri (~> 1)
-    mini_mime (1.0.2)
+      rake
+    mini_mime (1.1.2)
     mini_portile2 (2.6.1)
     mini_racer (0.3.1)
       libv8 (~> 8.4.255)
     minitest (5.14.4)
     msgpack (1.3.3)
-    multi_json (1.14.1)
+    multi_json (1.15.0)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
     nenv (0.3.0)
@@ -438,38 +438,39 @@ GEM
       nenv (~> 0.1)
       shellany (~> 0.0)
     oauth (0.5.5)
-    oauth2 (1.4.2)
+    oauth2 (1.4.7)
       faraday (>= 0.8, < 2.0)
       jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
     oj (3.7.12)
     oj_mimic_json (1.0.1)
-    omniauth (1.9.0)
-      hashie (>= 3.4.6, < 3.7.0)
+    omniauth (1.9.1)
+      hashie (>= 3.4.6)
       rack (>= 1.6.2, < 3)
     omniauth-oauth2 (1.3.1)
       oauth2 (~> 1.0)
       omniauth (~> 1.2)
-    openstax_accounts (9.5.1)
+    openstax_accounts (9.8.0)
       action_interceptor
       keyword_search
       lev
       oauth2
-      omniauth
+      omniauth (< 2.0)
       omniauth-oauth2
       openstax_api
       openstax_utilities
       pg
-      rails (> 5.0)
+      rails (>= 5.0, < 7.0)
       representable
-      roar
+      roar (>= 1.0)
     openstax_active_force (1.1.0)
       active_attr
       rails (>= 5.0, < 7.0)
       restforce
-    openstax_api (9.3.0)
+    openstax_api (9.3.1)
+      addressable
       doorkeeper
       exception_notification
       lev
@@ -536,18 +537,18 @@ GEM
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     railroady (1.5.3)
-    rails (5.2.4.5)
-      actioncable (= 5.2.4.5)
-      actionmailer (= 5.2.4.5)
-      actionpack (= 5.2.4.5)
-      actionview (= 5.2.4.5)
-      activejob (= 5.2.4.5)
-      activemodel (= 5.2.4.5)
-      activerecord (= 5.2.4.5)
-      activestorage (= 5.2.4.5)
-      activesupport (= 5.2.4.5)
+    rails (5.2.6)
+      actioncable (= 5.2.6)
+      actionmailer (= 5.2.6)
+      actionpack (= 5.2.6)
+      actionview (= 5.2.6)
+      activejob (= 5.2.6)
+      activemodel (= 5.2.6)
+      activerecord (= 5.2.6)
+      activestorage (= 5.2.6)
+      activesupport (= 5.2.6)
       bundler (>= 1.3.0)
-      railties (= 5.2.4.5)
+      railties (= 5.2.6)
       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.4)
       actionpack (>= 5.0.1.x)
@@ -561,7 +562,7 @@ GEM
       activesupport (>= 3.2)
       choice (~> 0.2.0)
       ruby-graphviz (~> 1.2)
-    rails-html-sanitizer (1.3.0)
+    rails-html-sanitizer (1.4.2)
       loofah (~> 2.3)
     rails-settings-cached (2.0.3)
       rails (>= 4.2.0)
@@ -571,14 +572,14 @@ GEM
       dry-validation (>= 0.12.0)
       i18n
       rails (>= 3.0)
-    railties (5.2.4.5)
-      actionpack (= 5.2.4.5)
-      activesupport (= 5.2.4.5)
+    railties (5.2.6)
+      actionpack (= 5.2.6)
+      activesupport (= 5.2.6)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
     rainbow (3.0.0)
-    rake (13.0.3)
+    rake (13.0.6)
     rb-fsevent (0.10.4)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
@@ -706,9 +707,9 @@ GEM
     sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.2)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
+    sprockets-rails (3.4.0)
+      actionpack (>= 5.2)
+      activesupport (>= 5.2)
       sprockets (>= 3.0.0)
     ssrf_filter (1.0.7)
     test_xml (0.1.8)
@@ -757,7 +758,7 @@ GEM
       rack-proxy (>= 0.6.1)
       railties (>= 5.2)
       semantic_range (>= 2.3.0)
-    websocket-driver (0.7.3)
+    websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     whenever (0.10.0)
@@ -839,8 +840,8 @@ DEPENDENCIES
   oj
   oj_mimic_json
   omniauth-oauth2 (~> 1.3.1)
-  openstax_accounts (~> 9.5.1)
-  openstax_api
+  openstax_accounts
+  openstax_api (< 9.4.0)
   openstax_content
   openstax_healthcheck
   openstax_rescue_from

app/representers/api/v1/user_representer.rb

@@ -76,7 +76,7 @@ class UserRepresenter < ::Roar::Decorator
     property :profile_url,
              getter: ->(*) do
                Addressable::URI.join(
-                 OpenStax::Accounts.configuration.openstax_accounts_url, '/profile'
+                 OpenStax::Accounts.configuration.openstax_accounts_url, 'profile'
                ).to_s
              end
 

db/migrate/20211115122108_add_is_administrator_to_openstax_accounts_accounts.openstax_accounts.rb

@@ -0,0 +1,6 @@
+# This migration comes from openstax_accounts (originally 19)
+class AddIsAdministratorToOpenStaxAccountsAccounts < ActiveRecord::Migration[5.2]
+  def change
+    add_column :openstax_accounts_accounts, :is_administrator, :boolean
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2021_11_03_150618) do
+ActiveRecord::Schema.define(version: 2021_11_15_122108) do
 
   create_sequence "teacher_exercise_number", start: 1000000
 
@@ -606,6 +606,7 @@
     t.boolean "is_kip"
     t.integer "school_location", default: 0, null: false
     t.boolean "grant_tutor_access"
+    t.boolean "is_administrator"
     t.index ["access_token"], name: "index_openstax_accounts_accounts_on_access_token", unique: true
     t.index ["faculty_status"], name: "index_openstax_accounts_accounts_on_faculty_status"
     t.index ["first_name"], name: "index_openstax_accounts_accounts_on_first_name"

spec/representers/api/v1/user_representer_spec.rb

@@ -18,7 +18,7 @@
     expect(representation['viewed_tour_stats']).to eq []
     expect(representation['available_terms']).to eq []
     expect(representation['profile_url']).to eq Addressable::URI.join(
-      OpenStax::Accounts.configuration.openstax_accounts_url, '/profile'
+      OpenStax::Accounts.configuration.openstax_accounts_url, 'profile'
     ).to_s
   end