openstax_accounts 8.0.1 → 9.0.2

data/lib/openstax/accounts/engine.rb

@@ -12,7 +12,7 @@ require 'roar'
 require 'roar/decorator'
 require 'roar/json'
 require 'openstax/accounts/action_controller/base'
-require 'openstax/accounts/has_many_through_groups/active_record/base'
+require 'omniauth'
 
 module OpenStax
   module Accounts

data/lib/openstax/accounts/sso.rb

@@ -14,7 +14,7 @@ module OpenStax
       extend self
 
       def user_uuid(request)
-        decrypt(request)['user_uuid']
+        (decrypt(request) || {}).dig("user", "uuid")
       end
 
       # https://github.com/rails/rails/blob/4-2-stable/activesupport/lib/active_support/message_encryptor.rb#L90
@@ -40,14 +40,15 @@ module OpenStax
           key = OpenStax::Accounts.configuration.sso_secret_key
           raise InvalidSecretsConfiguration, 'Missing sso_secret_key configuration' if key.blank?
 
+          cipher        = 'aes-256-cbc'
           salt          = OpenStax::Accounts.configuration.sso_secret_salt
           signed_salt   = "signed encrypted #{salt}"
           key_generator = ActiveSupport::KeyGenerator.new(key, iterations: 1000)
           secret        = key_generator.generate_key(salt)[
-            0, OpenSSL::Cipher.new('aes-256-cbc').key_len
+            0, OpenSSL::Cipher.new(cipher).key_len
           ]
           sign_secret   = key_generator.generate_key(signed_salt)
-          ActiveSupport::MessageEncryptor.new(secret, sign_secret, serializer: JSON)
+          ActiveSupport::MessageEncryptor.new(secret, sign_secret, cipher: cipher, serializer: JSON)
         end
       end
 

data/lib/openstax/accounts/version.rb

@@ -1,5 +1,5 @@
 module OpenStax
   module Accounts
-    VERSION = "8.0.1"
+    VERSION = '9.0.2'
   end
 end

data/lib/tasks/sync.rake

@@ -5,14 +5,6 @@ namespace :openstax do
       task accounts: :environment do
         OpenStax::Accounts::SyncAccounts.call
       end
-
-      desc "Sync Groups with OpenStax Accounts"
-      task groups: :environment do
-        OpenStax::Accounts::SyncGroups.call
-      end
-
-      desc "Sync Accounts and Groups with OpenStax Accounts"
-      task all: [:accounts, :groups]
     end
   end
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: openstax_accounts
 version: !ruby/object:Gem::Version
-  version: 8.0.1
+  version: 9.0.2
 platform: ruby
 authors:
 - JP Slavinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-15 00:00:00.000000000 Z
+date: 2020-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: omniauth
   requirement: !ruby/object:Gem::Requirement
@@ -315,35 +315,22 @@ files:
 - app/models/openstax/accounts/account.rb
 - app/models/openstax/accounts/anonymous_account.rb
 - app/models/openstax/accounts/application_account.rb
-- app/models/openstax/accounts/application_group.rb
-- app/models/openstax/accounts/group.rb
-- app/models/openstax/accounts/group_member.rb
-- app/models/openstax/accounts/group_nesting.rb
-- app/models/openstax/accounts/group_owner.rb
 - app/representers/openstax/accounts/api/v1/account_representer.rb
 - app/representers/openstax/accounts/api/v1/account_search_representer.rb
 - app/representers/openstax/accounts/api/v1/application_account_representer.rb
 - app/representers/openstax/accounts/api/v1/application_account_search_representer.rb
 - app/representers/openstax/accounts/api/v1/application_accounts_representer.rb
-- app/representers/openstax/accounts/api/v1/application_group_representer.rb
-- app/representers/openstax/accounts/api/v1/application_groups_representer.rb
-- app/representers/openstax/accounts/api/v1/group_nesting_representer.rb
-- app/representers/openstax/accounts/api/v1/group_representer.rb
-- app/representers/openstax/accounts/api/v1/group_user_representer.rb
 - app/representers/openstax/accounts/api/v1/unclaimed_account_representer.rb
-- app/routines/openstax/accounts/create_group.rb
 - app/routines/openstax/accounts/dev/create_account.rb
 - app/routines/openstax/accounts/find_or_create_account.rb
 - app/routines/openstax/accounts/find_or_create_from_sso.rb
 - app/routines/openstax/accounts/search_accounts.rb
 - app/routines/openstax/accounts/search_local_accounts.rb
 - app/routines/openstax/accounts/sync_accounts.rb
