Welcome <%= @email %>!
+ +You can confirm your account email through the link below:
+ +<%= link_to 'Confirm my account', confirmation_url(slug: ActsAsTenant.current_tenant&.slug, confirmation_token: @token) %>
diff --git a/app/views/users/mailer/email_changed.html.erb b/app/views/users/mailer/email_changed.html.erb new file mode 100644 index 0000000..51cfa7a --- /dev/null +++ b/app/views/users/mailer/email_changed.html.erb @@ -0,0 +1,9 @@ +<%# Copyright (C) 2024 Manuel Bustillo %> + +Hello <%= @email %>!
+ +<% if @resource.try(:unconfirmed_email?) %> +We're contacting you to notify you that your email is being changed to <%= @resource.unconfirmed_email %>.
+<% else %> +We're contacting you to notify you that your email has been changed to <%= @resource.email %>.
+<% end %> diff --git a/app/views/users/mailer/password_change.html.erb b/app/views/users/mailer/password_change.html.erb new file mode 100644 index 0000000..7bfd484 --- /dev/null +++ b/app/views/users/mailer/password_change.html.erb @@ -0,0 +1,5 @@ +<%# Copyright (C) 2024 Manuel Bustillo %> + +Hello <%= @resource.email %>!
+ +We're contacting you to notify you that your password has been changed.
diff --git a/app/views/users/mailer/reset_password_instructions.html.erb b/app/views/users/mailer/reset_password_instructions.html.erb new file mode 100644 index 0000000..3bc6fcd --- /dev/null +++ b/app/views/users/mailer/reset_password_instructions.html.erb @@ -0,0 +1,10 @@ +<%# Copyright (C) 2024 Manuel Bustillo %> + +Hello <%= @resource.email %>!
+ +Someone has requested a link to change your password. You can do this through the link below.
+ +<%= link_to 'Change my password', edit_password_url(slug: ActsAsTenant.current_tenant&.slug, reset_password_token: @token) %>
+ +If you didn't request this, please ignore this email.
+Your password won't change until you access the link above and create a new one.
diff --git a/app/views/users/mailer/unlock_instructions.html.erb b/app/views/users/mailer/unlock_instructions.html.erb new file mode 100644 index 0000000..6df5c0a --- /dev/null +++ b/app/views/users/mailer/unlock_instructions.html.erb @@ -0,0 +1,9 @@ +<%# Copyright (C) 2024 Manuel Bustillo %> + +Hello <%= @resource.email %>!
+ +Your account has been locked due to an excessive number of unsuccessful sign in attempts.
+ +Click the link below to unlock your account:
+ +<%= link_to 'Unlock my account', unlock_url(slug: ActsAsTenant.current_tenant&.slug, unlock_token: @token) %>
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index 77d542f..5f631ef 100644 --- a/config/initializers/devise.rb +++ b/config/initializers/devise.rb @@ -246,7 +246,7 @@ Devise.setup do |config| # Turn scoped views on. Before rendering "sessions/new", it will first check for # "users/sessions/new". It's turned off by default because it's slower if you # are using only default views. - # config.scoped_views = false + config.scoped_views = true # Configure the default scope given to Warden. By default it's the first # devise role declared in your routes (usually :user). diff --git a/config/routes.rb b/config/routes.rb index b407e01..10810fe 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,7 +2,7 @@ Rails.application.routes.draw do mount LetterOpenerWeb::Engine, at: "/letter_opener" if Rails.env.development? - scope ":slug", constraints: {slug: /[a-z]+/} do + scope ":slug", constraints: { slug: Wedding::SLUG_REGEX } do devise_for :users, skip: [:registration, :session, :confirmation] devise_scope :user do post 'users', to: 'users/registrations#create' diff --git a/spec/models/wedding_spec.rb b/spec/models/wedding_spec.rb index 702769f..6ec8a3e 100644 --- a/spec/models/wedding_spec.rb +++ b/spec/models/wedding_spec.rb @@ -3,5 +3,20 @@ require 'rails_helper' RSpec.describe Wedding, type: :model do - pending "add some examples to (or delete) #{__FILE__}" + describe 'validations' do + subject { build(:wedding) } + describe 'slug' do + it { should allow_value('foo').for(:slug) } + it { should allow_value('foo-bar').for(:slug) } + it { should allow_value('foo-123').for(:slug) } + it { should allow_value('foo-123-').for(:slug) } + it { should allow_value('foo--123').for(:slug) } + + it { should_not allow_value('Foo').for(:slug) } + it { should_not allow_value('/foo').for(:slug) } + it { should_not allow_value('foo/123').for(:slug) } + it { should_not allow_value('foo_123').for(:slug) } + it { should_not allow_value('foo/').for(:slug) } + end + end end diff --git a/spec/requests/schemas.rb b/spec/requests/schemas.rb index ce35ad7..6602db8 100644 --- a/spec/requests/schemas.rb +++ b/spec/requests/schemas.rb @@ -14,6 +14,7 @@ module Swagger name: 'slug', in: :path, type: :string, + pattern: Wedding::SLUG_REGEX, example: :default, description: 'Wedding slug' } diff --git a/spec/requests/users/registrations_spec.rb b/spec/requests/users/registrations_spec.rb index aa7562f..ae0f86d 100644 --- a/spec/requests/users/registrations_spec.rb +++ b/spec/requests/users/registrations_spec.rb @@ -13,7 +13,7 @@ RSpec.describe 'users/registrations', type: :request do parameter Swagger::Schema::SLUG parameter name: :body, in: :body, schema: { type: :object, - required: [:user], + required: [:user, :wedding], properties: { user: { type: :object, @@ -23,6 +23,13 @@ RSpec.describe 'users/registrations', type: :request do password: SwaggerResponseHelper::PASSWORD, password_confirmation: SwaggerResponseHelper::PASSWORD } + }, + wedding: { + type: :object, + required: %i[date], + properties: { + date: { type: :string, format: :date}, + } } } }