spree_auth_devise 4.0.0 → 4.3.1

data/app/mailers/spree/user_mailer.rb

@@ -1,16 +1,23 @@
 module Spree
   class UserMailer < BaseMailer
     def reset_password_instructions(user, token, *_args)
-      @edit_password_reset_url = spree.edit_spree_user_password_url(reset_password_token: token, host: Spree::Store.current.url)
+      current_store_id = _args.inject(:merge)[:current_store_id]
+      @current_store = Spree::Store.find(current_store_id) || Spree::Store.current
+      @locale = @current_store.has_attribute?(:default_locale) ? @current_store.default_locale : I18n.default_locale
+      I18n.locale = @locale if @locale.present?
+      @edit_password_reset_url = spree.edit_spree_user_password_url(reset_password_token: token, host: @current_store.url)
+      @user = user
 
-      mail to: user.email, from: from_address, subject: Spree::Store.current.name + ' ' + I18n.t(:subject, scope: [:devise, :mailer, :reset_password_instructions])
+      mail to: user.email, from: from_address, subject: @current_store.name + ' ' + I18n.t(:subject, scope: [:devise, :mailer, :reset_password_instructions]), store_url: @current_store.url
     end
 
     def confirmation_instructions(user, token, _opts = {})
-      @confirmation_url = spree.spree_user_confirmation_url(confirmation_token: token, host: Spree::Store.current.url)
+      current_store_id = _opts[:current_store_id]
+      @current_store = Spree::Store.find(current_store_id) || Spree::Store.current
+      @confirmation_url = spree_user_confirmation_url(confirmation_token: token, host: Spree::Store.current.url)
       @email = user.email
 
-      mail to: user.email, from: from_address, subject: Spree::Store.current.name + ' ' + I18n.t(:subject, scope: [:devise, :mailer, :confirmation_instructions])
+      mail to: user.email, from: from_address, subject: @current_store.name + ' ' + I18n.t(:subject, scope: [:devise, :mailer, :confirmation_instructions]), store_url: @current_store.url
     end
   end
 end

data/app/models/spree/user.rb

@@ -27,6 +27,48 @@ module Spree
       has_spree_role?('admin')
     end
 
+    def self.send_confirmation_instructions(attributes = {}, current_store)
+      confirmable = find_by_unconfirmed_email_with_errors(attributes) if reconfirmable
+      unless confirmable.try(:persisted?)
+        confirmable = find_or_initialize_with_errors(confirmation_keys, attributes, :not_found)
+      end
+      confirmable.resend_confirmation_instructions(current_store) if confirmable.persisted?
+      confirmable
+    end
+
+    def resend_confirmation_instructions(current_store)
+      pending_any_confirmation do
+        send_confirmation_instructions(current_store)
+      end
+    end
+
+    def send_confirmation_instructions(current_store)
+      unless @raw_confirmation_token
+        generate_confirmation_token!
+      end
+
+      opts = pending_reconfirmation? ? { to: unconfirmed_email } : {}
+      opts[:current_store_id] = current_store.id
+      send_devise_notification(:confirmation_instructions, @raw_confirmation_token, opts)
+    end
+
+    def self.send_reset_password_instructions(attributes={}, current_store)
+      recoverable = find_or_initialize_with_errors(reset_password_keys, attributes, :not_found)
+      recoverable.send_reset_password_instructions(current_store) if recoverable.persisted?
+      recoverable
+    end
+
+    def send_reset_password_instructions(current_store)
+      token = set_reset_password_token
+      send_reset_password_instructions_notification(token, current_store.id)
+
+      token
+    end
+
+    def send_reset_password_instructions_notification(token, current_store_id)
+      send_devise_notification(:reset_password_instructions, token, { current_store_id: current_store_id })
+    end
+
     protected
 
     def password_required?

data/app/services/spree/account/create.rb

@@ -0,0 +1,19 @@
+module Spree
+  module Account
+    class Create
+      prepend Spree::ServiceModule::Base
+
+      def call(user_params: nil)
+        user_params ||= {}
+
+        user = Spree.user_class.new(user_params)
+
+        if user.save
+          success(user)
+        else
+          failure(user)
+        end
+      end
+    end
+  end
+end

