coalescing_panda 5.1.13 → 5.2.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 204da506a48c2fa7b478185259b0a59276631407
-  data.tar.gz: 2cd6d50876316e7b54d499c381d705b71827a535
+SHA256:
+  metadata.gz: bee89db63211898d79a2be426960cb091d7d4b9c384b848587c45744e40471e9
+  data.tar.gz: 06b1367659b15e63d7811a0a4ed6385f8f8925c3fac3767b9b0283bd00bd78b2
 SHA512:
-  metadata.gz: 6dd78d6695fd7f9f0c248422ef460ce650ca36430b468da69add1f6dd1e513ebe0966816753216ead81a0ebea4456167f2842d385ccf0615a314aba31308da0a
-  data.tar.gz: 8aa5fa556c55326dbe5dfccdc818fdb4b874db938523c6ca4b9c27ece3e4d2e78ec2720ac8cf7065680daf111c7e79d4a7c816929a778da0794017f2799536f4
+  metadata.gz: c902f68f0ed0685039be21864520fe6c80bc199f74afc897b5a38a38e6ea72b335463c0de6498024871e335cb515a7b68c9fa952a384fdf8cb10da12df5e6f23
+  data.tar.gz: 6cc22dcad22c6c77a9734b818969356e5600eedef854057d06320b05e1692631e4c814106ac8179a83bb39d2bef1e5396a02df95a6f1144046b09b5eaa739b64

data/app/controllers/coalescing_panda/oauth2_controller.rb

@@ -15,10 +15,12 @@ module CoalescingPanda
         client_key = lti_account.oauth2_client_key
         user_id = @oauth_state.data[:user_id]
         api_domain = @oauth_state.data[:api_domain]
+        prefix = @oauth_state.data[:api_url]
         @oauth_state.destroy
-        prefix = [oauth2_protocol, '://', api_domain].join
+
         Rails.logger.info "Creating Bearcat client for auth token retrieval pointed to: #{prefix}"
         client = Bearcat::Client.new(prefix: prefix)
+
         token_body = client.retrieve_token(client_id, coalescing_panda.oauth2_redirect_url, client_key, params['code'])
         auth = CanvasApiAuth.where('user_id = ? and api_domain = ?', user_id, api_domain).first_or_initialize
         auth.api_token = token_body['access_token']
@@ -30,20 +32,10 @@ module CoalescingPanda
       end
     end
 
-
     private
 
-    def oauth2_protocol
-      ENV['OAUTH_PROTOCOL'] || (Rails.env.development? ? 'http' : 'https')
-    end
-
     def retrieve_oauth_state
       @oauth_state ||= params[:state].present? && OauthState.find_by(state_key: params[:state])
     end
-
-    def valid_state_token
-      return false unless params['state'].present? && session['state'].present?
-      params['state'] == session['state']
-    end
   end
 end

data/app/models/coalescing_panda/group.rb

@@ -3,7 +3,7 @@ module CoalescingPanda
     belongs_to :context, :polymorphic => true
     include SingleTablePolymorphic
 
-    belongs_to :leader, foreign_key: :leader_id, class_name: 'CoalescingPanda::User'
+    belongs_to :leader, optional: true, foreign_key: :leader_id, class_name: 'CoalescingPanda::User'
     belongs_to :group_category, foreign_key: :coalescing_panda_group_category_id, class_name: 'CoalescingPanda::GroupCategory'
     has_many :group_memberships, foreign_key: :coalescing_panda_group_id, class_name: 'CoalescingPanda::GroupMembership', dependent: :destroy
     validates :group_category_id, presence: true

data/app/views/coalescing_panda/oauth2/oauth2.html.haml

@@ -3,7 +3,9 @@
   %h2 Canvas Authentication Required
   %button.btn-canvas#oauth_btn Authenticate
 
-%form{id: 'lti_form', action: "#{request.original_url}", method: 'post'}
+%form{id: 'lti_form', action: "#{request.original_url}", method: request.method}
+  - unless @lti_params.include?(:session_token) || @lti_params.include?(:session_key)
+    %input{:type =>"hidden", :value=>link_nonce, :name=>"session_token"}
   - @lti_params.each do |k,v|
     %input{:type =>"hidden", :value=>"#{v}", :name=>"#{k}"}
 

data/lib/coalescing_panda/controller_helpers.rb

@@ -15,96 +15,77 @@ module CoalescingPanda
     def current_organization; current_lti_account; end
 
     def canvas_oauth2(*roles)
