card 1.98.3 → 1.99.0

data/mod/account/set/right/email.rb

@@ -1,4 +1,4 @@
-include All::Permissions::Accounts
+include_set Abstract::AccountField
 
 event :validate_email, :validate, on: :save do
   if content? && content !~ /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i
@@ -25,7 +25,7 @@ event :downcase_email, :prepare_to_validate, on: :save do
 end
 
 def email_required?
-  !built_in?
+  !left.system?
 end
 
 def ok_to_read

data/mod/account/set/right/password.rb

@@ -1,4 +1,4 @@
-include All::Permissions::Accounts
+include_set Abstract::AccountField
 
 def history?
   false
@@ -13,8 +13,6 @@ event :encrypt_password, :store,
       when: proc { !Card::Env[:no_password_encryptions] } do
   # no_password_encryptions = hack for import - fix with api for ignoring events
   salt = left&.salt
-  # HACK: fix with better ORM handling
-  salt = Card::Env[:salt] unless salt.present?
   self.content = Auth.encrypt content, salt
 
   # errors.add :password, 'need a valid salt'
@@ -22,11 +20,10 @@ event :encrypt_password, :store,
   # not sure when that broke??
 end
 
-event :validate_password, :validate,
-      on: :save do
-  unless content.length > 3
-    errors.add :password, tr(:password_length)
-  end
+event :validate_password, :validate, on: :save do
+  return if content.length > 3
+
+  errors.add :password, tr(:password_length)
 end
 
 event :validate_password_present, :prepare_to_validate, on: :update do
@@ -42,7 +39,7 @@ format :html do
     render_raw
   end
 
-  view :editor do
+  view :input do
     card.content = ""
     password_field :content, class: "d0-card-content", autocomplete: autocomplete?
   end

data/mod/account/set/right/salt.rb

@@ -1,4 +1,8 @@
-include All::Permissions::Accounts
+include_set Abstract::AccountField
+
+def generate
+  self.content = Digest::SHA1.hexdigest "--#{Time.zone.now}--"
+end
 
 def history?
   false

data/mod/account/set/right/status.rb

@@ -1,4 +1,13 @@
-include All::Permissions::Accounts
+include_set Abstract::AccountField
+include_set Abstract::Pointer
+
+def input_type
+  :radio
+end
+
+def option_names
+  %w[unapproved unverified active blocked system]
+end
 
 def ok_to_update
   if own_account? && !Auth.always_ok?

data/mod/account/set/self/signin.rb

@@ -71,7 +71,7 @@ def send_reset_password_email_or_fail email
     break errors.add :email, i18n_signin(:error_blank) if email.blank?
 
     if (account = Auth.find_account_by_email(email))&.active?
-      account.send_reset_password_token
+      Auth.as_bot { account.send_password_reset_email }
     elsif account
       errors.add :account, i18n_signin(:error_not_active)
     else
@@ -86,7 +86,7 @@ format :html do
     with_nest_mode :edit do
       card_form :update, recaptcha: :off, success: signin_success do
         [
-          _render_content_formgroup,
+          _render_content_formgroups,
           _render_signin_buttons
         ]
       end
@@ -110,7 +110,7 @@ format :html do
     _render_core
   end
 
-  view :closed_content do
+  view :one_line_content do
     ""
   end
 

data/mod/account/set/type/role.rb

@@ -14,4 +14,8 @@ format :html do
        render_link]
     end
   end
+
+  def related_by_content_items
+    super.unshift ["members", :members]
+  end
 end

data/mod/account/set/type/signup.rb

@@ -1,180 +1,53 @@
-format :html do
-  def invitation?
-    return @invitation unless @invitation.nil?
-    @invitation = Auth.signed_in? &&
-                  (card.fetch trait: :account, new: {}).can_approve?
-    # consider making account a card_accessor?
-  end
-
-  view :new do
-    voo.title = invitation? ? tr(:invite) : tr(:sign_up)
-    super()
-  end
-
-  before :name_formgroup do
-    voo.help = tr :first_last_help
-  end
-
-  view :content_formgroup do
-    [account_formgroups, (card.structure ? edit_slot : "")].join
-  end
-
-  def hidden_success override=nil
-    override = card.rule(:thanks) unless invitation?
-    super override
-  end
-
-  view :new_buttons do
-    button_formgroup do
-      [standard_create_button, invite_button].compact
-    end
-  end
-
-  def invite_button
-    return unless invitation?
-    button_tag "Send Invitation", situation: "primary"
-  end
-
-  def account_formgroups
-    account = card.fetch trait: :account, new: {}
-    Auth.as_bot do
-      subformat(account)._render :content_formgroup, structure: true
-    end
-  end
-
-  view :core, template: :haml do
-    @lines = [signup_line] + account_lines
-    @body = process_content _render_raw
-  end
-
-  def signup_line
-    [ "<strong>#{safe_name}</strong>",
-      ("was" unless anonymous_signup?),
-      "signed up on #{format_date card.created_at}"
-    ].compact.join " "
-  end
-
-  def anonymous_signup?
-    card.creator_id == AnonymousID
-  end
-
-  def account_lines
-    if card.account
-      verification_lines
-    else
-      [tr(:missing_account)]
-    end
-  end
-
-  def verification_lines
-    [ verification_sent_line, verification_link_line].compact
-  end
-
-  def verification_sent_line
-    account = card.account
-    return unless account.token.present? && 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
-
-  def verification_links
-    [approve_with_token_link, approve_without_token_link, deny_link].compact
-  end
-
-  def approve_with_token_link
-    return unless card.account.can_approve?
-    token_action = card.account.token.present? ? "Resend" : "Send"
-    link_to_card card, "#{token_action} verification email",
-                 path: { action: :update, approve_with_token: true }
-  end
+include_set Abstract::Accounted
 
