card-mod-account 0.11.0 → 0.11.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 446ac1cbd57b9473bffdf6fdb91303bc86cbcdcf584e2fafe48fc306da050580
-  data.tar.gz: eecb9da6a9312154ec015ac20353061b8d2839a6c61d2dacabe9c2d3377603b9
+  metadata.gz: 8b9d1ba94c41d615071e2d65c85e31a7144e1238653b90a22630c4690a62eb0a
+  data.tar.gz: f992ea401a0f60f061bf8dfee1c6857f141819ce8c26dc25ebd9ce90950be4d3
 SHA512:
-  metadata.gz: 9472b1ed791997464de8a57adad65d83b9021df74750f76edaab8fddfb51df493801f659c861a870ae29994e806add8add7e8aa8f07c73954b159f9e288ed050
-  data.tar.gz: 8525e80cacd92f2d5c7ce960bbdda0be8fc63441fb3cb408080bbf03a0d9fe2c302da16ab60b117c923d5141bd1a62611e3bc48ad61cc677c6ac62729b1bce36
+  metadata.gz: 11b3de8aea618723fd95440d0957c8c206f016a7b3ebc63a9271c4955096eb02d4803303f6b461a26a8b8d8287470c82a680b7495d010b31f7379f9ee06c091d
+  data.tar.gz: 3b1c09772530fcd400a40c1104afe149adbaebd502780637cb478f9903e658993d03f8c12c01feed984c1ceb5f8cc2550f35e8d45acaa76b033f57d1a09bfa52

data/set/abstract/account_field.rb

@@ -1,3 +1,8 @@
+delegate :accounted, to: :account_card
+
+def account_card
+  left
+end
 
 # allow account owner to update account field content
 def ok_to_update

data/set/abstract/accountable.rb

@@ -38,7 +38,11 @@ format :html do
        { path: { slot: { hide: %i[help_link bridge_link] } } }],
       ["Roles", :roles,
        { path:  { view: :content_with_edit_button } }],
-      ["Notifications", :follow]
+      ["Notifications", :follow],
+      ["API", :account,
+       { path: { view: :api_key,
+                 items: { view: :content },
+                 slot: { hide: %i[help_link bridge_link] } } }]
     ]
   end
 

data/set/all/account.rb

@@ -39,6 +39,7 @@ def fetch_read_rules
 
   ([AnyoneID] + parties).each_with_object([]) do |party_id, rule_ids|
     next unless (cache = Card::Rule.read_rule_cache[party_id])
+
     rule_ids.concat cache
   end
 end
@@ -48,10 +49,16 @@ def clear_roles
 end
 
 def with_clear_roles
-  a, b, c, d = @parties, @all_roles, @all_active_roles, @read_rules
+  a = @parties
+  b = @all_roles
+  c = @all_active_roles
+  d = @read_rules
   yield
 ensure
-  @parties, @all_roles, @all_active_roles, @read_rules = a, b, c, d
+  @parties = a
+  @all_roles = b
+  @all_active_roles = c
+  @read_rules = d
 end
 
 def all_enabled_roles
@@ -63,15 +70,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/right/account.rb

@@ -4,7 +4,6 @@ card_accessor :email
 card_accessor :password
 card_accessor :salt
 card_accessor :status
-card_accessor :api_key
 
 require_field :email
 
@@ -17,7 +16,7 @@ def accounted_id
 end
 
 def ok_to_read
-  own_account? ? true : super
+  own_account? || super
 end
 
 # allow account owner to update account field content
@@ -43,16 +42,12 @@ def send_account_email email_template
   ecard.deliver self, to: email
 end
 
-def validate_api_key! api_key
-  api_key_card.validate! api_key
-end
-
 def method_missing method, *args
-  super unless args.empty? && (matches = method.match(/^(?<status>.*)\?$/))
+  return super unless args.empty? && (matches = method.match(/^(?<status>.*)\?$/))
 
   status == matches[:status]
 end
 
 def respond_to_missing? method, _include_private=false