-      return if have_session?
-      if lti_authorize!(*roles)
-        user_id = params['user_id']
-        launch_presentation_return_url = @lti_account.settings[:launch_presentation_return_url] || params['launch_presentation_return_url']
-        launch_presentation_return_url = [CoalescingPanda::BearcatUri.new(request.env["HTTP_REFERER"]).prefix, launch_presentation_return_url].join unless launch_presentation_return_url.include?('http')
-        uri = CoalescingPanda::BearcatUri.new(launch_presentation_return_url)
-        set_session(launch_presentation_return_url)
-
-        api_auth = CanvasApiAuth.find_by('user_id = ? and api_domain = ?', user_id, uri.api_domain)
-        if api_auth
-          begin
-            refresh_token(uri, api_auth) if api_auth.expired?
-            @client = Bearcat::Client.new(token: api_auth.api_token, prefix: uri.prefix)
-            @client.user_profile 'self'
-          rescue Footrest::HttpError::BadRequest, Footrest::HttpError::Unauthorized
-            # If we can't retrieve our own user profile, or the token refresh fails, something is awry on the canvas end
-            # and we'll need to go through the oauth flow again
-            render_oauth2_page uri, user_id
-          end
-        else
-          render_oauth2_page uri, user_id
-        end
+      unless valid_session?
+        lti_authorize!(*roles)
+
+        current_session_data['user_id'] = params['user_id']
+        current_session_data['lis_person_sourcedid'] = params['lis_person_sourcedid']
+        current_session_data['oauth_consumer_key'] = params['oauth_consumer_key']
+        current_session_data['custom_canvas_account_id'] = params['custom_canvas_account_id']
       end
+
+      @lti_account = LtiAccount.find_by_key(current_session_data['oauth_consumer_key']) if current_session_data['oauth_consumer_key']
+
+      require_user_api_client
     end
 
-    def render_oauth2_page(uri, user_id)
-      @lti_account = params['oauth_consumer_key'] && LtiAccount.find_by_key(params['oauth_consumer_key'])
-      return unless @lti_account
+    def render_oauth2_page
+      client_id = current_lti_account.oauth2_client_id
+      client = Bearcat::Client.new(prefix: canvas_api_uri)
 
-      client_id = @lti_account.oauth2_client_id
-      client = Bearcat::Client.new(prefix: uri.prefix)
       state = SecureRandom.hex(32)
-      OauthState.create! state_key: state, data: { key: params['oauth_consumer_key'], user_id: user_id, api_domain: uri.api_domain }
+      OauthState.create! state_key: state, data: {
+        key: current_session_data.dig(:launch_params, :oauth_consumer_key),
+        user_id: current_session_data.dig(:launch_params, :user_id),
+        api_domain: URI.parse(canvas_api_uri).host,
+        api_url: canvas_api_uri,
+      }
+
       @canvas_url = client.auth_redirect_url(client_id, resolve_coalescing_panda_url(:oauth2_redirect_url), { state: state })
 
-      #delete the added params so the original oauth sig still works
       @lti_params = params.to_unsafe_h
       @lti_params.delete('action')
       @lti_params.delete('controller')
+
       render 'coalescing_panda/oauth2/oauth2', layout: 'coalescing_panda/application'
     end
 
-    def refresh_token(uri, api_auth)
-      refresh_client = Bearcat::Client.new(prefix: uri.prefix)
-      refresh_body = refresh_client.retrieve_token(@lti_account.oauth2_client_id, resolve_coalescing_panda_url(:oauth2_redirect_url),
-        @lti_account.oauth2_client_key, api_auth.refresh_token, 'refresh_token')
+    def refresh_token(api_auth)
+      refresh_client = Bearcat::Client.new(prefix: canvas_api_uri)
+      refresh_body = refresh_client.retrieve_token(
+        current_lti_account.oauth2_client_id,
+        resolve_coalescing_panda_url(:oauth2_redirect_url),
+        current_lti_account.oauth2_client_key,
+        api_auth.refresh_token,
+        'refresh_token'
+      )
       api_auth.update({ api_token: refresh_body['access_token'], expires_at: (Time.now + refresh_body['expires_in']) })
     end
 
-    def check_refresh_token
-      return unless current_session_data['uri'] && current_session_data['user_id'] && current_session_data['oauth_consumer_key']
-      uri = CoalescingPanda::BearcatUri.new(current_session_data['uri'])
-      api_auth = CanvasApiAuth.find_by(user_id: current_session_data['user_id'], api_domain: uri.api_domain)
-      @lti_account = LtiAccount.find_by(key: current_session_data['oauth_consumer_key'])
-      return if @lti_account.nil? || api_auth.nil? # Not all tools use oauth
-
-      refresh_token(uri, api_auth) if api_auth.expired?
-    rescue Footrest::HttpError::BadRequest
-      render_oauth2_page uri, current_session_data['user_id']
-    end
-
-    def set_session(launch_presentation_return_url)
-      current_session_data['user_id'] = params['user_id']
-      current_session_data['uri'] = launch_presentation_return_url
-      current_session_data['lis_person_sourcedid'] = params['lis_person_sourcedid']
-      current_session_data['oauth_consumer_key'] = params['oauth_consumer_key']
-      current_session_data['custom_canvas_account_id'] = params['custom_canvas_account_id']
-    end
-
-    def have_session?
-      if params['tool_consumer_instance_guid'] && current_session_data['user_id'] != params['user_id']
-        reset_session
-        logger.info("resetting session params")
-        current_session_data['user_id'] = params['user_id']
+    def require_user_api_client
+      if user_api_client.nil?
+        render_oauth2_page
       end
