A platform for community discussion. Free, open, simple.
FIX: Show account confirmation for inactive signups (#44197)
Natalie Tay028d988548c4
diff --git a/frontend/discourse/app/controllers/signup.js b/frontend/discourse/app/controllers/signup.jsindex 73094a45661..a9d33772e10 100644--- a/frontend/discourse/app/controllers/signup.js+++ b/frontend/discourse/app/controllers/signup.js@@ -555,7 +555,11 @@ export default class SignupPageController extends Controller {let { destination_url } = this.authOptions || {};- if (destination_url && destination_url !== "/signup") {+ if (+ result.active &&+ destination_url &&+ destination_url !== "/signup"+ ) {set("redirect", destination_url);} else {set("redirect", userPath("account-created"));diff --git a/frontend/discourse/tests/acceptance/create-account-external-test.js b/frontend/discourse/tests/acceptance/create-account-external-test.jsindex fd0de7c358d..e5e3ac112ee 100644--- a/frontend/discourse/tests/acceptance/create-account-external-test.js+++ b/frontend/discourse/tests/acceptance/create-account-external-test.js@@ -1,5 +1,7 @@-import { visit } from "@ember/test-helpers";+import { click, visit } from "@ember/test-helpers";import { test } from "qunit";+import sinon from "sinon";+import pretender, { response } from "discourse/tests/helpers/create-pretender";import { acceptance } from "discourse/tests/helpers/qunit-helpers";function setupAuthData(data) {@@ -18,6 +20,53 @@ function setupAuthData(data) {document.querySelector("head").appendChild(node);}+for (const { active, destination, expected } of [+ { active: false, destination: "/", expected: "/u/account-created" },+ { active: false, destination: "/login", expected: "/u/account-created" },+ { active: true, destination: "/latest", expected: "/latest" },+ { active: true, destination: "/signup", expected: "/u/account-created" },+]) {+ acceptance(+ `Create Account - external auth redirects (active=${active}, destination=${destination})`,+ function (needs) {+ needs.hooks.beforeEach(function () {+ setupAuthData({ destination_url: destination });+ this.loginForm = document.createElement("form");+ this.loginForm.id = "hidden-login-form";+ for (const name of ["username", "password", "redirect"]) {+ const input = document.createElement("input");+ input.name = name;+ this.loginForm.appendChild(input);+ }+ document.body.appendChild(this.loginForm);+ this.submit = sinon.stub(this.loginForm, "submit");+ });++ needs.hooks.afterEach(function () {+ this.loginForm.remove();+ document.getElementById("data-authentication").remove();+ });++ test("redirects after signup", async function (assert) {+ pretender.post("/u", () => response({ success: true, active }));++ await visit("/");+ await click(".signup-fullpage .btn-primary");++ assert.true(+ this.submit.calledOnce,+ "submits the browser redirect form"+ );+ assert.strictEqual(+ this.loginForm.elements.redirect.value,+ expected,+ "inactive signups see confirmation while active signups retain their destination"+ );+ });+ }+ );+}+acceptance("Create Account - external auth", function (needs) {needs.hooks.beforeEach(function () {setupAuthData();