-  method.match?(/\?/) ? true : super
+  method.match?(/\?$/) ? true : super
 end

data/set/right/account/events.rb

@@ -44,7 +44,7 @@ def activatable
   yield
 end
 
-# note: this only works in the context of an action.
+# NOTE: this only works in the context of an action.
 # if run independently, it will not activate an account
 event :activate_account do
   add_subfield :status, content: "active"
@@ -95,5 +95,5 @@ end
 
 def reset_password_failure error_message
   Auth.as_bot { send_password_reset_email }
-  errors.add :content, tr(:sorry_email_reset, error_msg: error_message)
+  errors.add :content, t(:account_sorry_email_reset, error_msg: error_message)
 end

data/set/right/email.rb

@@ -8,7 +8,7 @@ event :validate_email, :validate, on: :save do
   self.content = content.strip
   return if content.match?(/^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i)
 
-  errors.add :content, tr(:error_invalid_address)
+  errors.add :content, t(:account_error_invalid_address)
 end
 
 event :validate_unique_email, after: :validate_email, on: :save do
@@ -16,9 +16,9 @@ event :validate_unique_email, after: :validate_email, on: :save do
     Auth.as_bot do
       cql = { right_id: EmailID, eq: content, return: :id }
       cql[:not] = { id: id } if id
-      cql_comment = tr(:search_email_duplicate, content: content)
+      cql_comment = t(:account_search_email_duplicate, content: content)
       if Card.search(cql, cql_comment).first
-        errors.add :content, tr(:error_not_unique)
+        errors.add :content, t(:account_error_not_unique)
       end
     end
   end
@@ -26,6 +26,7 @@ end
 
 event :downcase_email, :prepare_to_validate, on: :save do
   return if !content || content == content.downcase
+
   self.content = content.downcase
 end
 
@@ -37,7 +38,7 @@ def ok_to_read
   if own_email? || Auth.always_ok?
     true
   else
-    deny_because tr(:deny_email_restricted)
+    deny_because t(:account_deny_email_restricted)
   end
 end
 

data/set/right/password.rb

@@ -5,7 +5,7 @@ def history?
 end
 
 def ok_to_read
-  own_account? ? true : super
+  own_account? || super
 end
 
 event :encrypt_password, :store,
@@ -23,7 +23,7 @@ end
 event :validate_password, :validate, on: :save do
   return if content.length > 3
 
-  errors.add :password, tr(:password_length)
+  errors.add :password, t(:account_password_length)
 end
 
 event :validate_password_present, :prepare_to_validate, on: :update do
@@ -31,7 +31,7 @@ event :validate_password_present, :prepare_to_validate, on: :update do
 end
 
 view :raw do
-  tr :encrypted
+  t :account_encrypted
 end
 
 format :html do
@@ -46,6 +46,7 @@ format :html do
 
   def autocomplete?
     return "on" if @parent && @parent.card.name == "*signin+*account" # HACK
+
     "off"
   end
 end

data/set/right/roles.rb

@@ -9,8 +9,8 @@ end
 def forbidden_roles
   # restore old roles for permission check
   with_old_role_permissions do |new_roles|
-    new_roles.select do |card|
-      !Card.fetch(card, "*members").ok? :update
+    new_roles.reject do |card|
+      Card.fetch(card, "*members").ok? :update
     end
   end
 end

data/set/right/salt.rb

@@ -9,5 +9,5 @@ def history?
 end
 
 view :raw do
-  tr :private_data
+  t :account_private_data
 end

data/set/right/status.rb

@@ -11,7 +11,7 @@ end
 
 def ok_to_update
   if own_account? && !Auth.always_ok?
-    deny_because you_cant(tr(:deny_not_change_own_account))
+    deny_because you_cant(t(:account_deny_not_change_own_account))
   else
     super
   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
@@ -42,10 +47,6 @@ def recaptcha_on?
   false
 end
 