+    end
 
-      if (current_session_data['user_id'] && current_session_data['uri'])
-        uri = CoalescingPanda::BearcatUri.new(current_session_data['uri'])
-        api_auth = CanvasApiAuth.find_by('user_id = ? and api_domain = ?', current_session_data['user_id'], uri.api_domain)
-        if api_auth && !api_auth.expired?
-          @client = Bearcat::Client.new(token: api_auth.api_token, prefix: uri.prefix)
-          @client.user_profile 'self'
+    def user_api_client
+      @user_api_client ||= begin
+        user_id = current_session_data.dig(:launch_params, :user_id)
+        puri = URI.parse(canvas_api_uri)
+        api_auth = CanvasApiAuth.find_by('user_id = ? and api_domain = ?', user_id, puri.host)
+        if api_auth
+          begin
+            refresh_token(api_auth) if api_auth.expired?
+            client = Bearcat::Client.new(token: api_auth.api_token, prefix: canvas_api_uri)
+            client.user_profile('self')
+            client
+          rescue Footrest::HttpError::BadRequest, Footrest::HttpError::Unauthorized
+            # If we can't retrieve our own user profile, or the token refresh fails, something is awry on the canvas end
+            # and we'll need to go through the oauth flow again
+            nil
+          end
         end
       end
-
-      @lti_account = LtiAccount.find_by_key(current_session_data['oauth_consumer_key']) if current_session_data['oauth_consumer_key']
-
-      !!@client
-    rescue Footrest::HttpError::Unauthorized
-      false
     end
 
     def validate_launch!
@@ -112,23 +93,39 @@ module CoalescingPanda
     end
 
     def lti_authorize!(*roles)
+      return true if valid_session?
+
       authorized = false
       if (@lti_account = params['oauth_consumer_key'] && LtiAccount.find_by_key(params['oauth_consumer_key']))
         sanitized_params = sanitize_params
         @tp = IMS::LTI::ToolProvider.new(@lti_account.key, @lti_account.secret, sanitized_params)
         authorized = @tp.valid_request?(request)
       end
+
       logger.info 'not authorized on tp valid request' unless authorized
-      authorized = authorized && (roles.count == 0 || (roles & lti_roles).count > 0)
-      logger.info 'not authorized on roles' unless authorized
-      authorized = authorized && @lti_account.validate_nonce(params['oauth_nonce'], DateTime.strptime(params['oauth_timestamp'], '%s'))
-      logger.info 'not authorized on nonce' unless authorized
+
+      if authorized && !(authorized = (roles.count == 0 || (roles & lti_roles).count > 0))
+        logger.info 'not authorized on roles'
+      end
+
+      if authorized && !(authorized = @lti_account.validate_nonce(params['oauth_nonce'], DateTime.strptime(params['oauth_timestamp'], '%s')))
+        logger.info 'not authorized on nonce'
+      end
+
       render :text => 'Invalid Credentials, please contact your Administrator.', :status => :unauthorized unless authorized
+
       # create session on first launch
       current_session
       authorized
     end
 
+    def valid_session?
+      return false unless current_session(create_missing: false)&.persisted?
+      true
+    rescue SessionNonceMismatch
+      false
+    end
+
     # code for method taken from panda_pal v 4.0.8
     # used for safari workaround
     def sanitize_params
@@ -162,11 +159,27 @@ module CoalescingPanda
       end
     end
 
-    def valid_session?
-      return false unless current_session(create_missing: false)&.persisted?
-      true
-    rescue SessionNonceMismatch
-      false
+    def canvas_api_uri
+      @canvas_api_uri ||= begin
+        launch_params = current_session_data[:launch_params] || {}
+        uri = 'canvas.instructure.com'
+        if launch_params[:custom_canvas_api_domain].present?
+          uri = launch_params[:custom_canvas_api_domain]
+        else
+          uri = current_lti_account.settings[:launch_presentation_return_url] || launch_params[:launch_presentation_return_url]
+          unless uri.include?('://')
+            referrer = URI.parse(request.env["HTTP_REFERER"])
+            referrer.path = ''
+            uri = [referrer.to_s, uri].join
+          end
+        end
+
+        uri = ((Rails.env.test? or Rails.env.development?) ? 'http' : 'https') + '://' + uri unless uri.include?('://')
+
+        uri = URI.parse(uri)
+        uri.path = ''
+        uri.to_s
+      end
     end
 
     private

