Merge pull request #1183 from asleepynerd/main

Re-enable slack sign in for existing users.

Author: transcental

src/app/api/slack_redirect/route.ts

@@ -5,43 +5,45 @@ import { NextRequest } from 'next/server'
 const errRedir = (err: any) => redirect('/slack-error?err=' + err.toString())
 
 export async function GET(request: NextRequest) {
-  return redirect('/slack-error?err=High Seas has ended! Sign-ups are disabled.')
-  /*
+  // Try to authenticate the user first
   const code = request.nextUrl.searchParams.get('code')
-
-  const redirectUri = await getRedirectUri()
-
-  const exchangeUrl = `https://slack.com/api/openid.connect.token?code=${code}&client_id=${process.env.SLACK_CLIENT_ID}&client_secret=${process.env.SLACK_CLIENT_SECRET}&redirect_uri=${redirectUri}`
-  console.log('exchanging by posting to', exchangeUrl)
-
-  const res = await fetch(exchangeUrl, { method: 'POST' })
-
-  if (res.status !== 200) return errRedir('Bad Slack OpenId response status')
-
-  let data
-  try {
-    data = await res.json()
-  } catch (e) {
-    console.error(e, await res.text())
-    throw e
-  }
-  if (!data || !data.ok) {
-    console.error(data)
-    return errRedir('Bad Slack OpenID response')
+  if (!code) {
+    return redirect('/slack-error?err=Missing authorization code')
   }
 
   try {
-    await createSlackSession(data.id_token)
-    console.log('cretaed slack session!! :)))))')
-  } catch (e) {
-    return errRedir(e)
+    const redirectUri = await getRedirectUri()
+
+    const exchangeUrl = `https://slack.com/api/openid.connect.token?code=${code}&client_id=${process.env.SLACK_CLIENT_ID}&client_secret=${process.env.SLACK_CLIENT_SECRET}&redirect_uri=${redirectUri}`
+    console.log('exchanging by posting to', exchangeUrl)
+
+    const res = await fetch(exchangeUrl, { method: 'POST' })
+
+    if (res.status !== 200) return errRedir('Bad Slack OpenId response status')
+
+    let data
+    try {
+      data = await res.json()
+    } catch (e) {
+      console.error(e, await res.text())
+      throw e
+    }
+    if (!data || !data.ok) {
+      console.error(data)
+      return errRedir('Bad Slack OpenID response')
+    }
+
+    try {
+      await createSlackSession(data.id_token)
+      console.log('created slack session!! :)))))')
+      return redirect('/signpost')
+    } catch (e: any) {
+      if (e.toString().includes('Sign-ups are disabled')) {
+        return errRedir(e)
+      }
+      throw e
+    }
+  } catch (error) {
+    return errRedir(error)
   }
-
-  // const userInfoUrl = `https://slack.com/api/openid.connect.userInfo`;
-  // const userInfo = await fetch(userInfoUrl, {
-  //   headers: { Authorization: `Bearer ${data.access_token}` },
-  // }).then((d) => d.json());
-
-  redirect('/signpost')
-  */
 }

src/app/marketing/marketing-utils.ts

@@ -22,7 +22,7 @@ export async function handleEmailSubmission(
   key: string
 } | null> {
   throw new Error('High Seas has ended! Sign-ups are disabled.')
-  
+
   /*
   if (!email) throw new Error('No email supplied to handleEmailSubmission')
   if (!userAgent)

src/app/utils/server/auth.ts

@@ -105,7 +105,6 @@ export async function createSlackSession(slackOpenidToken: string) {
     const person = (await getSelfPerson(payload.sub as string)) as any
 
     if (!person) {
-      // Sign-ups are disabled
       throw new Error('High Seas has ended! Sign-ups are disabled.')
 
       /*