-def i18n_signin key
-  I18n.t key, scope: "mod.card-mod-account.set.self.signin"
-end
-
 def authenticate_or_abort email, pword
   abort_unless email, :email_missing
   abort_unless pword, :password_missing
@@ -64,53 +65,31 @@ def failed_signin email
 end
 
 def abort_unless value, error_key
-  abort :failure, i18n_signin(error_key) unless value
+  abort :failure, t("account_#{error_key}") unless value
 end
 
 def signin_error_message account
-  case
-  when account.nil?     then i18n_signin(:error_unknown_email)
-  when !account.active? then i18n_signin(:error_not_active)
-  else                       i18n_signin(:error_wrong_password)
-  end
+  t "account_#{signin_error_key account}"
 end
 
 def error_on field, error_key
-  errors.add field, i18n_signin(error_key)
+  errors.add field, t("account_#{error_key}")
 end
 
 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
@@ -127,6 +106,16 @@ def reset_password_fail account
   end
 end
 
+private
+
+def signin_error_key account
+  case
+  when account.nil?     then :error_unknown_email
+  when !account.active? then :error_not_active
+  else                       :error_wrong_password
+  end
+end
+
 format :html do
   view :core, cache: :never do
     voo.edit_structure = [signin_field(:email), signin_field(:password)]
@@ -148,7 +137,7 @@ format :html do
 
   # FIXME: need a generic solution for this
   view :title do
-    voo.title ||= I18n.t(:sign_in_title, scope: "mod.card-mod-account.set.self.signin")
+    voo.title ||= t(:account_sign_in_title)
     super()
   end
 
@@ -163,7 +152,7 @@ format :html do
 
   view :reset_password_success do
     # 'Check your email for a link to reset your password'
-    frame { I18n.t(:check_email, scope: "mod.card-mod-account.set.self.signin") }
+    frame { t :account_check_email }
   end
 
   view :signin_buttons do
@@ -179,33 +168,31 @@ format :html do
   end
 
   def reset_password_voo
-    voo.title ||= card.i18n_signin(:forgot_password)
+    voo.title ||= t :account_forgot_password
     voo.edit_structure = [signin_field(:email)]
     voo.hide :help
   end
 
   view :edit_buttons do
-    text = I18n.t :reset_my_password, scope: "mod.card-mod-account.set.self.signin"
-    button_tag text, situation: "primary", class: "_close-modal-on-success"
+    button_tag t(:account_reset_my_password),
+               situation: "primary", class: "_close-modal-on-success"
   end
 
   def signin_success
-    "REDIRECT: #{Env.interrupted_action || '*previous'}"
+    { redirect: true, mark: (Env.interrupted_action || "*previous") }
   end
 
   def signin_button
-    text = I18n.t :sign_in, scope: "mod.card-mod-account.set.self.signin"
-    button_tag text, situation: "primary"
+    button_tag t(:account_sign_in), situation: "primary"
   end
 
   def signup_link
-    text = I18n.t :or_sign_up, scope: "mod.card-mod-account.set.self.signin"
-    subformat(Card[:account_links]).render! :sign_up, title: text
+    subformat(Card[:account_links]).render! :sign_up, title: t(:account_or_sign_up)
   end
 
   def reset_password_link
-    text = I18n.t :reset_password, scope: "mod.card-mod-account.set.self.signin"
-    link = link_to_view :edit, text, path: { slot: { hide: :bridge_link } }
+    link = link_to_view :edit, t(:account_reset_password),
+                        path: { slot: { hide: :bridge_link } }
     # FIXME: inline styling
     raw("<div style='float:right'>#{link}</div>")
   end

data/set/type/signup/views.rb

@@ -4,7 +4,7 @@ format :html do
   end
 
   view :new do
-    voo.title = invitation? ? tr(:invite) : tr(:sign_up)
+    voo.title = invitation? ? t(:account_invite) : t(:account_sign_up)
     super()
   end
 