data/lib/coalescing_panda/version.rb

@@ -1,3 +1,3 @@
 module CoalescingPanda
-  VERSION = '5.1.13'
+  VERSION = '5.2.0.beta1'
 end

data/spec/dummy/db/schema.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
@@ -11,263 +10,249 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20160830183155) do
+ActiveRecord::Schema.define(version: 2020_05_28_224505) do
 
   create_table "coalescing_panda_assignment_groups", force: :cascade do |t|
-    t.integer  "coalescing_panda_course_id", null: false
-    t.integer  "context_id"
-    t.string   "context_type"
-    t.string   "canvas_assignment_group_id"
-    t.string   "name"
-    t.integer  "position"
-    t.float    "group_weight"
-    t.string   "workflow_state"
+    t.integer "coalescing_panda_course_id", null: false
+    t.string "context_type"
+    t.integer "context_id"
+    t.string "canvas_assignment_group_id"
+    t.string "name"
+    t.integer "position"
+    t.float "group_weight"
+    t.string "workflow_state"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.index ["canvas_assignment_group_id", "context_id", "context_type"], name: "index_assignment_group_context", unique: true
+    t.index ["coalescing_panda_course_id", "canvas_assignment_group_id"], name: "index_assignment_group_course", unique: true
   end
 
-  add_index "coalescing_panda_assignment_groups", ["canvas_assignment_group_id", "context_id", "context_type"], name: "index_assignment_group_context", unique: true
-  add_index "coalescing_panda_assignment_groups", ["coalescing_panda_course_id", "canvas_assignment_group_id"], name: "index_assignment_group_course", unique: true
-
   create_table "coalescing_panda_assignments", force: :cascade do |t|
-    t.integer  "coalescing_panda_course_id",           null: false
-    t.string   "name"
-    t.text     "description"
-    t.string   "canvas_assignment_id",                 null: false
-    t.string   "workflow_state"
-    t.float    "points_possible"
+    t.integer "coalescing_panda_course_id", null: false
+    t.string "name"
+    t.text "description"
+    t.string "canvas_assignment_id", null: false
+    t.string "workflow_state"
+    t.float "points_possible"
     t.datetime "due_at"
     t.datetime "unlock_at"
     t.datetime "lock_at"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.text     "submission_types"
-    t.integer  "group_category_id"
-    t.boolean  "grade_group_students_individually"
-    t.boolean  "published"
-    t.integer  "coalescing_panda_assignment_group_id"
-    t.integer  "coalescing_panda_group_category_id"
+    t.text "submission_types"
+    t.integer "group_category_id"
+    t.boolean "grade_group_students_individually"
+    t.boolean "published"
+    t.integer "coalescing_panda_assignment_group_id"
+    t.integer "coalescing_panda_group_category_id"
+    t.index ["coalescing_panda_course_id", "canvas_assignment_id"], name: "index_assignments_course", unique: true
   end
 
-  add_index "coalescing_panda_assignments", ["coalescing_panda_course_id", "canvas_assignment_id"], name: "index_assignments_course", unique: true
-
   create_table "coalescing_panda_canvas_api_auths", force: :cascade do |t|
-    t.string   "user_id"
-    t.string   "api_domain"
-    t.string   "api_token"
+    t.string "user_id"
+    t.string "api_domain"
+    t.string "api_token"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "refresh_token"
+    t.string "refresh_token"
     t.datetime "expires_at"
   end
 
   create_table "coalescing_panda_canvas_batches", force: :cascade do |t|
-    t.float    "percent_complete",                default: 0.0
-    t.string   "status"
-    t.text     "message"
+    t.float "percent_complete", default: 0.0
+    t.string "status"
+    t.text "message"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.integer  "context_id"
-    t.string   "context_type"
-    t.integer  "coalescing_panda_lti_account_id"
-    t.text     "options"
+    t.integer "context_id"
+    t.string "context_type"
+    t.integer "coalescing_panda_lti_account_id"
+    t.text "options"
   end
 
   create_table "coalescing_panda_courses", force: :cascade do |t|
-    t.integer  "coalescing_panda_lti_account_id", null: false
-    t.integer  "coalescing_panda_term_id"
-    t.string   "name"
-    t.string   "canvas_course_id",                null: false
-    t.string   "sis_id"
+    t.integer "coalescing_panda_lti_account_id", null: false
+    t.integer "coalescing_panda_term_id"
+    t.string "name"
+    t.string "canvas_course_id", null: false
+    t.string "sis_id"
     t.datetime "start_at"
     t.datetime "conclude_at"
