From 70f8fdbe457dbd8ccdc76bda62ec0fe509dcf16e Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Wed, 11 Aug 2021 10:26:37 +0100
Subject: [PATCH] FEATURE: Allow linking an existing account from invite
 acceptance (#13998)

The invite acceptance page is an alternative signup flow, so it makes sense to include the new 'link' functionality there as well.

Followup to 7dc8f8b794cbb36b14737710ccfe417d1c074d12
---
 .../discourse/app/controllers/invites-show.js | 11 ++++++++
 .../discourse/app/templates/invites/show.hbs  |  6 +++++
 .../tests/acceptance/invite-accept-test.js    | 27 +++++++++++++++++++
 3 files changed, 44 insertions(+)

diff --git a/app/assets/javascripts/discourse/app/controllers/invites-show.js b/app/assets/javascripts/discourse/app/controllers/invites-show.js
index 0a6574e9ffd..6606c42965e 100644
--- a/app/assets/javascripts/discourse/app/controllers/invites-show.js
+++ b/app/assets/javascripts/discourse/app/controllers/invites-show.js
@@ -212,6 +212,17 @@ export default Controller.extend(
     @discourseComputed
     ssoPath: () => getUrl("/session/sso"),
 
+    @discourseComputed("authOptions.associate_url", "authOptions.auth_provider")
+    associateHtml(url, provider) {
+      if (!url) {
+        return;
+      }
+      return I18n.t("create_account.associate", {
+        associate_link: url,
+        provider: I18n.t(`login.${provider}.name`),
+      });
+    },
+
     actions: {
       submit() {
         const userFields = this.userFields;
diff --git a/app/assets/javascripts/discourse/app/templates/invites/show.hbs b/app/assets/javascripts/discourse/app/templates/invites/show.hbs
index a38a7116c6f..4fbe0db6ced 100644
--- a/app/assets/javascripts/discourse/app/templates/invites/show.hbs
+++ b/app/assets/javascripts/discourse/app/templates/invites/show.hbs
@@ -20,6 +20,12 @@
         <p>{{i18n "invites.invited_by"}}</p>
         <p>{{user-info user=invitedBy}}</p>
 
+        {{#if associateHtml}}
+          <p class="create-account-associate-link">
+            {{html-safe associateHtml}}
+          </p>
+        {{/if}}
+
         {{#unless isInviteLink}}
           <p class="email-message">
             {{html-safe yourEmailMessage}}
diff --git a/app/assets/javascripts/discourse/tests/acceptance/invite-accept-test.js b/app/assets/javascripts/discourse/tests/acceptance/invite-accept-test.js
index 0aecb13f9aa..432f5c37e33 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/invite-accept-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/invite-accept-test.js
@@ -451,3 +451,30 @@ acceptance(
     });
   }
 );
+
+acceptance(
+  "Invite link with authentication data, and associate link",
+  function (needs) {
+    needs.settings({ enable_local_logins: false });
+
+    setAuthenticationData(needs.hooks, {
+      auth_provider: "facebook",
+      email: "blah@example.com",
+      email_valid: true,
+      username: "foobar",
+      name: "barfoo",
+      associate_url: "/associate/abcde",
+    });
+
+    test("shows the associate link", async function (assert) {
+      preloadInvite({ link: true });
+
+      await visit("/invites/myvalidinvitetoken");
+
+      assert.ok(
+        exists(".create-account-associate-link"),
+        "shows the associate account link"
+      );
+    });
+  }
+);