openstax_accounts 8.1.1 → 9.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: edf27a81aef8f196ab5b804f38903395d24367628209a9eeb001a37f258f33d5
-  data.tar.gz: af2ac3a3de4ab707958bc03b0faf561e876b99521f82a8695a55cfcbbd1bc740
+  metadata.gz: e3fe1e9662df1f455d7506864c26c6143134196a7e191b6606a4644db5e564b2
+  data.tar.gz: 13778e9ea7baf42944c3fdfe3ccd590e1bcf8100771956dbbc12a2e1295042d9
 SHA512:
-  metadata.gz: 3f8b506ad52a7bb2b59ed822f0347c7bb5343728dbedf7fa166f7ffc2aabc7ce9c3b8a6113d09aab44795a04e79e74595583e2335e825b0e682e7be3604b4a8c
-  data.tar.gz: fca6c2d52b5540bac193bc099c905ca4a6aa860c7353b411259ae95c878e872fb7c0f46f67c7b0a3813b7ae853dd967e969839c524384a07d1b30e3754677874
+  metadata.gz: e74e04ebbf93d4703146f94f23d63ec69a9d68fd9437bee355789a36f51ec010857fd5b1805b79bfb6e5880b5eac73cb883d8e51163c6ec28ea599247ae85675
+  data.tar.gz: 9aa7d1ddfd8c37e9de254403c51469fad5a317406d5eab74001421131deef5b94e3078f3378567e3a141f1ff461cf65d741a5969fe809d3e50b0dcf320799dfa

data/app/controllers/openstax/accounts/dev/accounts_controller.rb

@@ -18,7 +18,7 @@ module OpenStax
         end
 
         def become
-          @account = Account.find_by(openstax_uid: params[:id])
+          @account = Account.find(params[:id])
           sign_in(@account)
           redirect_back key: :accounts_return_to, strategies: [:session]
         end
@@ -28,7 +28,6 @@ module OpenStax
         def allow_iframe_access
           response.headers.except! 'X-Frame-Options'
         end
-
       end
     end
   end

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

@@ -40,8 +40,7 @@ module OpenStax
       end
 
       def failure
-        redirect_back key: :accounts_return_to,
-                      alert: "Authentication failed, please try again."
+        redirect_back key: :accounts_return_to, alert: "Authentication failed, please try again."
       end
 
       def profile

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

@@ -15,15 +15,13 @@ module OpenStax
 
       def handle
         # Don't worry if the account is logged in or not beforehand. Just assume that they aren't.
-
         # tap is used because we want the block to always run (not just when initializing)
         begin
-          outputs.account = Account.find_or_initialize_by(
-            openstax_uid: @auth_data.uid
-          ).tap do |account|
+          outputs.account = Account.find_or_initialize_by(uuid: @auth_data.uid).tap do |account|
             account.access_token = @auth_data.credentials.token
 
             raw_info = @auth_data.extra.raw_info
+            raw_info = raw_info.merge openstax_uid: raw_info[:id]
             OpenStax::Accounts::Account::SYNC_ATTRIBUTES.each do |attribute|
               begin
                 account.send "#{attribute}=", raw_info[attribute]

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

@@ -1,9 +1,9 @@
 module OpenStax::Accounts
     class Account < ActiveRecord::Base
-
     USERNAME_DISCARDED_CHAR_REGEX = /[^A-Za-z\d_]/
     USERNAME_MAX_LENGTH = 50
     SYNC_ATTRIBUTES = [
+      :openstax_uid,
       :username,
       :first_name,
       :last_name,
@@ -13,27 +13,12 @@ module OpenStax::Accounts
       :faculty_status,
       :school_type,
       :salesforce_contact_id,
-      :uuid,
       :support_identifier,
       :is_test
     ]
 
     attr_accessor :syncing
 