-    t.string   "workflow_state"
-    t.string   "course_code"
+    t.string "workflow_state"
+    t.string "course_code"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.index ["coalescing_panda_lti_account_id", "canvas_course_id"], name: "index_courses_account", unique: true
+    t.index ["coalescing_panda_term_id", "canvas_course_id"], name: "index_courses_term", unique: true
+    t.index ["sis_id"], name: "index_coalescing_panda_courses_on_sis_id"
   end
 
-  add_index "coalescing_panda_courses", ["coalescing_panda_lti_account_id", "canvas_course_id"], name: "index_courses_account", unique: true
-  add_index "coalescing_panda_courses", ["coalescing_panda_term_id", "canvas_course_id"], name: "index_courses_term", unique: true
-  add_index "coalescing_panda_courses", ["sis_id"], name: "index_coalescing_panda_courses_on_sis_id"
-
   create_table "coalescing_panda_enrollments", force: :cascade do |t|
-    t.integer  "coalescing_panda_user_id",    null: false
-    t.integer  "coalescing_panda_section_id", null: false
-    t.string   "workflow_state"
-    t.string   "sis_id"
-    t.string   "canvas_enrollment_id",        null: false
-    t.string   "enrollment_type"
+    t.integer "coalescing_panda_user_id", null: false
+    t.integer "coalescing_panda_section_id", null: false
+    t.string "workflow_state"
+    t.string "sis_id"
+    t.string "canvas_enrollment_id", null: false
+    t.string "enrollment_type"
     t.datetime "start_at"
     t.datetime "end_at"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.index ["coalescing_panda_user_id", "coalescing_panda_section_id", "enrollment_type"], name: "index_enrollments_user_and_section", unique: true
+    t.index ["sis_id"], name: "index_coalescing_panda_enrollments_on_sis_id"
   end
 
-  add_index "coalescing_panda_enrollments", ["coalescing_panda_user_id", "coalescing_panda_section_id", "enrollment_type"], name: "index_enrollments_user_and_section", unique: true
-  add_index "coalescing_panda_enrollments", ["sis_id"], name: "index_coalescing_panda_enrollments_on_sis_id"
-
   create_table "coalescing_panda_group_categories", force: :cascade do |t|
-    t.integer  "context_id"
-    t.string   "context_type"
-    t.integer  "canvas_group_category_id"
-    t.string   "name"
+    t.string "context_type"
+    t.integer "context_id"
+    t.integer "canvas_group_category_id"
+    t.string "name"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.index ["context_id", "context_type"], name: "index_group_categories_context_and_context_type"
   end
 
-  add_index "coalescing_panda_group_categories", ["context_id", "context_type"], name: "index_group_categories_context_and_context_type"
-
   create_table "coalescing_panda_group_memberships", force: :cascade do |t|
-    t.integer  "coalescing_panda_group_id"
-    t.integer  "coalescing_panda_user_id"
-    t.string   "canvas_group_membership_id"
-    t.string   "workflow_state"
+    t.integer "coalescing_panda_group_id"
+    t.integer "coalescing_panda_user_id"
+    t.string "canvas_group_membership_id"
+    t.string "workflow_state"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.boolean  "moderator"
+    t.boolean "moderator"
+    t.index ["coalescing_panda_group_id", "coalescing_panda_user_id"], name: "index_group_memberships_user_and_group", unique: true
   end
 
-  add_index "coalescing_panda_group_memberships", ["coalescing_panda_group_id", "coalescing_panda_user_id"], name: "index_group_memberships_user_and_group", unique: true
-
   create_table "coalescing_panda_groups", force: :cascade do |t|
-    t.integer  "context_id"
-    t.string   "context_type"
-    t.string   "description"
-    t.string   "group_category_id"
-    t.string   "canvas_group_id"
-    t.string   "name"
-    t.integer  "members_count"
+    t.string "context_type"
+    t.integer "context_id"
+    t.string "description"
+    t.string "group_category_id"
+    t.string "canvas_group_id"
+    t.string "name"
+    t.integer "members_count"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.integer  "leader_id"
-    t.integer  "coalescing_panda_group_category_id"
+    t.integer "leader_id"
+    t.integer "coalescing_panda_group_category_id"
+    t.index ["context_id", "canvas_group_id"], name: "index_groups_context_and_group_id", unique: true
   end
 
-  add_index "coalescing_panda_groups", ["context_id", "canvas_group_id"], name: "index_groups_context_and_group_id", unique: true
-
   create_table "coalescing_panda_lti_accounts", force: :cascade do |t|
-    t.string   "name"
-    t.string   "key"
-    t.string   "secret"
-    t.string   "oauth2_client_id"
-    t.string   "oauth2_client_key"
-    t.string   "canvas_account_id"
-    t.text     "settings"
+    t.string "name"
+    t.string "key"
+    t.string "secret"
+    t.string "oauth2_client_id"
+    t.string "oauth2_client_key"
+    t.string "canvas_account_id"
+    t.text "settings"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
   create_table "coalescing_panda_lti_nonces", force: :cascade do |t|
