card-mod-account 0.11.3 → 0.11.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b237e442ade76d1e44bcf1066f9ba4abf1e3c8dc55ca39bcd3ba1f898c01f69
-  data.tar.gz: 5c83dce3d80fc497811eb711ba12cb60f77d7655b37f61215d6d6ca94e17e1af
+  metadata.gz: b60af30b525fd3ac836eb2a8b1ab4e13758a88485c4861f8c26b6878a0defab9
+  data.tar.gz: '0381cbe86059a0ee9867727c61e389473f6aea9966ffc4ceff117c349eaeb7ff'
 SHA512:
-  metadata.gz: 61355a51f38121d1392522d6c162a5f32a0efafd1272a843d5a95f867465cb31c1b3d4518a126b3719ebbb24348162784df4c74724f9b8b186b7d7ce9308bf38
-  data.tar.gz: f04ceac8af2706636ce3f4e337941a5c25c2efe9b0963aff7e8b88e30c2e9f97e04f2394a2ee6c6ca9859ea09ef7c509808ca9696489a87f8e7c91208077fd50
+  metadata.gz: 7ef1385dca358dd1a04be6d06dc0708d7190724e2a7772ce795e581a43651f0aa94f2dba8bebceb1e870ed3a2155ff4380b7ea99b562fae8e8d6cbbb3a3d2027
+  data.tar.gz: 6b3fcf88772d9333b3b6bd965cf37ce7fd7d469e7e961dc50090be977fb2c26a10e5bb4d7072214c56f9f4126c0cd53fddbdb891d736a86187028b7fb334f268

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/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

@@ -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
@@ -37,7 +37,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

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

@@ -65,19 +65,15 @@ def failed_signin email
 end
 
 def abort_unless value, error_key
-  abort :failure, tr(error_key) unless value
+  abort :failure, t("account_#{error_key}") unless value
 end
 
 def signin_error_message account
-  case
-  when account.nil?     then tr :error_unknown_email
-  when !account.active? then tr :error_not_active
-  else                       tr :error_wrong_password
-  end
+  t "account_#{signin_error_key account}"
 end
 
 def error_on field, error_key
-  errors.add field, tr(error_key)
+  errors.add field, t("account_#{error_key}")
 end
 
 def account_for email
@@ -110,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)]
@@ -131,7 +137,7 @@ format :html do
 
   # FIXME: need a generic solution for this
   view :title do
-    voo.title ||= tr :sign_in_title
+    voo.title ||= t(:account_sign_in_title)
     super()
   end
 
@@ -146,7 +152,7 @@ format :html do
 
   view :reset_password_success do
     # 'Check your email for a link to reset your password'
-    frame { tr :check_email }
+    frame { t :account_check_email }
   end
 
   view :signin_buttons do
@@ -162,30 +168,31 @@ format :html do
   end
 
   def reset_password_voo
-    voo.title ||= tr :forgot_password
+    voo.title ||= t :account_forgot_password
     voo.edit_structure = [signin_field(:email)]
     voo.hide :help
   end
 
   view :edit_buttons do
-    button_tag tr(:reset_my_password),
+    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
-    button_tag tr(:sign_in), situation: "primary"
+    button_tag t(:account_sign_in), situation: "primary"
   end
 
   def signup_link
-    subformat(Card[:account_links]).render! :sign_up, title: tr(:or_sign_up)
+    subformat(Card[:account_links]).render! :sign_up, title: t(:account_or_sign_up)
   end
 
   def reset_password_link
-    link = link_to_view :edit, tr(:reset_password), 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
 
@@ -46,7 +46,7 @@ format :html do
     if card.account
       verification_lines
     else
-      [tr(:missing_account)]
+      [t(:account_missing_account)]
     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.3
+  version: 0.11.4
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-01 00:00:00.000000000 Z
+date: 2021-05-05 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.3
+        version: 1.101.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.101.3
+        version: 1.101.4
 - !ruby/object:Gem::Dependency
   name: card-mod-email
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.3
+        version: 0.11.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.3
+        version: 0.11.4
 - !ruby/object:Gem::Dependency
   name: card-mod-permissions
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.3
+        version: 0.11.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.3
+        version: 0.11.4
 - !ruby/object:Gem::Dependency
   name: card-mod-list
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.3
+        version: 0.11.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.3
+        version: 0.11.4
 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

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