-    has_many :group_owners, dependent: :destroy,
-             class_name: 'OpenStax::Accounts::GroupOwner',
-             primary_key: :openstax_uid,
-             foreign_key: :user_id,
-             inverse_of: :user
-    has_many :groups_as_owner, through: :group_owners, source: :group
-
-    has_many :group_members, dependent: :destroy,
-             class_name: 'OpenStax::Accounts::GroupMember',
-             primary_key: :openstax_uid,
-             foreign_key: :user_id,
-             inverse_of: :user
-    has_many :groups_as_member, through: :group_members, source: :group
-
     enum faculty_status: [:no_faculty_info, :pending_faculty, :confirmed_faculty, :rejected_faculty]
     enum role: [
       :unknown_role,
@@ -50,8 +35,6 @@ module OpenStax::Accounts
 
     validates :faculty_status, :role, :school_type, presence: true
 
-    validates :openstax_uid, uniqueness: { allow_nil: true }
-    validates :username, uniqueness: { allow_nil: true }
     validates :uuid, presence: true, uniqueness: true
     validates :support_identifier, uniqueness: { allow_nil: true }
 
@@ -98,6 +81,5 @@ module OpenStax::Accounts
     def update_openstax_accounts
       OpenStax::Accounts::Api.update_account(self)
     end
-
   end
 end

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

@@ -1,7 +1,6 @@
 module OpenStax
   module Accounts
     class AnonymousAccount < Account
-
       include Singleton
 
       before_save { false }
@@ -9,6 +8,7 @@ module OpenStax
       def initialize(attributes=nil)
         super
         self.id           = nil
+        self.uuid         = nil
         self.openstax_uid = nil
         self.username     = 'anonymous'
         self.first_name   = 'Guest'
@@ -18,7 +18,6 @@ module OpenStax
       def is_anonymous?
         true
       end
-
     end
   end
 end

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

@@ -1,7 +1,6 @@
 module OpenStax
   module Accounts
     class FindOrCreateAccount
-
       lev_routine
 
       protected
@@ -16,8 +15,8 @@ module OpenStax
 
         if OpenStax::Accounts.configuration.enable_stubbing
           # We can only stub finding by username b/c accounts-rails doesn't persist emails
-          id = Account.find_by(username: username).try!(:openstax_uid) ||
-               -SecureRandom.hex(4).to_i(16)/2
+          openstax_uid = Account.find_by(username: username)&.openstax_uid ||
+                         -SecureRandom.hex(4).to_i(16)/2
           uuid = SecureRandom.uuid
           support_identifier = "cs_#{SecureRandom.hex(4)}"
         else
@@ -25,17 +24,18 @@ 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, is_test: is_test
+          )
           fatal_error(code: :invalid_inputs) unless (200..202).include?(response.status)
 
           struct = OpenStruct.new
           Api::V1::UnclaimedAccountRepresenter.new(struct).from_json(response.body)
-          id = struct.id
+          openstax_uid = struct.id
           uuid = struct.uuid
           support_identifier = struct.support_identifier
         end
 
-        account = Account.find_or_initialize_by(openstax_uid: id)
+        account = Account.find_or_initialize_by(uuid: uuid)
 
         unless account.persisted?
           while username.nil? || Account.where(username: username).exists? do
@@ -50,7 +50,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.uuid = uuid
+          account.openstax_uid = openstax_uid
           account.support_identifier = support_identifier
           account.is_test = is_test
           account.save!
@@ -59,7 +59,6 @@ module OpenStax
         transfer_errors_from(account, {type: :verbatim}, true)
         outputs.account = account
       end
-
     end
   end
 end

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

@@ -1,23 +1,17 @@
 module OpenStax
   module Accounts
     class FindOrCreateFromSso
-
       lev_routine express_output: :account
 
       def exec(attrs)
         attrs.stringify_keys!
         uid = attrs.delete('id')
         uuid = attrs.delete('uuid')
-        account = Account.find_or_initialize_by(
-          uuid: uuid, openstax_uid: uid
-        )
-        account.update_attributes!(
-          attrs.slice(*Account.column_names)
-        )
+        account = Account.find_or_initialize_by(uuid: uuid)
+        account.update_attributes!(attrs.slice(*Account.column_names))
         transfer_errors_from(account, {type: :verbatim})
         outputs.account = account
       end
-
     end
   end
 end

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

@@ -4,9 +4,7 @@
 
 module OpenStax
   module Accounts
-
     class SyncAccounts
-
       lev_routine transaction: :no_transaction
 
       protected
@@ -27,7 +25,7 @@ module OpenStax
         updated_app_accounts = []
         app_accounts.each do |app_account|
           account = OpenStax::Accounts::Account.find_by(
-            openstax_uid: app_account.account.openstax_uid
+            uuid: app_account.account.uuid
           ) || app_account.account
           account.syncing = true
 
@@ -45,10 +43,7 @@ module OpenStax
         end
 
         OpenStax::Accounts::Api.mark_account_updates_as_read(updated_app_accounts)
-
       end
-
     end
-
   end
 end

data/app/views/openstax/accounts/dev/accounts/_search_results.html.erb

@@ -12,13 +12,13 @@
           headings: ['UID', 'Username (click to sign in as)', 'Name'],
           widths: ['20%', '40%', '40%'],
           data_procs: [
-            lambda { |account| account.openstax_uid },
-            lambda { |account|
+            ->(account) { account.openstax_uid },
+            ->(account) {
               link_to account.username, become_dev_account_path(
                                           account.openstax_uid
                                         ), method: :post
             },
-            lambda { |account| account.name || '---' }
+            ->(account) { account.name || '---' }
           ]
         }
       ) %>

