Merge pull request #819 from tdurieux/codex/signin-legacy-warning

fix: guide existing accounts to legacy GitHub sign-in

public/asset-manifest.json

@@ -1,6 +1,6 @@
 {
   "core.min.js": "core.c5bd53363a.min.js",
-  "vendor.min.js": "vendor.b17b42ea2b.min.js",
+  "vendor.min.js": "vendor.cbc8c2964d.min.js",
   "mermaid.min.js": "mermaid.f848a72d16.min.js",
   "all.min.css": "all.7ac8730b9a.min.css",
   "markdown.min.js": "markdown.ad7b1d71c3.min.js",

public/i18n/locale-en.json

@@ -130,7 +130,7 @@
     "invalid_webhook_signature": "The webhook signature is invalid.",
     "webhook_processing_failed": "Webhook processing failed. Retry the delivery.",
     "github_app_authorization_cancelled": "GitHub authorization was cancelled.",
-    "github_account_link_required": "This username belongs to an existing account. Sign in to that account before connecting GitHub.",
+    "github_account_link_required": "This username belongs to an existing account. Sign in with legacy GitHub OAuth to keep access to your existing anonymizations, then connect the read-only GitHub App from GitHub connections.",
     "github_app_refresh_busy": "GitHub credentials are being renewed. Please retry shortly.",
     "github_grant_revocation_failed": "Unable to revoke the GitHub grant. Please retry.",
     "another_login_required": "Connect and verify another sign-in method before disconnecting OAuth.",

public/partials/signin.htm

@@ -1,6 +1,11 @@
 <div class="container page paper-page">
   <h1 class="paper-page-title">Connect to <em>GitHub</em></h1>
   <p>Sign in to manage your anonymizations. Both connections use the same Anonymous GitHub account.</p>
+  <p class="alert alert-warning" role="note" v-if="site_options?.GITHUB_APP_ENABLED &amp;&amp; site_options?.GITHUB_OAUTH_ENABLED">
+    If you already have an Anonymous GitHub account, sign in with
+    <a class="alert-link" target="_self" href="/github/login">legacy GitHub OAuth</a>
+    to keep access to your existing anonymizations. You can connect the read-only GitHub App from GitHub connections after signing in.
+  </p>
   <p v-if="site_options?.GITHUB_APP_ENABLED"><a class="btn btn-ink" target="_self" href="/github/app/login">Continue with read-only GitHub App</a></p>
   <p v-if="site_options?.GITHUB_APP_ENABLED">Choose which repositories to allow after signing in. Private repositories are accessed with read-only permissions.</p>
   <p v-if="site_options?.GITHUB_OAUTH_ENABLED"><a class="btn" target="_self" href="/github/login">Continue with legacy GitHub OAuth</a></p>