data/app/services/spree/account/update.rb

@@ -0,0 +1,17 @@
+module Spree
+  module Account
+    class Update
+      prepend Spree::ServiceModule::Base
+
+      def call(user:, user_params: nil)
+        user_params ||= {}
+
+        if user.update(user_params)
+          success(user)
+        else
+          failure(user)
+        end
+      end
+    end
+  end
+end

data/app/views/spree/user_mailer/confirmation_instructions.html.erb

@@ -0,0 +1,20 @@
+<h1>
+  <%= Spree.t('user_mailer.confirmation_instructions.welcome', email: @email) %>
+</h1>
+<p>
+  <%= Spree.t('user_mailer.confirmation_instructions.instructions_1', { store_name: @current_store.name }) %>
+</p>
+<p>
+  <%= Spree.t('user_mailer.confirmation_instructions.instructions_2') %>
+</p>
+<p class="body-action">
+  <a href="<%= @confirmation_url %>" class="button button--green"><%= Spree.t('user_mailer.confirmation_instructions.button') %></a>
+</p>
+<p>
+  <%= Spree.t('user_mailer.confirmation_instructions.instructions_3') %>
+</p>
+<p>
+  <%= Spree.t('user_mailer.confirmation_instructions.thanks') %>
+  <br />
+  <%= Spree.t('user_mailer.confirmation_instructions.store_team', { store_name: @current_store.name }) %>
+</p>

data/app/views/spree/user_mailer/confirmation_instructions.text.erb

@@ -1,5 +1,8 @@
-Welcome <%= @email %>!
-
-You can confirm your account email through the url below:
-
-<%= @confirmation_url %>
+<%= Spree.t('user_mailer.confirmation_instructions.welcome', email: @email) %>
+<%= Spree.t('user_mailer.confirmation_instructions.instructions_1', { store_name: @current_store.name }) %>
+<%= Spree.t('user_mailer.confirmation_instructions.instructions_2') %>
+<%= Spree.t('user_mailer.confirmation_instructions.button') %>
+<%= @confirmation_url %>
+<%= Spree.t('user_mailer.confirmation_instructions.instructions_3') %>
+<%= Spree.t('user_mailer.confirmation_instructions.thanks') %>
+<%= Spree.t('user_mailer.confirmation_instructions.store_team', { store_name: @current_store.name }) %>

data/app/views/spree/user_mailer/reset_password_instructions.html.erb

@@ -0,0 +1,20 @@
+<h1>
+  <%= Spree.t('user_mailer.reset_password_instructions.welcome', email: @user.email) %>
+</h1>
+<p>
+  <%= Spree.t('user_mailer.reset_password_instructions.instructions_1', { store_name: @current_store.name }) %>
+</p>
+<p>
+  <%= Spree.t('user_mailer.reset_password_instructions.instructions_2') %>
+</p>
+<p class="body-action">
+  <a href="<%= @edit_password_reset_url %>" class="button button--green"><%= Spree.t('user_mailer.reset_password_instructions.button') %></a>
+</p>
+<p>
+  <%= Spree.t('user_mailer.reset_password_instructions.instructions_3') %>
+</p>
+<p>
+  <%= Spree.t('user_mailer.reset_password_instructions.thanks') %>
+  <br />
+  <%= Spree.t('user_mailer.reset_password_instructions.store_team', { store_name: @current_store.name }) %>
+</p>

data/app/views/spree/user_mailer/reset_password_instructions.text.erb

@@ -1,10 +1,12 @@
-A request to reset your password has been made.
-If you did not make this request, simply ignore this email.
+<%= Spree.t('user_mailer.reset_password_instructions.welcome', email: @user.email) %>
 
-If you did make this request just click the link below:
+<%= Spree.t('user_mailer.reset_password_instructions.instructions_1', { store_name: @current_store.name }) %>
+<%= Spree.t('user_mailer.reset_password_instructions.instructions_2') %>
 
