card-mod-account 0.11.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 446ac1cbd57b9473bffdf6fdb91303bc86cbcdcf584e2fafe48fc306da050580
-  data.tar.gz: eecb9da6a9312154ec015ac20353061b8d2839a6c61d2dacabe9c2d3377603b9
+  metadata.gz: e8c86e418e23551b4e344d47073a5cea56789cab7a091d0ece4d6b7488bfe4fe
+  data.tar.gz: 1a18cfb82d88f0bcca51ec77b99237bbe4c5527db7bb527fbcaeff0d87338863
 SHA512:
-  metadata.gz: 9472b1ed791997464de8a57adad65d83b9021df74750f76edaab8fddfb51df493801f659c861a870ae29994e806add8add7e8aa8f07c73954b159f9e288ed050
-  data.tar.gz: 8525e80cacd92f2d5c7ce960bbdda0be8fc63441fb3cb408080bbf03a0d9fe2c302da16ab60b117c923d5141bd1a62611e3bc48ad61cc677c6ac62729b1bce36
+  metadata.gz: c7103bb8aea180221f488ed16dfce14862f7d4d7228110177a9d9b0423144220c383c1c4ec7b1651f07f997b5440cf49c5378cc377df8497ba6240ca38c44548
+  data.tar.gz: 04bc2d61a8f17c24f2d6d1aa06eb7aa978afd78a70593007e27a25bfeb247e869f43f4bccd46d203ebbe93cfa08f2377864bdb7bb2c04e285e2a30a08bd32d9c

data/set/all/account.rb

@@ -63,15 +63,17 @@ def all_roles
 end
 
 def enabled_role_ids
-  Auth.as_bot do
-    # workaround for broken migrations
-    return fetch_roles unless Card::Codename.exists? :enabled_roles
-
-    enabled = enabled_roles_card
+  with_enabled_roles do |enabled|
     enabled.virtual? ? enabled.item_ids : fetch_roles
   end
 end
 
+def with_enabled_roles
+  Auth.as_bot do
+    Card::Codename.exists?(:enabled_roles) ? yield(enabled_roles_card) : fetch_roles
+  end
+end
+
 def enabled_roles_card
   fetch :enabled_roles, eager_cache: true, new: { type_id: SessionID }
 end

data/set/self/signin.rb

@@ -30,8 +30,13 @@ end
 # triggered by clicking "Reset my Password", this sends out the verification password
 # and aborts (does not sign in)
 event :send_reset_password_token, before: :signin, on: :update, trigger: :required do
-  email = subfield(:email)&.content
-  send_reset_password_email_or_fail email
+  aborting do
+    blank_email? ? break : send_reset_password_email_or_fail
+  end
+end
+
+def email_from_subfield
+  @email_from_subfield ||= subfield(:email)&.content
 end
 
 def ok_to_read
@@ -83,34 +88,16 @@ def account_for email
   Auth.find_account_by_email email
 end
 
-def send_reset_password_email_or_fail email
-  aborting do
-    break errors.add :email, i18n_signin(:error_blank) if email.blank?
-
-    if (account = Auth.find_account_by_email(email))&.active?
-      Auth.as_bot { account.send_password_reset_email }
-    elsif account
-      errors.add :account, i18n_signin(:error_not_active)
-    else
-      errors.add :email, i18n_signin(:error_not_recognized)
-    end
-  end
-end
-
-def send_reset_password_email_or_fail email
-  aborting do
-    break if blank_email? email
-
-    if (account = account_for email)&.active?
-      send_reset_password_email account
-    else
-      reset_password_fail account
-    end
+def send_reset_password_email_or_fail
+  if (account = account_for email_from_subfield)&.active?
+    send_reset_password_email account
+  else
+    reset_password_fail account
   end
 end
 
-def blank_email? email
-  return false if email.present?
+def blank_email?
+  return false if email_from_subfield.present?
 
   error_on :email, :error_blank
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card-mod-account
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.1
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-24 00:00:00.000000000 Z
+date: 2021-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: card
@@ -18,56 +18,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.101.0
+        version: 1.101.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.101.0
+        version: 1.101.1
 - !ruby/object:Gem::Dependency
   name: card-mod-email
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.11.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.11.1
 - !ruby/object:Gem::Dependency
   name: card-mod-permissions
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.11.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.11.1
 - !ruby/object:Gem::Dependency
   name: card-mod-list
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.11.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.11.1
 description: ''
 email:
 - info@decko.org