fix

Author: callicles

app/admin/page.tsx

@@ -42,6 +42,7 @@ export default async function AdminPage() {
   let hasApiError = false
   let orgs: Awaited<ReturnType<typeof getOrganizations>> = []
   let installedOrgsCount = 0
+  const installLink = getInstallLink("/admin")
 
   try {
     const allOrgs = await getOrganizations()
@@ -51,8 +52,13 @@ export default async function AdminPage() {
     hasApiError = true
   }
 
-  if (!hasApiError && orgs.length === 0 && installedOrgsCount === 0) {
-    redirect("/api/github/install?returnTo=%2Fadmin")
+  if (
+    !hasApiError &&
+    orgs.length === 0 &&
+    installedOrgsCount === 0 &&
+    installLink.autoRedirectHref
+  ) {
+    redirect(installLink.autoRedirectHref)
   }
 
   const hasInstalledOrgs = installedOrgsCount > 0
@@ -69,12 +75,12 @@ export default async function AdminPage() {
                 Manage CLAs for your GitHub organizations and personal accounts.
               </p>
             </div>
-            <Link href="/api/github/install?returnTo=%2Fadmin">
+            <a href={installLink.href}>
               <Button className="gap-2">
                 <Plus className="h-4 w-4" />
                 Install on GitHub Account
               </Button>
-            </Link>
+            </a>
           </div>
 
           {hasApiError ? (
@@ -123,12 +129,12 @@ export default async function AdminPage() {
                         ? "We found an installation, but your account is not recognized as an admin for any installed GitHub account."
                         : "Install the CLA Bot GitHub App on your organization or personal account to get started."}
                     </p>
-                    <Link href="/api/github/install?returnTo=%2Fadmin">
+                    <a href={installLink.href}>
                       <Button className="gap-2">
                         <Github className="h-4 w-4" />
                         Install GitHub App
                       </Button>
-                    </Link>
+                    </a>
                   </CardContent>
                 </Card>
               ) : (
@@ -194,3 +200,22 @@ export default async function AdminPage() {
     </div>
   )
 }
+
+function getInstallLink(returnTo: string) {
+  const fallback = `/api/github/install?returnTo=${encodeURIComponent(returnTo)}`
+  const appSlug = process.env.GITHUB_APP_SLUG?.trim()
+  if (!appSlug) {
+    return {
+      href: fallback,
+      autoRedirectHref: null,
+    }
+  }
+
+  const installUrl = new URL(`https://github.com/apps/${appSlug}/installations/new`)
+  installUrl.searchParams.set("state", returnTo)
+
+  return {
+    href: installUrl.toString(),
+    autoRedirectHref: installUrl.toString(),
+  }
+}