+<%= Spree.t('user_mailer.reset_password_instructions.button') %>
 <%= @edit_password_reset_url %>
 
-If the above URL does not work try copying and pasting it into your browser.
-If you continue to have problems please feel free to contact us.
+<%= Spree.t('user_mailer.reset_password_instructions.instructions_3') %>
 
+<%= Spree.t('user_mailer.reset_password_instructions.thanks') %>
+<%= Spree.t('user_mailer.reset_password_instructions.store_team', { store_name: @current_store.name }) %>

data/app/views/spree/user_passwords/edit.html.erb

@@ -1,22 +1,25 @@
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @spree_user } %>
-<div class="col-lg-6 offset-lg-3">
-  <div class="card mb-3">
-    <div class="card-header">
-      <h3 class="card-title mb-0 h6"><%= Spree.t(:change_your_password) %></h3>
-    </div>
-    <div class="card-body">
-      <%= form_for @spree_user, :as => :spree_user, :url => spree.update_password_path, :method => :put do |f| %>
-        <div class="form-group">
-          <%= f.label :password, Spree.t(:password) %>
-          <%= f.password_field :password, :class => "form-control" %>
-        </div>
-        <div class="form-group">
-          <%= f.label :password_confirmation, Spree.t(:confirm_password) %>
-          <%= f.password_field :password_confirmation, :class => "form-control" %>
+
+<div class="container user-passwords">
+  <div class="row">
+    <div class="col-lg-6 offset-lg-3">
+      <div class="card mb-3 user-passwords-no-border">
+        <h3 class="spree-mb-large spree-mt-large spree-header"><%= Spree.t(:change_your_password) %></h3>
+        <div class="card-body">
+          <%= form_for @spree_user, as: :spree_user, url: spree.update_password_path, method: :put do |f| %>
+            <div class="form-group">
+              <%= f.label :password, Spree.t(:password), class: 'spree-flat-label' %>
+              <%= f.password_field :password, class: "spree-flat-input" %>
+            </div>
+            <div class="form-group">
+              <%= f.label :password_confirmation, Spree.t(:confirm_password), class: 'spree-flat-label' %>
+              <%= f.password_field :password_confirmation, class: "spree-flat-input" %>
+            </div>
+            <%= f.hidden_field :reset_password_token %>
+            <%= f.submit Spree.t(:update), class: 'btn btn-primary btn-block spree-btn mt-2' %>
+          <% end %>
         </div>
-        <%= f.hidden_field :reset_password_token %>
-        <%= f.submit Spree.t(:update), :class => 'btn btn-lg btn-success btn-block' %>
-      <% end %>
+      </div>
     </div>
   </div>
 </div>

data/app/views/spree/user_passwords/new.html.erb

@@ -1,21 +1,23 @@
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @spree_user } %>
-<div class="col-lg-6 offset-lg-3" id="forgot-password">
-  <div class="card mb-3">
-    <div class="card-header">
-      <h3 class="card-title mb-0 h6"><%= Spree.t(:forgot_password) %></h3>
-    </div>
-    <div class="card-body">
-      <p><%= Spree.t(:instructions_to_reset_password) %></p>
 
-      <%= form_for Spree::User.new, :as => :spree_user, :url => spree.reset_password_path do |f| %>
-        <div class="form-group">
-          <%= f.label :email, Spree.t(:email) %>
-          <%= f.email_field :email, :class => "form-control" %>
-        </div>
-        <div>
-          <%= f.submit Spree.t(:reset_password), :class => 'btn btn-lg btn-success btn-block' %>
+<div class="container user-passwords">
+  <div class="row">
+    <div class="col-lg-6 offset-lg-3" id="forgot-password">
+      <div class="card mb-3 user-passwords-no-border">
+        <h3 class="spree-mb-large spree-mt-large spree-header"><%= Spree.t(:forgot_password) %></h3>
+        <div class="card-body">
+          <p><%= Spree.t(:instructions_to_reset_password) %></p>
+
+          <%= form_for Spree.user_class.new, as: :spree_user, url: spree.reset_password_path do |f| %>
+            <div class="form-group">
+              <%= f.email_field :email, class: "spree-flat-input", placeholder: Spree.t(:email) %>
+            </div>
+            <div>
+              <%= f.submit Spree.t(:reset_password), class: 'btn btn-primary btn-block spree-btn mt-2' %>
+            </div>
+          <% end %>
         </div>