-- app/routines/openstax/accounts/sync_groups.rb
-- app/routines/openstax/accounts/update_group_caches.rb
 - app/views/layouts/openstax/accounts/application.html.erb
 - app/views/openstax/accounts/dev/accounts/_search_results.html.erb
 - app/views/openstax/accounts/dev/accounts/index.html.erb
-- app/views/openstax/accounts/dev/accounts/search.js.erb
+- app/views/openstax/accounts/dev/accounts/index.js.erb
 - app/views/openstax/accounts/shared/_attention.html.erb
 - app/views/openstax/accounts/shared/accounts/_search.html.erb
 - config/routes.rb
@@ -352,6 +339,8 @@ files:
 - db/migrate/11_add_support_identifier_to_accounts_accounts.rb
 - db/migrate/12_add_is_test_to_accounts_accounts.rb
 - 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/1_create_openstax_accounts_groups.rb
 - db/migrate/2_create_openstax_accounts_group_members.rb
 - db/migrate/3_create_openstax_accounts_group_owners.rb
@@ -371,16 +360,11 @@ files:
 - lib/openstax/accounts/current_user_manager.rb
 - lib/openstax/accounts/default_account_user_mapper.rb
 - lib/openstax/accounts/engine.rb
-- lib/openstax/accounts/has_many_through_groups/active_record/base.rb
 - lib/openstax/accounts/sso.rb
 - lib/openstax/accounts/version.rb
 - lib/openstax_accounts.rb
 - lib/tasks/sync.rake
 - spec/factories/openstax_accounts_account.rb
-- spec/factories/openstax_accounts_group.rb
-- spec/factories/openstax_accounts_group_member.rb
-- spec/factories/openstax_accounts_group_nesting.rb
-- spec/factories/openstax_accounts_group_owner.rb
 homepage: http://github.com/openstax/accounts-rails
 licenses: []
 metadata: {}
@@ -399,7 +383,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.1.1
 signing_key: 
 specification_version: 4
 summary: Rails common code and bindings for the 'accounts' API

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

@@ -1,7 +0,0 @@
-module OpenStax
-  module Accounts
-    class ApplicationGroup
-      attr_accessor :id, :application_id, :group, :unread_updates
-    end
-  end
-end

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