-    t.integer  "coalescing_panda_lti_account_id"
-    t.string   "nonce"
+    t.integer "coalescing_panda_lti_account_id"
+    t.string "nonce"
     t.datetime "timestamp"
   end
 
   create_table "coalescing_panda_oauth_states", force: :cascade do |t|
-    t.string   "state_key"
-    t.text     "data"
+    t.string "state_key"
+    t.text "data"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.index ["state_key"], name: "index_coalescing_panda_oauth_states_on_state_key", unique: true
   end
 
-  add_index "coalescing_panda_oauth_states", ["state_key"], name: "index_coalescing_panda_oauth_states_on_state_key", unique: true
-
   create_table "coalescing_panda_persistent_sessions", force: :cascade do |t|
-    t.string   "session_key"
-    t.text     "data"
-    t.integer  "coalescing_panda_lti_account_id"
-    t.datetime "created_at",                      null: false
-    t.datetime "updated_at",                      null: false
+    t.string "session_key"
+    t.text "data"
+    t.integer "coalescing_panda_lti_account_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["coalescing_panda_lti_account_id"], name: "index_persistent_session_on_lti_account_id"
+    t.index ["session_key"], name: "index_coalescing_panda_persistent_sessions_on_session_key", unique: true
   end
 
-  add_index "coalescing_panda_persistent_sessions", ["coalescing_panda_lti_account_id"], name: "index_persistent_session_on_lti_account_id", using: :btree
-  add_index "coalescing_panda_persistent_sessions", ["session_key"], name: "index_coalescing_panda_persistent_sessions_on_session_key", unique: true, using: :btree
-
   create_table "coalescing_panda_sections", force: :cascade do |t|
-    t.integer  "coalescing_panda_course_id", null: false
-    t.string   "name"
-    t.string   "canvas_section_id",          null: false
-    t.string   "sis_id"
-    t.string   "workflow_state"
+    t.integer "coalescing_panda_course_id", null: false
+    t.string "name"
+    t.string "canvas_section_id", null: false
+    t.string "sis_id"
+    t.string "workflow_state"
     t.datetime "start_at"
     t.datetime "end_at"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.index ["coalescing_panda_course_id", "canvas_section_id"], name: "index_sections_course", unique: true
+    t.index ["sis_id"], name: "index_coalescing_panda_sections_on_sis_id"
   end
 
-  add_index "coalescing_panda_sections", ["coalescing_panda_course_id", "canvas_section_id"], name: "index_sections_course", unique: true
-  add_index "coalescing_panda_sections", ["sis_id"], name: "index_coalescing_panda_sections_on_sis_id"
-
   create_table "coalescing_panda_sessions", force: :cascade do |t|
-    t.string   "token"
-    t.text     "data"
+    t.string "token"
+    t.text "data"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
   create_table "coalescing_panda_submissions", force: :cascade do |t|
-    t.integer  "coalescing_panda_user_id",       null: false
-    t.integer  "coalescing_panda_assignment_id", null: false
-    t.string   "url"
-    t.string   "grade"
-    t.string   "score"
+    t.integer "coalescing_panda_user_id", null: false
+    t.integer "coalescing_panda_assignment_id", null: false
+    t.string "url"
+    t.string "grade"
+    t.string "score"
     t.datetime "submitted_at"
-    t.string   "workflow_state"
-    t.string   "canvas_submission_id",           null: false
+    t.string "workflow_state"
+    t.string "canvas_submission_id", null: false
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.index ["canvas_submission_id"], name: "index_coalescing_panda_submissions_on_canvas_submission_id"
+    t.index ["coalescing_panda_user_id", "coalescing_panda_assignment_id", "canvas_submission_id"], name: "index_submissions_user_and_assignment", unique: true
   end
 
-  add_index "coalescing_panda_submissions", ["canvas_submission_id"], name: "index_coalescing_panda_submissions_on_canvas_submission_id"
-  add_index "coalescing_panda_submissions", ["coalescing_panda_user_id", "coalescing_panda_assignment_id", "canvas_submission_id"], name: "index_submissions_user_and_assignment", unique: true
-
   create_table "coalescing_panda_terms", force: :cascade do |t|
-    t.integer  "coalescing_panda_lti_account_id", null: false
-    t.string   "name"
-    t.string   "code"
-    t.string   "sis_id"
-    t.string   "canvas_term_id",                  null: false
+    t.integer "coalescing_panda_lti_account_id", null: false
+    t.string "name"
+    t.string "code"
+    t.string "sis_id"
+    t.string "canvas_term_id", null: false
     t.datetime "start_at"
     t.datetime "end_at"