-  def approve_without_token_link
-    return unless card.account.can_approve?
-    link_to_card card, "Approve without verification",
-                 path: { action: :update, approve_without_token: true }
-  end
-
-  def deny_link
-    return unless card.ok? :delete
-    link_to_card card, "Deny and delete", path: { action: :delete }
-  end
-end
+require_field :account
 
 def default_account_status
-  "pending"
-end
-
-event :activate_by_token, :validate, on: :update,
-                                     when: proc { |c| c.has_token? } do
-  abort :failure, "no field manipulation mid-activation" if subcards.present?
-  # necessary because this performs actions as Wagn Bot
-  abort :failure, "no account associated with #{name}" unless account
-
-  if account.validate_token! @env_token
-    # account.token_card.used!
-    activate_account
-    Auth.signin id
-    Auth.as_bot # use admin permissions for rest of action
-    success << ""
-  else
-    resend_activation_token
-    abort :success
-  end
+  can_approve? ? "unverified" : "unapproved"
 end
 
-def has_token?
-  @env_token = Env.params[:token]
+def can_approve?
+  Card.new(type_id: Card.default_accounted_type_id).ok? :create
 end
 
-event :activate_account do
-  # FIXME: -- sends email before account is fully activated
-  add_subfield :account
-  subfield(:account).add_subfield :status, content: "active"
+def activate_accounted
   self.type_id = Card.default_accounted_type_id
-  account.send_welcome_email
 end
 
-event :approve_with_token, :validate,
-      on: :update,
-      when: proc { Env.params[:approve_with_token] } do
-  abort :failure, "illegal approval" unless account.can_approve?
-  account.reset_token
-  account.send_account_verification_email
+event :auto_approve_with_verification, :validate, on: :create, when: :can_approve? do
+  request_verification
 end
 
-event :approve_without_token, :validate,
-      on: :update,
-      when: proc { Env.params[:approve_without_token] } do
-  abort :failure, "illegal approval" unless account.can_approve?
-  activate_account
+event :approve_with_verification, :validate, on: :update, trigger: :required do
+  approvable { request_verification }
 end
 
-event :resend_activation_token do
-  account.reset_token
-  account.send_account_verification_email
-  message = "Please check your email for a new password reset link."
-  if account.errors.any?
-    message = "Sorry, #{account.errors.first.last}. #{message}"
+event :approve_without_verification, :validate, on: :update, trigger: :required do
+  # TODO: if validated here, add trigger and activate in storage phase
+  approvable do
+    activate_accounted
+    account_subfield.activate_account
   end
-  success << { id: "_self", view: "message", message: message }
 end
 
-def signed_in_as_me_without_password?
-  Auth.signed_in? && Auth.current_id == id && account.password.blank?
+event :act_as_current_for_integrate_stage, :integrate, on: :create do
+  Auth.current_id = id
 end
 
-event :redirect_to_edit_password, :finalize,
-      on: :update,
-      when: proc { |c| c.signed_in_as_me_without_password? } do
-  Env.params[:success] = account.edit_password_success_args
+def account_subfield
+  subfield(:account) || add_subfield(:account)
 end
 
-event :act_as_current_for_integrate_stage, :integrate,
-      on: :create do
-  Auth.current_id = id
+def request_verification
+  acct = account_subfield
+  acct.add_subfield :status, content: "unverified"
+  acct.trigger_event! :send_verification_email
+end
+
+def approvable
+  if can_approve?
+    yield
+  else
+    abort :failure, "illegal approval" # raise permission denied?
+  end
 end

data/mod/account/set/type/signup/views.rb