@@ -1,169 +0,0 @@
-module OpenStax::Accounts
-  class Group < ActiveRecord::Base
-
-    serialize :cached_supertree_group_ids
-    serialize :cached_subtree_group_ids
-
-    attr_accessor :requestor, :syncing
-
-    has_many :group_owners, dependent: :destroy,
-             class_name: 'OpenStax::Accounts::GroupOwner',
-             primary_key: :openstax_uid, inverse_of: :group
-    has_many :owners, through: :group_owners, source: :user
-
-    has_many :group_members, dependent: :destroy,
-             class_name: 'OpenStax::Accounts::GroupMember',
-             primary_key: :openstax_uid,
-             inverse_of: :group
-    has_many :members, through: :group_members, source: :user
-
-    has_one :container_group_nesting, dependent: :destroy,
-            class_name: 'OpenStax::Accounts::GroupNesting',
-            primary_key: :openstax_uid,
-            foreign_key: :member_group_id,
-            inverse_of: :member_group
-    has_one :container_group, through: :container_group_nesting
-
-    has_many :member_group_nestings,
-             class_name: 'OpenStax::Accounts::GroupNesting',
-             primary_key: :openstax_uid,
-             foreign_key: :container_group_id,
-             dependent: :destroy,
-             inverse_of: :container_group
-    has_many :member_groups, through: :member_group_nestings
-
-    validates :openstax_uid, uniqueness: true, presence: true
-    validates_presence_of :requestor, unless: :syncing_or_stubbing?
-    validates_uniqueness_of :name, allow_nil: true, unless: :syncing_or_stubbing?
-
-    before_validation :create_openstax_accounts_group, on: :create, unless: :syncing_or_stubbing?
-    before_update :update_openstax_accounts_group, unless: :syncing_or_stubbing?
-    before_destroy :destroy_openstax_accounts_group, unless: :syncing_or_stubbing?
-
-    scope(
-      :visible_for, ->(account) do
-        next where(is_public: true) unless account.is_a? OpenStax::Accounts::Account
-
-        groups = arel_table
-        group_members = OpenStax::Accounts::GroupMember.arel_table
-        group_owners = OpenStax::Accounts::GroupOwner.arel_table
-
-        where(
-          groups[:is_public].eq(true).or(
-            OpenStax::Accounts::GroupMember.where(
-              group_members[:group_id].eq(groups[:openstax_uid]).and(
-                group_members[:user_id].eq(account.id)
-              )
-            ).exists
-          ).or(
-            OpenStax::Accounts::GroupOwner.where(
-              group_owners[:group_id].eq(groups[:openstax_uid]).and(
-                group_owners[:user_id].eq(account.id)
-              )
-            ).exists
-          )
-        )
-      end
-    )
-
-    def has_owner?(account)
-      return false unless account.is_a? OpenStax::Accounts::Account
-
-      gos = group_owners
-      gos = gos.preload(:user) if persisted?
-      gos.any?{ |go| go.user == account }
-    end
-
-    def has_direct_member?(account)
-      return false unless account.is_a? OpenStax::Accounts::Account
-
-      gms = group_members
-      gms = gms.preload(:user) if persisted?
-      gms.any?{ |gm| gm.user == account }
-    end
-
-    def has_member?(account)
-      return false unless account.is_a? OpenStax::Accounts::Account
-      !account.group_members.where(group_id: subtree_group_ids).first.nil?
-    end
-
-    def add_owner(account)
-      return unless account.is_a? OpenStax::Accounts::Account
-      go = GroupOwner.new
-      go.group = self
-      go.user = account
-      return unless go.valid?
-      go.save if persisted?
-      group_owners << go
-      go
-    end
-
-    def add_member(account)
-      return unless account.is_a? OpenStax::Accounts::Account
-      gm = GroupMember.new
-      gm.group = self
-      gm.user = account
-      return unless gm.valid?
-      gm.save if persisted?
-      group_members << gm
-      gm
-    end
-
-    def supertree_group_ids
-      return cached_supertree_group_ids unless cached_supertree_group_ids.nil?
-      return [] unless persisted?
-      reload
-
-      gids = [openstax_uid] + (
-        self.class.joins(:member_group_nestings).where(
-          # This could have been:
-          # member_group_nestings: { member_group_id: openstax_uid }
-          # However that needs a monkeypatch to work in Rails 5 so we currently do this:
-          openstax_accounts_group_nestings: { member_group_id: openstax_uid }
-        ).first.try!(:supertree_group_ids) || []
-      )
-      update_column(:cached_supertree_group_ids, gids)
-      self.cached_supertree_group_ids = gids
-    end
-
-    def subtree_group_ids
-      return cached_subtree_group_ids unless cached_subtree_group_ids.nil?
-      return [] unless persisted?
-      reload
-
-      gids = [openstax_uid] + self.class.joins(:container_group_nesting).where(
-        # This could have been:
-        # container_group_nesting: { container_group_id: openstax_uid }
-        # However that needs a monkeypatch to work in Rails 5 so we currently do this:
-        openstax_accounts_group_nestings: { container_group_id: openstax_uid }
-      ).map { |group| group.subtree_group_ids }.flatten
-      update_column(:cached_subtree_group_ids, gids)
-      self.cached_subtree_group_ids = gids
-    end
-
-    protected
-
-    def syncing_or_stubbing?
-      syncing || OpenStax::Accounts.configuration.enable_stubbing?
-    end
-
-    def create_openstax_accounts_group
-      return false if requestor.nil? || requestor.is_anonymous?
-
-      OpenStax::Accounts::Api.create_group(requestor, self) if requestor.has_authenticated?
-    end
-
-    def update_openstax_accounts_group
-      return false if requestor.nil? || requestor.is_anonymous?
-
-      OpenStax::Accounts::Api.update_group(requestor, self) if requestor.has_authenticated?
-    end
-
-    def destroy_openstax_accounts_group
-      return false if requestor.nil? || requestor.is_anonymous?
-
-      OpenStax::Accounts::Api.destroy_group(requestor, self) if requestor.has_authenticated?
-    end
-
-  end
-end

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