-    t.string   "workflow_state"
+    t.string "workflow_state"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.index ["canvas_term_id", "coalescing_panda_lti_account_id"], name: "index_terms_account", unique: true
+    t.index ["sis_id"], name: "index_coalescing_panda_terms_on_sis_id"
   end
 
-  add_index "coalescing_panda_terms", ["canvas_term_id", "coalescing_panda_lti_account_id"], name: "index_terms_account", unique: true
-  add_index "coalescing_panda_terms", ["sis_id"], name: "index_coalescing_panda_terms_on_sis_id"
-
   create_table "coalescing_panda_users", force: :cascade do |t|
-    t.integer  "coalescing_panda_lti_account_id", null: false
-    t.string   "name"
-    t.string   "email"
-    t.string   "roles"
-    t.string   "workflow_state"
-    t.string   "sis_id"
-    t.string   "canvas_user_id",                  null: false
+    t.integer "coalescing_panda_lti_account_id", null: false
+    t.string "name"
+    t.string "email"
+    t.string "roles"
+    t.string "workflow_state"
+    t.string "sis_id"
+    t.string "canvas_user_id", null: false
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "login_id"
+    t.string "login_id"
+    t.index ["coalescing_panda_lti_account_id", "canvas_user_id"], name: "index_users_account", unique: true
+    t.index ["sis_id"], name: "index_coalescing_panda_users_on_sis_id"
   end
 
-  add_index "coalescing_panda_users", ["coalescing_panda_lti_account_id", "canvas_user_id"], name: "index_users_account", unique: true
-  add_index "coalescing_panda_users", ["sis_id"], name: "index_coalescing_panda_users_on_sis_id"
-
   create_table "delayed_jobs", force: :cascade do |t|
-    t.integer  "priority",   default: 0, null: false
-    t.integer  "attempts",   default: 0, null: false
-    t.text     "handler",                null: false
-    t.text     "last_error"
+    t.integer "priority", default: 0, null: false
+    t.integer "attempts", default: 0, null: false
+    t.text "handler", null: false
+    t.text "last_error"
     t.datetime "run_at"
     t.datetime "locked_at"
     t.datetime "failed_at"
-    t.string   "locked_by"
-    t.string   "queue"
+    t.string "locked_by"
+    t.string "queue"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.index ["priority", "run_at"], name: "delayed_jobs_priority"
   end
 
-  add_index "delayed_jobs", ["priority", "run_at"], name: "delayed_jobs_priority"
-
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: coalescing_panda
 version: !ruby/object:Gem::Version
-  version: 5.1.13
+  version: 5.2.0.beta1
 platform: ruby
 authors:
 - Nathan Mills
 - Cody Tanner
 - Jake Sorce
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-13 00:00:00.000000000 Z
+date: 2021-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -410,7 +410,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description:
+description: 
 email:
 - nathanm@instructure.com
 - ctanner@instructure.com
@@ -540,7 +540,9 @@ files:
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
+- spec/dummy/db/development.sqlite3
 - spec/dummy/db/schema.rb
+- spec/dummy/db/test.sqlite3
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
@@ -577,7 +579,7 @@ files:
 homepage: http://www.instructure.com
 licenses: []
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -588,80 +590,81 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubyforge_project:
-rubygems_version: 2.6.14.4
-signing_key:
+rubygems_version: 3.0.3
+signing_key: 
 specification_version: 4
 summary: Canvas LTI and OAUTH2 mountable engine
 test_files:
+- spec/rails_helper.rb
+- spec/models/coalescing_panda/canvas_api_auth_spec.rb
+- spec/models/coalescing_panda/assignment_spec.rb
+- spec/models/coalescing_panda/group_membership_spec.rb
+- spec/models/coalescing_panda/lti_account_spec.rb
+- spec/models/coalescing_panda/section_spec.rb
+- spec/models/coalescing_panda/workers/course_miner_spec.rb
+- spec/models/coalescing_panda/workers/account_miner_spec.rb
+- spec/models/coalescing_panda/group_spec.rb
+- spec/models/coalescing_panda/lti_nonce_spec.rb
+- spec/models/coalescing_panda/submission_spec.rb
+- spec/models/coalescing_panda/term_spec.rb
+- spec/models/coalescing_panda/canvas_batch_spec.rb
+- spec/models/coalescing_panda/enrollment_spec.rb
+- spec/models/coalescing_panda/course_spec.rb
+- spec/models/coalescing_panda/user_spec.rb
+- spec/models/coalescing_panda/assignment_group_spec.rb
+- spec/controllers/coalescing_panda/oauth2_controller_spec.rb
+- spec/controllers/coalescing_panda/lti_controller_spec.rb
+- spec/controllers/coalescing_panda/canvas_batches_controller_spec.rb
 - spec/spec_helper.rb