-      <% end %>
+      </div>
     </div>
   </div>
 </div>

data/app/views/spree/user_registrations/new.html.erb

@@ -1,22 +1,17 @@
 <% @body_id = 'signup' %>
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @user } %>
+<%= render partial: 'spree/shared/error_messages', locals: { target: @user } %>
 <div class="col-lg-6 offset-lg-3">
-  <div class="card mb-3">
-      <div class="card-header">
-        <h3 class="card-title mb-0 h6"><%= Spree.t(:new_customer) %></h3>
-      </div>
-      <div id="new-customer" class="card-body" data-hook="login">
-          <%= form_for resource, :as => :spree_user, :url => spree.registration_path do |f| %>
-            <div data-hook="signup_inside_form">
-              <%= render :partial => 'spree/shared/user_form', :locals => { :f => f } %>
-              <div><%= f.submit Spree.t(:create), :class => 'btn btn-lg btn-success btn-block' %></div>
-            </div>
-          <% end %>
-          <div class="text-center">
-            <%= Spree.t(:or) %>
-              <%= link_to Spree.t(:login_as_existing), spree.login_path %>
-          </div>
-          <div data-hook="login_extras"></div>
+  <h3 class="spree-header spree-mb-large spree-mt-large"><%= Spree.t(:new_customer) %></h3>
+  <div id="new-customer" data-hook="login">
+    <%= form_for resource, as: :spree_user, url: spree.registration_path do |f| %>
+      <div data-hook="signup_inside_form">
+        <%= render partial: 'spree/shared/user_form', locals: { f: f, remember_me_field: true } %>
+        <div><%= f.submit Spree.t(:sign_up), class: 'btn btn-primary btn-block spree-btn mb-5' %></div>
       </div>
+    <% end %>
+
+    <h3 class="spree-header header-sm spree-mt-medium mb-3 mb-sm-4 mb-xl-4"><%= Spree.t('already_have_account') %></h3>
+    <%= link_to Spree.t(:log_in), spree.login_path, class: 'btn btn-block btn-outline-primary spree-btn spree-mb-large' %>
+    <div data-hook="login_extras"></div>
   </div>
 </div>

data/app/views/spree/user_sessions/new.html.erb

@@ -1,17 +1,16 @@
 <% @body_id = 'login' %>
-<div class="col-lg-6 <%= request.path == spree.login_path ? "offset-lg-3" : "" %>">
-  <div class="card mb-3">
-      <div class="card-header">
-        <h3 class="card-title mb-0 h6"><%= Spree.t(:login_as_existing) %></h3>
-      </div>
-      <div id="existing-customer" class="card-body" data-hook="login">
-          <%= render :partial => 'spree/shared/login' %>
-          <div class="text-center">
-            <%= Spree.t(:or) %>
-                <%= link_to Spree.t(:create_a_new_account), spree.signup_path %> |
-                <%= link_to Spree.t(:forgot_password), spree.recover_password_path %>
-          </div>
+<div class="container user-sessions user-sessions-new">
+  <div class="row">
+    <div class="col-lg-6 offset-lg-3">
+      <div class="mb-3">
+        <div id="existing-customer" data-hook="login">
+          <%= render partial: 'spree/shared/login' %>
           <div data-hook="login_extras"></div>
+        </div>
+        <div class="col-lg-11 mx-auto" data-hook="registration">
+          <%= render partial: 'spree/shared/registration', locals: { registration_button: 'registration-button' } %>
+        </div>
       </div>
+    </div>
   </div>
 </div>

data/config/locales/de.yml

@@ -1,9 +1,21 @@
 ---
 de:
+  spree:
+    admin_login: Admin Login
+    change_your_password: Kennwort zurücksetzen
+    user_mailer:
+      reset_password_instructions:
+        instructions_1: "Es wurde eine Anfrage zum Zurücksetzen Ihres Passworts gestellt.\nWenn Sie diese Anfrage nicht gestellt haben, ignorieren Sie diese E-Mail.\n\nWenn Sie diese Anfrage gestellt haben, klicken Sie bitte auf den folgenden Link:"
+        instructions_2: "Falls die obige URL nicht funktioniert, bitte URL kopieren und in Ihren Browser einfügen\nWenn Sie weiterhin Probleme haben, können Sie sich gerne an uns wenden."
+      confirmation_instructions:
+        welcome: "Schön, dass Sie hier sind %{email}"
+        confirm: "Sie können Ihre Konto-E-Mail-Adresse über die folgende URL bestätigen:"
   devise:
     confirmations:
       confirmed: Ihr Konto wurde erfolgreich aktiviert.
       send_instructions: 'In ein paar Minuten erhalten Sie eine E-Mail mit Anweisungen, um Ihr Konto zu aktivieren.'
+      spree_user:
+        already_confirmed: Ihre E-Mail wurde bereits bestätigt. Bitte versuchen Sie erneut, sich anzumelden.
     failure:
       inactive: Ihr Konto wurde noch nicht aktiviert.
       invalid: Ungültige E-Mail-Adresse oder Passwort.
@@ -28,16 +40,20 @@ de:
     user_passwords:
       spree_user:
         cannot_be_blank: Ihr Passwort darf nicht leer sein.
+        no_token: Sie können nicht auf diese Seite zugreifen, wenn Sie den Link aus einer E-Mail zum Zurücksetzen des Kennworts nicht verwenden. Wenn Sie den Link aus einer E-Mail zum Zurücksetzen des Passworts verwenden, stellen Sie bitte sicher, dass Sie die vollständige URL verwendet haben.
         send_instructions: In ein paar Minuten erhalten Sie eine E-Mail mit Anweisungen um Ihr Passwort zurücksetzen.
         updated: Ihr Passwort wurde erfolgreich geändert.
     user_registrations:
       destroyed: Ihr Konto wurde erfolgreich gelöscht. Auf Wiedersehen!
       inactive_signed_up: 'Sie haben sich erfolgreich registriert. Wir konnten Sie jedoch nicht anmelden, da Ihr Konto %{reason} ist.'
+      signed_up_but_unconfirmed: Eine Nachricht mit einem Bestätigungslink wurde an Ihre E-Mail-Adresse gesendet. Bitte folgen Sie dem Link, um Ihr Konto zu aktivieren.
       signed_up: Herzlich Willkommen! Sie haben sich erfolgreich registriert.
       updated: Sie haben Ihr Konto erfolgreich aktualisiert.
     user_sessions:
       signed_in: Erfolgreich angemeldet.
       signed_out: Erfolgreich abgemeldet.
+      already_signed_in: Bereits angemeldet.
+      already_signed_out: Bereits abgemeldet.
   errors:
     messages:
       already_confirmed: wurde bereits bestätigt

data/config/locales/en.yml

@@ -3,12 +3,29 @@ en:
   spree:
     admin_login: "Admin Login"
     change_your_password: "Change your password"
-    store_credits:
-      credit_balance: Store Credit Balance
+    user_mailer:
+      reset_password_instructions:
+        welcome: "Hi %{email}"
+        instructions_1: "A request to reset the password for your %{store_name} account has been made."
+        instructions_2: Click the button below to reset it.
+        instructions_3: If you did not request a password change ignore this email or contact us.
+        button: Reset your password
+        thanks: Thank you,
+        store_team: "%{store_name} Team"
+      confirmation_instructions:
+        welcome: "Welcome %{email}!"
+        instructions_1: "Thanks for registering at %{store_name}."
+        instructions_2: "Click the button below to confirm your account:"
+        instructions_3: If you have any questions, feel free to simply reply to this email.
+        button: Confirm email address
+        thanks: Thank you,
+        store_team: "%{store_name} Team"
   devise:
     confirmations:
-      confirmed: Your account was successfully confirmed. You are now signed in.
+      confirmed: Your account was successfully confirmed. You can now log in.
       send_instructions: You will receive an email with instructions about how to confirm your account in a few minutes.
