+
-
-
-
- {{/if}}
+
{{/if}}
);
diff --git a/app/assets/javascripts/discourse/tests/acceptance/login-required-test.js b/app/assets/javascripts/discourse/tests/acceptance/login-required-test.js
index 85c600e0262..f78b0f7ead6 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/login-required-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/login-required-test.js
@@ -9,8 +9,8 @@ acceptance("Login Required - Full page login", function (needs) {
await visit("/");
assert.strictEqual(
currentRouteName(),
- "login",
- "it redirects them to login"
+ "discovery.login-required",
+ "it shows the login required splash"
);
await click(".login-button");
diff --git a/app/assets/javascripts/discourse/tests/acceptance/static-test.js b/app/assets/javascripts/discourse/tests/acceptance/static-test.js
index c89102f576a..ab4d1852ac6 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/static-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/static-test.js
@@ -43,11 +43,19 @@ acceptance("Static pages", function () {
test("Login-required page", async function (assert) {
this.siteSettings.login_required = true;
- await visit("/login");
+ await visit("/");
- assert.strictEqual(currentRouteName(), "login");
+ assert.strictEqual(currentRouteName(), "discovery.login-required");
assert.dom(".body-page").exists("The content is present");
assert.dom(".sign-up-button").exists();
assert.dom(".login-button").exists();
});
+
+ test("Login-required - Login Route", async function (assert) {
+ this.siteSettings.login_required = true;
+ await visit("/login");
+
+ assert.strictEqual(currentRouteName(), "login");
+ assert.dom(".login-fullpage").exists("The login full page form is shown");
+ });
});
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 84a6ec562bb..9952dae0167 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -753,6 +753,7 @@ class ApplicationController < ActionController::Base
cookies[:destination_url] = destination_url
redirect_to path("/auth/#{Discourse.enabled_authenticators.first.name}")
else
+ return if request.path == path("/") && !cookies[:authentication_data]
# save original URL in a cookie (javascript redirects after login in this case)
cookies[:destination_url] = destination_url
redirect_to path("/login")
diff --git a/config/routes.rb b/config/routes.rb
index 101b2fc63bc..7a4d784686f 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -548,6 +548,7 @@ Discourse::Application.routes.draw do
post "login" => "static#enter"
get "login" => "static#show", :id => "login"
+ get "login-required" => "static#show", :id => "login"
get "login-preferences" => "static#show", :id => "login"
get "signup" => "static#show", :id => "signup"
get "password-reset" => "static#show", :id => "password_reset"
diff --git a/spec/requests/application_controller_spec.rb b/spec/requests/application_controller_spec.rb
index 230af6201fa..4a5c7048b43 100644
--- a/spec/requests/application_controller_spec.rb
+++ b/spec/requests/application_controller_spec.rb
@@ -14,9 +14,10 @@ RSpec.describe ApplicationController do
expect(response.headers["Cache-Control"]).to eq("no-cache, no-store")
end
- it "should redirect to login normally" do
+ it "should not redirect to login" do
get "/"
- expect(response).to redirect_to("/login")
+ expect(response).not_to redirect_to("/login")
+ expect(response.status).to eq(200)
end
it "should redirect to SSO if enabled" do
@@ -27,10 +28,11 @@ RSpec.describe ApplicationController do
end
it "should redirect to authenticator if only one, and local logins disabled" do
- # Local logins and google enabled, direct to login UI
+ # Local logins and google enabled, show login UI
SiteSetting.enable_google_oauth2_logins = true
get "/"
- expect(response).to redirect_to("/login")
+ expect(response).not_to redirect_to("/login")
+ expect(response.status).to eq(200)
# Only google enabled, login immediately
SiteSetting.enable_local_logins = false
@@ -40,7 +42,8 @@ RSpec.describe ApplicationController do
# Google and GitHub enabled, direct to login UI
SiteSetting.enable_github_logins = true
get "/"
- expect(response).to redirect_to("/login")
+ expect(response).not_to redirect_to("/login")
+ expect(response.status).to eq(200)
end
it "should not redirect to SSO when auth_immediately is disabled" do
@@ -49,7 +52,8 @@ RSpec.describe ApplicationController do
SiteSetting.enable_discourse_connect = true
get "/"
- expect(response).to redirect_to("/login")
+ expect(response).not_to redirect_to("/login")
+ expect(response.status).to eq(200)
end
it "should not redirect to authenticator when auth_immediately is disabled" do
@@ -58,7 +62,8 @@ RSpec.describe ApplicationController do
SiteSetting.enable_local_logins = false
get "/"
- expect(response).to redirect_to("/login")
+ expect(response).not_to redirect_to("/login")
+ expect(response.status).to eq(200)
end
context "with omniauth in test mode" do
diff --git a/spec/system/login_spec.rb b/spec/system/login_spec.rb
index 7ecbdf73629..15021fa758b 100644
--- a/spec/system/login_spec.rb
+++ b/spec/system/login_spec.rb
@@ -134,7 +134,6 @@ shared_examples "login scenarios" do |login_page_object|
Fabricate(:group_private_message_topic, user: user, recipient_group: group)
visit "/t/#{pm.id}"
- find(".login-welcome .login-button").click
login_form.fill(username: "john", password: "supersecurepassword").click_login
expect(page).to have_css(".header-dropdown-toggle.current-user")
diff --git a/spec/system/social_authentication_spec.rb b/spec/system/social_authentication_spec.rb
index 2625b3b5f14..80d1cc15e28 100644
--- a/spec/system/social_authentication_spec.rb
+++ b/spec/system/social_authentication_spec.rb
@@ -272,8 +272,7 @@ shared_examples "social authentication scenarios" do |signup_page_object, login_
mock_google_auth
visit("/login")
- expect(page).to have_css(".login-welcome")
- expect(page).to have_css(".site-logo")
+ expect(page).to have_css(".btn-social")
visit("/")
expect(page).to have_css(".login-welcome")
- ![]()
-
+ {{#if @controller.hasNoLoginOptions}}
+ {{i18n - "login.no_login_methods.title" - }}
-- {{htmlSafe - (i18n - "login.no_login_methods.description" - (hash adminLoginPath=@controller.adminLoginPath) - ) - }} -
-
+
-
+ {{else}}
+ {{#if @controller.site.mobileView}}
+
+
+ {{#if @controller.showLoginButtons}}
+
-
- {{else}}
- {{! Show the login-required splash screen }}
- {{bodyClass "static-login"}}
-
+ ![]()
+
- {{else}}
- {{#if @controller.site.mobileView}}
- {{i18n + "login.no_login_methods.title" + }}
++ {{htmlSafe + (i18n + "login.no_login_methods.description" + (hash adminLoginPath=@controller.adminLoginPath) + ) + }} +
+ {{#if @controller.site.desktopView}}
+
+
+ {{/if}}
+
+ {{/if}}
+
+ {{#if
+ (and @controller.showLoginButtons @controller.site.desktopView)
+ }}
+ {{#unless @controller.canLoginLocal}}
+
+
+ {{/unless}}
+ {{#if @controller.hasAtLeastOneLoginButton}}
+
- {{#if @controller.site.desktopView}}
-
-
- {{/if}}
-
{{/if}}
-
- {{#if
- (and @controller.showLoginButtons @controller.site.desktopView)
- }}
- {{#unless @controller.canLoginLocal}}
-
-
- {{/unless}}
- {{#if @controller.hasAtLeastOneLoginButton}}
-
-
- {{/if}}
- {{/if}}
{{/if}}
+ {{/if}}
- {{#if @controller.site.mobileView}}
- {{#unless @controller.hasNoLoginOptions}}
-
-
-
-
-
- {{htmlSafe @controller.model.html}}
-
-
-