+- spec/dummy/db/schema.rb
+- spec/dummy/db/test.sqlite3
+- spec/dummy/db/development.sqlite3
+- spec/dummy/public/422.html
+- spec/dummy/public/favicon.ico
+- spec/dummy/public/404.html
+- spec/dummy/public/500.html
+- spec/dummy/Rakefile
+- spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/app/models/account.rb
 - spec/dummy/app/models/course.rb
 - spec/dummy/app/controllers/application_controller.rb
-- spec/dummy/app/views/layouts/application.html.erb
-- spec/dummy/app/assets/javascripts/application.js
-- spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/helpers/application_helper.rb
-- spec/dummy/bin/rake
-- spec/dummy/bin/bundle
-- spec/dummy/bin/rails
-- spec/dummy/config/routes.rb
-- spec/dummy/config/locales/en.yml
-- spec/dummy/config/environments/production.rb
-- spec/dummy/config/environments/development.rb
-- spec/dummy/config/environments/test.rb
-- spec/dummy/config/environment.rb
+- spec/dummy/app/assets/stylesheets/application.css
+- spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/config/application.rb
-- spec/dummy/config/database.yml
-- spec/dummy/config/boot.rb
 - spec/dummy/config/initializers/lti_initializer.rb
-- spec/dummy/config/initializers/backtrace_silencers.rb
-- spec/dummy/config/initializers/mime_types.rb
-- spec/dummy/config/initializers/filter_parameter_logging.rb
 - spec/dummy/config/initializers/session_store.rb
-- spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/initializers/secret_token.rb
+- spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/initializers/inflections.rb
-- spec/dummy/config.ru
-- spec/dummy/Rakefile
-- spec/dummy/public/favicon.ico
-- spec/dummy/public/422.html
-- spec/dummy/public/500.html
-- spec/dummy/public/404.html
-- spec/dummy/db/schema.rb
+- spec/dummy/config/initializers/filter_parameter_logging.rb
+- spec/dummy/config/initializers/mime_types.rb
+- spec/dummy/config/initializers/backtrace_silencers.rb
+- spec/dummy/config/environments/development.rb
+- spec/dummy/config/environments/test.rb
+- spec/dummy/config/environments/production.rb
+- spec/dummy/config/database.yml
+- spec/dummy/config/boot.rb
+- spec/dummy/config/routes.rb
+- spec/dummy/config/environment.rb
+- spec/dummy/config/locales/en.yml
 - spec/dummy/README.rdoc
-- spec/models/coalescing_panda/enrollment_spec.rb
-- spec/models/coalescing_panda/section_spec.rb
-- spec/models/coalescing_panda/lti_nonce_spec.rb
-- spec/models/coalescing_panda/lti_account_spec.rb
-- spec/models/coalescing_panda/canvas_batch_spec.rb
-- spec/models/coalescing_panda/term_spec.rb
-- spec/models/coalescing_panda/assignment_spec.rb
-- spec/models/coalescing_panda/submission_spec.rb
-- spec/models/coalescing_panda/assignment_group_spec.rb
-- spec/models/coalescing_panda/group_spec.rb
-- spec/models/coalescing_panda/workers/account_miner_spec.rb
-- spec/models/coalescing_panda/workers/course_miner_spec.rb
-- spec/models/coalescing_panda/canvas_api_auth_spec.rb
-- spec/models/coalescing_panda/group_membership_spec.rb
-- spec/models/coalescing_panda/user_spec.rb
-- spec/models/coalescing_panda/course_spec.rb
-- spec/factories/courses.rb
-- spec/factories/submissions.rb
-- spec/factories/assignment_groups.rb
-- spec/factories/assignments.rb
-- spec/factories/canvas_api_auths.rb
+- spec/dummy/config.ru
+- spec/dummy/bin/bundle
+- spec/dummy/bin/rake
+- spec/dummy/bin/rails
+- spec/factories/accounts.rb
 - spec/factories/enrollments.rb
-- spec/factories/canvas_batches.rb
+- spec/factories/terms.rb
 - spec/factories/sections.rb
-- spec/factories/accounts.rb
+- spec/factories/canvas_batches.rb
+- spec/factories/assignment_groups.rb
+- spec/factories/submissions.rb
+- spec/factories/courses.rb
+- spec/factories/assignments.rb
 - spec/factories/users.rb
-- spec/factories/terms.rb
-- spec/controllers/coalescing_panda/canvas_batches_controller_spec.rb
-- spec/controllers/coalescing_panda/oauth2_controller_spec.rb
-- spec/controllers/coalescing_panda/lti_controller_spec.rb
-- spec/rails_helper.rb
+- spec/factories/canvas_api_auths.rb