@@ -20,6 +20,7 @@ format :html do
 
   def invite_button
     return unless invitation?
+
     button_tag "Send Invitation", situation: "primary"
   end
 
@@ -46,7 +47,7 @@ format :html do
     if card.account
       verification_lines
     else
-      [tr(:missing_account)]
+      [t(:account_missing_account)]
     end
   end
 
@@ -57,12 +58,14 @@ format :html do
   def verification_sent_line
     account = card.account
     return unless account.email_card.ok?(:read)
+
     "A verification email has been sent to #{account.email}"
   end
 
   def verification_link_line
     links = verification_links
     return if links.empty?
+
     links.join " "
   end
 
@@ -81,6 +84,7 @@ format :html do
 
   def approval_link text, with_or_without
     return unless card.can_approve?
+
     link_to_card card, text,
                  path: { action: :update,
                          card: { trigger: "approve_#{with_or_without}_verification" } }
@@ -88,6 +92,7 @@ format :html do
 
   def deny_link
     return unless card.ok? :delete
+
     link_to_card card, "Deny and delete", path: { action: :delete }
   end
 end

data/set/type/user.rb

@@ -35,7 +35,7 @@ format :html do
   def setup_hidden_fields
     hidden_tags(
       setup: true,
-      success: "REDIRECT: #{path mark: ''}",
+      success: { redirect: true, mark: path(mark: "") },
       "card[type_id]" => Card.default_accounted_type_id
     )
   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.5
 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-05-10 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.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.101.0
+        version: 1.101.5
 - !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.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.11.5
 - !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.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.11.5
 - !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.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.11.5
 description: ''
 email:
 - info@decko.org
@@ -82,7 +82,6 @@ files:
 - set/right/account.rb
 - set/right/account/events.rb
 - set/right/account/views.rb
-- set/right/api_key.rb
 - set/right/email.rb
 - set/right/password.rb
 - set/right/roles.rb
@@ -97,10 +96,15 @@ files:
 - set/type/user.rb
 - set/type/user/setup_help.haml
 - set/type_plus_right/user/email.rb
-homepage: http://decko.org
+homepage: https://decko.org
 licenses:
 - GPL-3.0
 metadata:
+  source_code_uri: https://github.com/decko-commons/decko
+  homepage_uri: https://decko.org
+  bug_tracker_uri: https://github.com/decko-commons/decko/issues
+  wiki_uri: https://decko.org
+  documentation_url: http://docs.decko.org/
   card-mod: account
 post_install_message:
 rdoc_options: []
@@ -117,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Email-based account handling for decko cards

data/set/right/api_key.rb

@@ -1,48 +0,0 @@
-include_set Abstract::AccountField
-
-# DURATIONS = "second|minute|hour|day|week|month|year".freeze
-
-def history?
-  false
-end
-
-view :raw do
-  tr :private_data
-end
-
-def validate! api_key
-  error =
-    case
-    when !real?             then [:token_not_found, tr(:error_token_not_found)]
-    # when expired?           then [:token_expired, tr(:error_token_expired)]
-    when content != api_key then [:incorrect_token, tr(:error_incorrect_token)]
-    end
-  errors.add(*error) if error
-  error.nil?
-end
-
-# def expired?
-#   !permanent? && updated_at <= term.ago
-# end
-#
-# def permanent?
-#   term == "permanent"
-# end
-
-# def term
-#   @term ||=
-#     if expiration.present?
-#       term_from_string expiration
-#     else
-#       Card.config.token_expiry
-#     end
-# end
-
-# def term_from_string string
-#   string.strip!
-#   return "permanent" if string == "none"
-#   re_match = /^(\d+)[\.\s]*(#{DURATIONS})s?$/.match(string)
-#   number, unit = re_match.captures if re_match
-#   raise Card::Open::Error, tr(:exception_bad_expiration, example: '2 days') unless unit
-#   number.to_i.send unit
-# end