data/config/routes.rb

@@ -1,5 +1,4 @@
 OpenStax::Accounts::Engine.routes.draw do
-
   # Redirect here if we don't know what to do (theoretically should not happen)
   root to: 'sessions#new'
 
@@ -7,8 +6,8 @@ OpenStax::Accounts::Engine.routes.draw do
   # This is provided by OmniAuth and is not in the SessionsController
   get '/auth/openstax', as: 'openstax_login'
 
-  # User profile route
   if OpenStax::Accounts.configuration.enable_stubbing?
+    # User profile route
     namespace :dev do
       resources :accounts, only: [:index, :create] do
         post 'become', on: :member
@@ -27,5 +26,4 @@ OpenStax::Accounts::Engine.routes.draw do
                     via: OpenStax::Accounts.configuration.logout_via
     get 'profile', action: :profile # Redirects to profile path or stub
   end
-
 end

data/db/migrate/14_drop_openstax_uid_and_username_uniqueness.rb

@@ -0,0 +1,9 @@
+class DropOpenStaxUidAndUsernameUniqueness < ActiveRecord::Migration[5.2]
+  def change
+    remove_index :openstax_accounts_accounts, column: [ :openstax_uid ], unique: true
+    remove_index :openstax_accounts_accounts, column: [ :username ], unique: true
+
+    add_index :openstax_accounts_accounts, :openstax_uid
+    add_index :openstax_accounts_accounts, :username
+  end
+end

data/db/migrate/15_drop_accounts_groups.rb

@@ -0,0 +1,42 @@
+class DropAccountsGroups < ActiveRecord::Migration[5.2]
+  def change
+    drop_table "openstax_accounts_group_members" do |t|
+      t.integer "group_id", null: false
+      t.integer "user_id", null: false
+      t.datetime "created_at", null: false
+      t.datetime "updated_at", null: false
+      t.index ["group_id", "user_id"], name: "index_openstax_accounts_group_members_on_group_id_and_user_id", unique: true
+      t.index ["user_id"], name: "index_openstax_accounts_group_members_on_user_id"
+    end
+
+    drop_table "openstax_accounts_group_nestings" do |t|
+      t.integer "member_group_id", null: false
+      t.integer "container_group_id", null: false
+      t.datetime "created_at", null: false
+      t.datetime "updated_at", null: false
+      t.index ["container_group_id"], name: "index_openstax_accounts_group_nestings_on_container_group_id"
+      t.index ["member_group_id"], name: "index_openstax_accounts_group_nestings_on_member_group_id", unique: true
+    end
+
+    drop_table "openstax_accounts_group_owners" do |t|
+      t.integer "group_id", null: false
+      t.integer "user_id", null: false
+      t.datetime "created_at", null: false
+      t.datetime "updated_at", null: false
+      t.index ["group_id", "user_id"], name: "index_openstax_accounts_group_owners_on_group_id_and_user_id", unique: true
+      t.index ["user_id"], name: "index_openstax_accounts_group_owners_on_user_id"
+    end
+
+    drop_table "openstax_accounts_groups" do |t|
+      t.integer "openstax_uid", null: false
+      t.boolean "is_public", default: false, null: false
+      t.string "name"
+      t.text "cached_subtree_group_ids"
+      t.text "cached_supertree_group_ids"
+      t.datetime "created_at", null: false
+      t.datetime "updated_at", null: false
+      t.index ["is_public"], name: "index_openstax_accounts_groups_on_is_public"
+      t.index ["openstax_uid"], name: "index_openstax_accounts_groups_on_openstax_uid", unique: true
+    end
+  end
+end

data/lib/omniauth/strategies/openstax.rb

@@ -11,7 +11,7 @@ module OmniAuth
         authorize_url: "/oauth/authorize"
       }
 
-      uid { raw_info[:id] }
+      uid { raw_info[:uuid] }
 
       info do
         # Changed to conform to the omniauth schema

data/lib/openstax/accounts/api.rb

@@ -97,155 +97,6 @@ module OpenStax
         request(:put, 'application_users/updated', options.merge(body: application_users.to_json))
       end
 
