wip

proofzero · Jun 5, 2023 · f53f622 · f53f622
1 parent ee32a14
commit f53f622
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 17 deletions.
diff --git a/apps/console/app/routes/apps/$clientId/team.tsx b/apps/console/app/routes/apps/$clientId/team.tsx
@@ -128,7 +128,7 @@ export const action: ActionFunction = getRollupReqFunctionErrorWrapper(
 )
 
 export default () => {
-  useConnectResult(['SUCCESS', 'ACCOUNT_CONNECT_ERROR', 'CANCEL', 'ALREADY_CONNECTED_ERROR'])
+  useConnectResult()
 
   const submit = useSubmit()
 

diff --git a/apps/passport/app/routes/authorize.tsx b/apps/passport/app/routes/authorize.tsx
@@ -417,7 +417,7 @@ export default function Authorize() {
   const navigate = useNavigate()
   const transition = useTransition()
 
-  useConnectResult(['ACCOUNT_CONNECT_ERROR', 'CANCEL', 'ALREADY_CONNECTED_ERROR'])
+  useConnectResult()
 
   const cancelCallback = () => {
     const redirectURL = new URL(redirectUri)

diff --git a/apps/passport/app/routes/connect/$address/sign.tsx b/apps/passport/app/routes/connect/$address/sign.tsx
@@ -51,7 +51,6 @@ export const action: ActionFunction = getRollupReqFunctionErrorWrapper(
   async ({ request, context, params }) => {
     const appData = await getAuthzCookieParams(request, context.env)
     const jwt = await getUserSession(request, context.env, params.clientId)
-    const accountURN = parseJwt(jwt).sub! as AccountURN
 
     const { address } = params
     if (!address)
@@ -81,8 +80,8 @@ export const action: ActionFunction = getRollupReqFunctionErrorWrapper(
 
 
     if (appData?.rollup_action === 'connect' && existing) {
+      const accountURN = parseJwt(jwt).sub! as AccountURN
       if (accountURN === accountURNFromAddress) {
-        console.log({SOMETHIN: "WENT TERRIBLY WRONG"})
         return redirect(getAuthzRedirectURL(appData, 'ALREADY_CONNECTED_ERROR'))
       }
       return redirect(getAuthzRedirectURL(appData, 'ACCOUNT_CONNECT_ERROR'))

diff --git a/apps/passport/app/utils/authenticate.server.ts b/apps/passport/app/utils/authenticate.server.ts
@@ -2,7 +2,6 @@ import { AddressURNSpace } from '@proofzero/urns/address'
 import type { AddressURN } from '@proofzero/urns/address'
 import type { AccountURN } from '@proofzero/urns/account'
 
-import { JsonError } from '@proofzero/utils/errors'
 import { GrantType, ResponseType } from '@proofzero/types/access'
 
 import {
@@ -13,6 +12,7 @@ import {
 import {
   createUserSession,
   getAuthzCookieParamsSession,
+  getUserSession,
   parseJwt,
 } from '~/session.server'
 import { generateGradient } from './gradient.server'
@@ -40,15 +40,25 @@ export const authenticateAddress = async (
     })
   }
 
+  const jwt = await getUserSession(request, env, appData?.clientId)
   if (
     appData.rollup_action &&
     ['connect', 'reconnect'].includes(appData?.rollup_action)
   ) {
+    let result = undefined
+
+    if (existing && appData.rollup_action === 'connect') {
+      const loggedInAccount = parseJwt(jwt).sub
+      if (account !== loggedInAccount) {
+        result = 'ACCOUNT_CONNECT_ERROR'
+      } else {
+        result = 'ALREADY_CONNECTED_ERROR'
+      }
+    }
+
     const redirectURL = getAuthzRedirectURL(
       appData,
-      existing && appData.rollup_action === 'connect'
-        ? 'ACCOUNT_CONNECT_ERROR'
-        : undefined
+      result
     )
 
     return redirect(redirectURL)
@@ -108,13 +118,6 @@ export const getAuthzRedirectURL = (
 
   redirectURL += `?${urlParams}`
 
-  console.log({ redirectURL })
-  console.log({ redirectURL })
-  console.log({ redirectURL })
-  console.log({ redirectURL })
-  console.log({ redirectURL })
-
-
   return redirectURL
 }
 

diff --git a/packages/design-system/src/hooks/useConnectResult.tsx b/packages/design-system/src/hooks/useConnectResult.tsx
@@ -2,7 +2,12 @@ import { ToastType, toast } from '../atoms/toast'
 import { useEffect } from 'react'
 
 export default (
-  handledMessageTypes: string[] = ['SUCCESS', 'ACCOUNT_CONNECT_ERROR', 'CANCEL']
+  handledMessageTypes: string[] = [
+    'SUCCESS',
+    'ACCOUNT_CONNECT_ERROR',
+    'ALREADY_CONNECTED_ERROR',
+    'CANCEL'
+  ]
 ) => {
   useEffect(() => {
     const url = new URL(window.location.href)
@@ -31,9 +36,11 @@ export default (
             toast(
               ToastType.Error,
               {
-                message: 'Account is already connected to your identity.' },
+                message: 'Account is already connected to your identity.'
+              },
               { duration: 2000 }
             )
+            break
           case 'CANCEL':
             toast(
               ToastType.Warning,