@@ -0,0 +1,93 @@
+format :html do
+  def invitation?
+    Auth.signed_in? && card.can_approve?
+  end
+
+  view :new do
+    voo.title = invitation? ? tr(:invite) : tr(:sign_up)
+    super()
+  end
+
+  view :content_formgroups do
+    [account_formgroups, (card.structure ? edit_slot : "")].join
+  end
+
+  view :new_buttons do
+    button_formgroup do
+      [standard_create_button, invite_button].compact
+    end
+  end
+
+  def invite_button
+    return unless invitation?
+    button_tag "Send Invitation", situation: "primary"
+  end
+
+  view :core, template: :haml do
+    @lines = [signup_line] + account_lines
+    @body = process_content _render_raw
+  end
+
+  def signup_line
+    ["<strong>#{safe_name}</strong>",
+     ("was" if invited?),
+     "signed up on #{format_date card.created_at}"].compact.join " "
+  end
+
+  def invited?
+    !self_signup?
+  end
+
+  def self_signup?
+    card.creator_id == AnonymousID
+  end
+
+  def account_lines
+    if card.account
+      verification_lines
+    else
+      [tr(:missing_account)]
+    end
+  end
+
+  def verification_lines
+    [verification_sent_line, verification_link_line].compact
+  end
+
+  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
+
+  def verification_links
+    [approve_with_token_link, approve_without_token_link, deny_link].compact
+  end
+
+  def approve_with_token_link
+    action = card.account.status == "unverified" ? "Resend" : "Send"
+    approval_link "#{action} verification email", :with
+  end
+
+  def approve_without_token_link
+    approval_link "Approve without verification", :without
+  end
+
+  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" } }
+  end
+
+  def deny_link
+    return unless card.ok? :delete
+    link_to_card card, "Deny and delete", path: { action: :delete }
+  end
+end

data/mod/account/set/type/user.rb

@@ -1,14 +1,15 @@
-
 include Basic
+include_set Abstract::Accounted
 
 attr_accessor :email
 
 format :html do
   view :setup, unknown: true, perms: ->(_fmt) { Auth.needs_setup? } do
     with_nest_mode :edit do
-      voo.title = "Welcome, Shark!" # LOCALIZE
+      voo.title = "Your deck is ready to go!" # LOCALIZE
       voo.show! :help
       voo.hide! :menu
+      voo.help = haml :setup_help
       Auth.as_bot { setup_form }
     end
   end
@@ -17,8 +18,8 @@ format :html do
     frame_and_form :create do
       [
         setup_hidden_fields,
-        _render_name_formgroup(help: "usually first and last name"),
-        account_formgroup,
+        _render_name_formgroup,
+        account_formgroups,
         setup_form_buttons
       ]
     end
@@ -28,11 +29,6 @@ format :html do
     button_formgroup { setup_button }
   end
 
-  def account_formgroup
-    account = card.fetch trait: :account, new: {}
-    subformat(account)._render :content_formgroup, structure: true
-  end
-
   def setup_button
     submit_button text: "Set up", disable_with: "Setting up"
   end
@@ -44,21 +40,13 @@ format :html do
       "card[type_id]" => Card.default_accounted_type_id
     )
   end
+end
 
-  def help_text
-    text = "<h3>To get started, set up an account.</h3>"
-    if Card.config.action_mailer.perform_deliveries == false
-      text += <<-HTML
-        <br>WARNING: Email delivery is turned off.
-        Change settings in config/application.rb to send sign up notifications.
-      HTML
-    end
-    text
-  end
+def setup?
+  Card::Env.params[:setup]
 end
 
-event :setup_as_bot, before: :check_permissions, on: :create,
-                     when: proc { Card::Env.params[:setup] } do
+event :setup_as_bot, before: :check_permissions, on: :create, when: :setup? do
   abort :failure unless Auth.needs_setup?
   Auth.as_bot
   # we need bot authority to set the initial administrator roles
@@ -66,14 +54,15 @@ event :setup_as_bot, before: :check_permissions, on: :create,
   # flexibility and security when configuring initial setups
 end
 
-event :setup_first_user, :prepare_to_store,
-      on: :create, when: proc { Card::Env.params[:setup] } do
+event :setup_first_user, :prepare_to_store, on: :create, when: :setup? do
   add_subcard "signup alert email+*to", content: name
-  add_subfield :roles,
-               content: %i[help_desk shark administrator].map(&:cardname)
+  add_subfield :roles, content: roles_for_first_user
+end
+
+def roles_for_first_user
+  %i[help_desk shark administrator].map(&:cardname)
 end
 
-event :signin_after_setup, :integrate,
-      on: :create, when: proc { Card::Env.params[:setup] } do
+event :signin_after_setup, :integrate, on: :create, when: :setup? do
   Auth.signin id
 end