-      # Retrieves information about groups that have been
-      # recently updated.
-      # Results are limited to groups that users of the current app
-      # have access to.
-      # Takes an options hash.
-      # On failure, throws an Exception, just like the request method.
-      # On success, returns an OAuth2::Response object.
-      def self.get_application_group_updates(options = {})
-        request(:get, 'application_groups/updates', options)
-      end
-
-      # Marks group updates as "read".
-      # The application_groups parameter is an array of hashes.
-      # Each hash has 2 required fields: 'id', which should contain the
-      # application_group's id, and 'read_updates', which should contain
-      # the last received value of unread_updates for that application_group.
-      # Can only be called for application_groups that belong to the current app.
-      # Also takes an options hash.
-      # On failure, throws an Exception, just like the request method.
-      # On success, returns an OAuth2::Response object.
-      def self.mark_group_updates_as_read(application_groups, options = {})
-        request(:put, 'application_groups/updated', options.merge(
-          body: application_groups.to_json
-        ))
-      end
-
-      # Creates a group in the Accounts server.
-      # The given account will be the owner of the group.
-      # Also takes an options hash.
-      # On failure, throws an Exception, just like the request method.
-      # On success, returns a hash containing the group attributes
-      def self.create_group(account, group, options = {})
-        response = ActiveSupport::JSON.decode(
-          request_for_account(account, :post, 'groups', options.merge(
-            body: group.attributes.slice('name', 'is_public').to_json
-          )).body
-        )
-        group.openstax_uid = response['id']
-        response
-      end
-
-      # Updates a group in the Accounts server.
-      # The given account must own the group.
-      # Also takes an options hash.
-      # On failure, throws an Exception, just like the request method.
-      # On success, returns an OAuth2::Response object.
-      def self.update_group(account, group, options = {})
-        request_for_account(account, :put, "groups/#{group.openstax_uid}",
-          options.merge(
-            body: group.attributes.slice('name', 'is_public').to_json
-          )
-        )
-      end
-
-      # Deletes a group from the Accounts server.
-      # The given account must own the group.
-      # Also takes an options hash.
-      # On failure, throws an Exception, just like the request method.
-      # On success, returns an OAuth2::Response object.
-      def self.destroy_group(account, group, options = {})
-        request_for_account(account, :delete, "groups/#{group.openstax_uid}", options)
-      end
-
-      # Creates a group_member in the Accounts server.
-      # The given account must own the group.
-      # Also takes an options hash.
-      # On failure, throws an Exception, just like the request method.
-      # On success, returns an OAuth2::Response object.
-      def self.create_group_member(account, group_member, options = {})
-        request_for_account(
-          account,
-          :post,
-          "groups/#{group_member.group_id}/members/#{group_member.user_id}",
-          options
-        )
-      end
-
-      # Deletes a group_member from the Accounts server.
-      # The given account must own the group.
-      # Also takes an options hash.
-      # On failure, throws an Exception, just like the request method.
-      # On success, returns an OAuth2::Response object.
-      def self.destroy_group_member(account, group_member, options = {})
-        request_for_account(
-          account,
-          :delete,
-          "groups/#{group_member.group_id}/members/#{group_member.user_id}",
-          options
-        )
-      end
-
-      # Creates a group_owner in the Accounts server.
-      # The given account must own the group.
-      # Also takes an options hash.
-      # On failure, throws an Exception, just like the request method.
-      # On success, returns an OAuth2::Response object.
-      def self.create_group_owner(account, group_owner, options = {})
-        request_for_account(
-          account,
-          :post,
-          "groups/#{group_owner.group_id}/owners/#{group_owner.user_id}",
-          options
-        )
-      end
-
-      # Deletes a group_owner from the Accounts server.
-      # The given account must own the group.
-      # Also takes an options hash.
-      # On failure, throws an Exception, just like the request method.
-      # On success, returns an OAuth2::Response object.
-      def self.destroy_group_owner(account, group_owner, options = {})
-        request_for_account(
-          account,
-          :delete,
-          "groups/#{group_owner.group_id}/owners/#{group_owner.user_id}",
-          options
-        )
-      end
-
-      # Creates a group_nesting in the Accounts server.
-      # The given account must own both groups.
-      # Also takes an an options hash.
-      # On failure, throws an Exception, just like the request method.
-      # On success, returns an OAuth2::Response object.
-      def self.create_group_nesting(account, group_nesting, options = {})
-        request_for_account(
-          account,
-          :post,
-          "groups/#{group_nesting.container_group_id}/nestings/#{
-                    group_nesting.member_group_id}",
-          options
-        )
-      end
-
-      # Deletes a group_nesting from the Accounts server.
-      # The given account must own either group.
-      # Also takes an options hash.
-      # On failure, throws an Exception, just like the request method.
-      # On success, returns an OAuth2::Response object.
-      def self.destroy_group_nesting(account, group_nesting, options = {})
-        request_for_account(
-          account,
-          :delete,
-          "groups/#{group_nesting.container_group_id}/nestings/#{
-                    group_nesting.member_group_id}",
-          options
-        )
-      end
-
       # Finds an account matching the provided attributes or creates a new
       # account.  Also takes an options hash.
       # On failure, throws an Exception, just like the request method.