@@ -1,37 +0,0 @@
-module OpenStax::Accounts
-  class GroupMember < ActiveRecord::Base
-
-    delegate :requestor, :syncing, to: :group
-
-    belongs_to :group, class_name: 'OpenStax::Accounts::Group',
-               primary_key: :openstax_uid, inverse_of: :group_members
-    belongs_to :user, class_name: 'OpenStax::Accounts::Account',
-               primary_key: :openstax_uid, inverse_of: :group_members
-
-    validates :group, presence: true
-    validates :user, presence: true, uniqueness: { scope: :group }
-    validates :requestor, presence: true, unless: :syncing_or_stubbing?
-
-    before_create :create_openstax_accounts_group_member, unless: :syncing_or_stubbing?
-    before_destroy :destroy_openstax_accounts_group_member, unless: :syncing_or_stubbing?
-
-    protected
-
-    def syncing_or_stubbing?
-      syncing || OpenStax::Accounts.configuration.enable_stubbing?
-    end
-
-    def create_openstax_accounts_group_member
-      return false if requestor.nil? || requestor.is_anonymous?
-
-      OpenStax::Accounts::Api.create_group_member(requestor, self) if requestor.has_authenticated?
-    end
-
-    def destroy_openstax_accounts_group_member
-      return false if requestor.nil? || requestor.is_anonymous?
-
-      OpenStax::Accounts::Api.destroy_group_member(requestor, self) if requestor.has_authenticated?
-    end
-
-  end
-end

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

@@ -1,55 +0,0 @@
-module OpenStax::Accounts
-  class GroupNesting < ActiveRecord::Base
-
-    delegate :requestor, :syncing, to: :container_group
-
-    belongs_to :container_group, class_name: 'OpenStax::Accounts::Group',
-               primary_key: :openstax_uid, inverse_of: :member_group_nestings
-    belongs_to :member_group, class_name: 'OpenStax::Accounts::Group',
-               primary_key: :openstax_uid, inverse_of: :container_group_nesting
-
-    validates :container_group, presence: true
-    validates :member_group, presence: true, uniqueness: true
-    validates :requestor, presence: true, unless: :syncing_or_stubbing?
-    validate :no_loops, unless: :syncing_or_stubbing?
-
-    before_create :update_group_caches, unless: :syncing
-    before_destroy :update_group_caches, unless: :syncing
-
-    before_create :create_openstax_accounts_group_nesting, unless: :syncing_or_stubbing?
-    before_destroy :destroy_openstax_accounts_group_nesting, unless: :syncing_or_stubbing?
-
-    protected
-
-    def syncing_or_stubbing?
-      syncing || OpenStax::Accounts.configuration.enable_stubbing?
-    end
-
-    def no_loops
-      return if member_group.nil? || !member_group.subtree_group_ids.include?(container_group_id)
-
-      errors.add(:base, 'would create a loop') if errors[:base].blank?
-      throw :abort
-    end
-
-    def update_group_caches
-      UpdateGroupCaches.call(self)
-
-      throw(:abort) if errors.any?
-    end
-
-    def create_openstax_accounts_group_nesting
-      throw(:abort) if requestor.nil? || requestor.is_anonymous?
-
-      OpenStax::Accounts::Api.create_group_nesting(requestor, self) if requestor.has_authenticated?
-    end
-
-    def destroy_openstax_accounts_group_nesting
-      throw(:abort) if requestor.nil? || requestor.is_anonymous?
-
-      OpenStax::Accounts::Api.destroy_group_nesting(requestor, self) \
-        if requestor.has_authenticated?
-    end
-
-  end
-end

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

@@ -1,37 +0,0 @@
-module OpenStax::Accounts
-  class GroupOwner < ActiveRecord::Base
-
-    delegate :requestor, :syncing, to: :group
-
-    belongs_to :group, class_name: 'OpenStax::Accounts::Group',
-               primary_key: :openstax_uid, inverse_of: :group_owners
-    belongs_to :user, class_name: 'OpenStax::Accounts::Account',
-               primary_key: :openstax_uid, inverse_of: :group_owners
-
-    validates :group, presence: true
-    validates :user, presence: true, uniqueness: { scope: :group }
-    validates :requestor, presence: true, unless: :syncing_or_stubbing?
-
-    before_create :create_openstax_accounts_group_owner, unless: :syncing_or_stubbing?
-    before_destroy :destroy_openstax_accounts_group_owner, unless: :syncing_or_stubbing?
-
-    protected
-
-    def syncing_or_stubbing?
-      syncing || OpenStax::Accounts.configuration.enable_stubbing?
-    end
-
-    def create_openstax_accounts_group_owner
-      return false if requestor.nil? || requestor.is_anonymous?
-
-      OpenStax::Accounts::Api.create_group_owner(requestor, self) if requestor.has_authenticated?
-    end
-
-    def destroy_openstax_accounts_group_owner
-      return false if requestor.nil? || requestor.is_anonymous?
-
-      OpenStax::Accounts::Api.destroy_group_owner(requestor, self) if requestor.has_authenticated?
-    end
-
-  end
-end