[C] Lint

Author: timfrazee

api/app/authorizers/user_group_authorizer.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 class UserGroupAuthorizer < ApplicationAuthorizer
-
   # Admins only
   def self.default(_ability, user, _options = {})
     admin_permissions?(user)

api/app/controllers/api/v1/tokens_controller.rb

@@ -39,7 +39,6 @@ def user_by_auth_code
       def token_params
         params.permit(:email, :password)
       end
-
     end
   end
 end

api/app/controllers/concerns/manages_oauth_cookie.rb

@@ -42,5 +42,4 @@ def cookie_domain
       ".#{domain}"
     end
   end
-
 end

api/app/models/concerns/externally_identifiable.rb

@@ -12,15 +12,15 @@ module ExternallyIdentifiable
   def external_identifier=(record_or_identifier)
     case record_or_identifier.presence
     when ExternalIdentifier
-      super(record_or_identifier)
+      super
     when String
-      if self.external_identifier.present?
-        self.external_identifier.update(identifier: record_or_identifier)
+      if external_identifier.present?
+        external_identifier.update(identifier: record_or_identifier)
       else
-        self.build_external_identifier(identifier: record_or_identifier)
+        build_external_identifier(identifier: record_or_identifier)
       end
     when nil
-      self.external_identifier&.destroy
+      external_identifier&.destroy
     else
       raise ArgumentError, "Invalid external identifier value"
     end

api/app/models/identity.rb

@@ -7,7 +7,7 @@ class Identity < ApplicationRecord
 
   belongs_to :user, optional: false, inverse_of: :identities
 
-  has_many :user_group_memberships, as: :source
+  has_many :user_group_memberships, as: :source, dependent: :destroy
 
   validates :provider, inclusion: { in: ->(_) { (ManifoldEnv.oauth.known_strategies + SamlConfig.provider_names) } }
   validates :uid, :provider, presence: true

api/app/models/user.rb

@@ -53,7 +53,7 @@ class User < ApplicationRecord
            through: :reading_group_visibilities, source: :reading_group
   has_many :entitlement_user_links, inverse_of: :user, dependent: :destroy
   has_many :granted_entitlements, through: :entitlement_user_links, source: :entitlement
-  has_many :user_group_memberships, inverse_of: :user
+  has_many :user_group_memberships, inverse_of: :user, dependent: :destroy
   has_many :user_groups, through: :user_group_memberships
   has_many_readonly :permissions
 

api/app/models/user_group.rb

@@ -6,8 +6,8 @@ class UserGroup < ApplicationRecord
   include Filterable
   include ExternallyIdentifiable
 
-  has_many :memberships, class_name: "UserGroupMembership", inverse_of: :user_group
-  has_many :entitleables, class_name: "UserGroupEntitleable", inverse_of: :user_group
+  has_many :memberships, class_name: "UserGroupMembership", inverse_of: :user_group, dependent: :destroy
+  has_many :entitleables, class_name: "UserGroupEntitleable", inverse_of: :user_group, dependent: :destroy
 
   has_many :users, through: :memberships
 

api/app/models/user_group_entitleable.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class UserGroupEntitleable < ApplicationRecord
   include Authority::Abilities
   include SerializedAbilitiesFor

api/app/models/user_group_membership.rb

@@ -13,5 +13,4 @@ class UserGroupMembership < ApplicationRecord
   def name
     "#{user_group.name} membership for #{user.name}"
   end
-
 end

api/app/operations/identities/sync_managed_entitlements.rb

@@ -6,7 +6,7 @@ class SyncManagedEntitlements
     include Dry::Monads[:result, :do]
 
     ENTITLEABLES = [Project, ProjectCollection, Journal].freeze
-    ROLE = { scoped_roles: { read_access: true } }
+    ROLE = { scoped_roles: { read_access: true } }.freeze
 
     attr_reader :auth_hash, :identity, :user
 
@@ -52,7 +52,7 @@ def to_remove
     end
 
     def desired_entitleable_identifiers
-      @desired_identifiers ||= auth_hash.info.entitlements&.split(/,;/)&.compact || []
+      @desired_identifiers ||= auth_hash.info.entitlements&.split(/[,;]/)&.compact || []
     end
 
     def existing_entitlements
@@ -64,6 +64,5 @@ def existing_identifiers
         entitlement.subject.external_identifier&.identifier
       end.compact
     end
-
   end
 end