-
- , width: 190) %>)
+
+
diff --git a/app/views/devise/shared/_authorization_error.html.erb b/app/views/devise/shared/_authorization_error.html.erb
index 62f0c0841..55deaaa98 100644
--- a/app/views/devise/shared/_authorization_error.html.erb
+++ b/app/views/devise/shared/_authorization_error.html.erb
@@ -1,19 +1,7 @@
-
<% unless flash[:alert].blank? %>
-
+
+
+
+
+
+ + Welcome to <%= community_name %> +
++ <%= community_name %> is a community of + <%= number_with_delimiter(@registered_users_count) %> + amazing <%= community_members_label %>. +
+
+ <%= render partial: "shared/authentication/providers_registration_form" %>
+
+
- <% else %>
-
+ <%# if there are no SSO auths enabled, we don't ask the user if they have a password %>
+ <% if authentication_enabled_providers.any? %>
+
-
+
+ Have a password? Continue with your email address
+
+
+ <% end %>
+
+ <%= form_for(User.new, as: :user, url: session_path(:user)) do |f| %>
+
+ <%= f.label :email, class: "crayons-field__label" %>
+ <%= f.email_field :email, autocomplete: "email", class: "crayons-textfield" %>
+
+
+
+ <%= f.label :password, class: "crayons-field__label" %>
+ <%= f.password_field :password, autocomplete: "current-password", class: "crayons-textfield" %>
+
+
+
+ <%= f.check_box :remember_me, class: "crayons-checkbox" %>
+ <%= f.label :remember_me, class: "crayons-field__label fw-normal" %>
+
+
+
+ <%= f.submit "Continue", class: "crayons-btn crayons-btn--l w-100" %>
+
+ <% end %>
+
- Welcome to <%= community_name %> -
-- Sign in below to compose your post and share it with the community. -
-
-
-
- <% if any_selfserve_auth? %>
- Great to have you
- <% else %> -Registration is by invitation only
- <% end %> - <% end %> -
- <%= render partial: "shared/authentication/providers_registration_form" %>
-
-
-
-
If you have a password...
- <%= form_for(User.new, as: :user, url: session_path(:user)) do |f| %> -
- <%= f.label :email, class: "crayons-field__label" %>
- <%= f.email_field :email, autocomplete: "email", required: true, class: "crayons-textfield" %>
-
-
-
- <%= f.label :password, class: "crayons-field__label" %>
- <%= f.password_field :password, autocomplete: "current-password", required: true, class: "crayons-textfield" %>
-
-
-
- <%= f.check_box :remember_me %>
- <%= f.label :remember_me %>
-
-
-
- <%= f.submit "Log in", class: "crayons-btn" %>
-
- <% end %>
- <% if any_selfserve_auth? %>
- Sign in by social auth if you don't have a password set.
- <% end %> -Open Source 😇
-Free Forever ❤️
- -
- Something went wrong:
+
<% if flash[:alert].is_a?(Array) %>
+ Something went wrong:
<% end %> - Please try again below, or contact <%= email_link %> if this persists. + <% if any_selfserve_auth? %> + If you haven't created an account, we recommend signing up with social authentication below. + <% end %> + Contact <%= email_link %> if you continue having trouble.
<% end %>
diff --git a/app/views/shared/authentication/_providers_registration_form.html.erb b/app/views/shared/authentication/_providers_registration_form.html.erb
index 541eddd02..ea1d38d94 100644
--- a/app/views/shared/authentication/_providers_registration_form.html.erb
+++ b/app/views/shared/authentication/_providers_registration_form.html.erb
@@ -1,15 +1,11 @@
--
<% flash[:alert].each do |error| %>
- @@ -22,9 +10,14 @@ <% end %>
<% end %> - Please try again below, or contact <%= email_link %> if this persists. + <% if any_selfserve_auth? %> + If you haven't created an account, we recommend signing up with social authentication below. + <% end %> + Contact <%= email_link %> if you continue having trouble.
+
<% authentication_enabled_providers.each do |provider| %>
"
- class="crayons-btn crayons-btn--xl crayons-btn--brand-<%= provider.provider_name %> crayons-btn--icon-left m-1 whitespace-nowrap"
+ class="crayons-btn crayons-btn--l crayons-btn--brand-<%= provider.provider_name %> crayons-btn--icon-left whitespace-nowrap"
data-no-instant>
<%= inline_svg_tag("#{provider.provider_name}.svg", aria: true, class: "crayons-icon", title: provider.provider_name) %>
- Sign In with <%= provider.official_name %>
+ Continue with <%= provider.official_name %>
<% end %>
-
-<% if authentication_enabled_providers.any? %>
- We require social registration to prevent abuse.
-<% end %> diff --git a/spec/requests/editor_spec.rb b/spec/requests/editor_spec.rb index 84b9f4bf4..f80e795f3 100644 --- a/spec/requests/editor_spec.rb +++ b/spec/requests/editor_spec.rb @@ -3,11 +3,11 @@ require "rails_helper" RSpec.describe "Editor", type: :request do describe "GET /new" do context "when not logged-in" do - it "asks the stray-user to 'Sign In or Create Your Account'" do - get "/new" + it "asks the non logged in user to sign in" do + get new_path + expect(response).to have_http_status(:ok) - expect(response.body).to include("Sign in below to compose your post and share") - # should actually be looking for textarea tag + expect(response.body).to include("Password") end end end diff --git a/spec/requests/notifications_spec.rb b/spec/requests/notifications_spec.rb index 2df9545b6..6934a2692 100644 --- a/spec/requests/notifications_spec.rb +++ b/spec/requests/notifications_spec.rb @@ -25,17 +25,19 @@ RSpec.describe "NotificationsIndex", type: :request do end context "when signed out" do - it "renders the signup cue" do + it "renders the signup page" do get "/notifications" - expect(response.body).to include "Great to have you" + + expect(response.body).to include("Continue with") end end context "when signed in" do it "does not render the signup cue" do sign_in user + get "/notifications" - expect(response.body).not_to include "Create your account" + expect(response.body).not_to include("Continue with") end end diff --git a/spec/requests/registrations_spec.rb b/spec/requests/registrations_spec.rb index 41a38a3c7..e57d359d6 100644 --- a/spec/requests/registrations_spec.rb +++ b/spec/requests/registrations_spec.rb @@ -3,23 +3,39 @@ require "rails_helper" RSpec.describe "Registrations", type: :request do let(:user) { create(:user) } - describe "GET /enter" do + describe "Sign up" do context "when not logged in" do - it "shows the sign in page (with self-serve auth)" do - get "/enter" - expect(response.body).to include "Great to have you" + it "shows the sign in page with single sign on options" do + get sign_up_path + + Authentication::Providers.enabled.each do |provider_name| + provider = Authentication::Providers.get!(provider_name) + + expect(response.body).to include("Continue with #{provider.official_name}") + end end - it "shows the sign in text" do - get "/enter" - expect(response.body).to include "If you have a password" + it "shows the sign in text for password based authentication" do + get sign_up_path + + expect(response.body).to include("Have a password? Continue with your email address") end - it "shows invite-only text if no self-serve" do - SiteConfig.authentication_providers = [] - get "/enter" - expect(response.body).to include "If you have a password" - expect(response.body).not_to include "Sign in by social auth" + it "does not show the password based authentication hint if there are no single sign in options enabled" do + allow(Authentication::Providers).to receive(:enabled).and_return([]) + + get sign_up_path + + expect(response.body).not_to include("Have a password? Continue with your email address") + end + + it "only shows the single sign on options if they are present" do + allow(Authentication::Providers).to receive(:enabled).and_return([]) + + get sign_up_path + + expect(response.body).to include("Password") + expect(response.body).not_to include("Continue with") end end @@ -27,8 +43,8 @@ RSpec.describe "Registrations", type: :request do it "redirects to /dashboard" do sign_in user - get "/enter" - expect(response).to redirect_to("/dashboard") + get sign_up_path + expect(response).to redirect_to(dashboard_path) end end end diff --git a/spec/requests/stories_index_spec.rb b/spec/requests/stories_index_spec.rb index 11a155601..b184cf9a6 100644 --- a/spec/requests/stories_index_spec.rb +++ b/spec/requests/stories_index_spec.rb @@ -21,8 +21,9 @@ RSpec.describe "StoriesIndex", type: :request do it "renders registration page if site config is private" do SiteConfig.public = false - get "/" - expect(response.body).to include("Great to have you") + + get root_path + expect(response.body).to include("Continue with") end it "renders proper description" do diff --git a/spec/system/link_for_tags_in_posts_in_notifications_spec.rb b/spec/system/link_for_tags_in_posts_in_notifications_spec.rb index 3e0e390e2..6c82c5479 100644 --- a/spec/system/link_for_tags_in_posts_in_notifications_spec.rb +++ b/spec/system/link_for_tags_in_posts_in_notifications_spec.rb @@ -14,7 +14,11 @@ RSpec.describe "Link on tags for post in notifications", type: :system do end it "shows the sign-with page", js: true do - expect(page).to have_content(/Sign In With/i, count: Authentication::Providers.available.size) + Authentication::Providers.enabled.each do |provider_name| + provider = Authentication::Providers.get!(provider_name) + + expect(page).to have_content("Continue with #{provider.official_name}") + end end end diff --git a/spec/system/user_logs_in_with_password_spec.rb b/spec/system/user_logs_in_with_password_spec.rb index c1d95ede5..73afbe652 100644 --- a/spec/system/user_logs_in_with_password_spec.rb +++ b/spec/system/user_logs_in_with_password_spec.rb @@ -4,7 +4,7 @@ RSpec.describe "Authenticating with a password" do def submit_login_form(email, password) fill_in "Email", with: email fill_in "Password", with: password - click_button "Log in" + click_button "Continue" end let(:password) { "p4assw0rd" } @@ -17,6 +17,7 @@ RSpec.describe "Authenticating with a password" do context "when logging in with incorrect credentials" do it "displays an error when the email address is wrong" do submit_login_form("wrong@example.com", password) + expect(page).to have_text("Invalid Email or password.") end