+      spree_user:
+        already_confirmed: Email was already confirmed, please try signing in.
     failure:
       inactive: Your account was not activated yet.
       invalid: Invalid email or password.
@@ -24,8 +41,6 @@ en:
         subject: Reset password instructions
       unlock_instructions:
         subject: Unlock Instructions
-      confirmation_instructions:
-        subject: Confirmation instructions
     oauth_callbacks:
       failure: 'Could not authorize you from %{kind} because %{reason}.'
       success: 'Successfully authorized from %{kind} account.'
@@ -41,7 +56,7 @@ en:
     user_registrations:
       destroyed: Bye! Your account was successfully cancelled. We hope to see you again soon.
       inactive_signed_up: 'You have signed up successfully. However, we could not sign you in because your account is %{reason}.'
-      signed_up_but_unconfirmed: You have signed up successfully.
+      signed_up_but_unconfirmed: "A message with a confirmation link has been sent to your email address. Please follow the link to activate your account."
       signed_up: Welcome! You have signed up successfully.
       updated: You updated your account successfully.
     user_sessions:

data/config/locales/zh-TW.yml

@@ -0,0 +1,58 @@
+---
+zh-TW:
+  spree:
+    admin_login: "管理員登入"
+    change_your_password: "更改密碼"
+  devise:
+    confirmations:
+      confirmed: 你的帳號已經確認完成，現在你已經登入網站了。
+      send_instructions: 你會在幾分鐘內收到一封帳號確認信來確認你的帳號。
+      spree_user:
+        already_confirmed: Email 已確認，請登入。
+    failure:
+      inactive: 你的帳號尚未啟用。
+      invalid: 帳號或密碼有誤。
+      invalid_token: 錯誤的認證代碼。
+      locked: 你的帳號已經被停權，請聯絡客服人員。
+      timeout: 你的登入已經逾時，請重新登入。
+      unauthenticated: 你需要登入來繼續。
+      unconfirmed: 你的帳號需要確認來繼續。
+    mailer:
+      confirmation_instructions:
+        subject: 帳號確認教學
+      reset_password_instructions:
+        subject: 重設密碼教學
+      unlock_instructions:
+        subject: 帳號解鎖教學
+    oauth_callbacks:
+      failure: '由於%{reason}，無法透過%{kind}確認你的帳號。'
+      success: '成功的由%{kind}認證你的帳號。'
+    unlocks:
+      send_instructions: 你在幾分鐘後會收到一封 Email 教你如何解鎖帳號。
+      unlocked: 你的帳號已經解鎖，現在你已經登入網站了。
+    user_passwords:
+      spree_user:
+        cannot_be_blank: 密碼不能為空白。
+        no_token: "你只能透過重新設定密碼的 Email 內的連結來訪問此頁面。如果你真的是透過那封 Email 來此頁面，請確定你是透過完整的網址過來的。"
+        send_instructions: 你在幾分鐘後會收到一封 Email 教你如何更改密碼。
+        updated: 你的密碼已經更改成功，你已成功登入。
+    user_registrations:
+      destroyed: 再見！你的帳號已經被取消了，但我們希望能再服務你。
+      inactive_signed_up: '你已經成功註冊，但由於%{reason}的原因，導致帳號無法登入。'
+      signed_up_but_unconfirmed: 確認信件已經寄到您的信箱，請按照上面的教學完成您的註冊。
+      signed_up: 歡迎！你已經成功註冊了。
+      updated: 你的帳號已經成功更新。
+    user_sessions:
+      signed_in: 登入成功
+      signed_out: 登出成功
+      already_signed_in: 已經登入
+      already_signed_out: 已經登入
+  errors:
+    messages:
+      already_confirmed: 已確認
+      email_is_invalid: Email 不能為空值
+      not_found: 找不到
+      not_locked: 沒有被鎖住
+      not_saved:
+        one: '%{resource}由於以下的一個錯誤導致無法被儲存：'
+        other: '%{resource}由於以下的%{count}個錯誤導致無法被儲存：'