[GAL-285] Fix gnosis safe auth

public/manifest.json

@@ -0,0 +1,5 @@
+{
+  "name": "Gallery",
+  "description": "Share your collection with the world.",
+  "iconPath": "https://gallery.so/favicon.ico"
+}

src/components/WalletSelector/mutations/useLoginOrRedirectToOnboarding.ts

@@ -70,7 +70,8 @@ export default function useLoginOrRedirectToOnboarding() {
             {
               pathname: '/welcome',
               query: {
-                chain: 'Ethereum',
+                authMechanismType: 'eoa',
+                chain: authMechanism.mechanism.eoa.chainAddress.chain,
                 address: authMechanism.mechanism.eoa.chainAddress.address,
                 nonce: authMechanism.mechanism.eoa.nonce,
                 signature: authMechanism.mechanism.eoa.signature,
@@ -81,9 +82,19 @@ export default function useLoginOrRedirectToOnboarding() {
           );
         }
 
-        // TODO: does the gnosis safe flow lead to account creation, even without a signature?
-        // the only inputs for its AuthMechanism are `address` and `nonce`
         if (authMechanism.mechanism.gnosisSafe) {
+          push(
+            {
+              pathname: '/welcome',
+              query: {
+                authMechanismType: 'gnosisSafe',
+                address: authMechanism.mechanism.gnosisSafe.address,
+                nonce: authMechanism.mechanism.gnosisSafe.nonce,
+                userFriendlyWalletName,
+              },
+            },
+            '/welcome'
+          );
         }
 
         return;

src/hooks/api/users/useAuthPayloadQuery.ts

@@ -1,30 +1,60 @@
 import { useRouter } from 'next/router';
 
-export type AuthPayloadVariables = {
-  chain: 'Ethereum';
+type EoaPayloadVariables = {
+  authMechanismType: 'eoa' | 'gnosisSafe';
+  chain: 'Ethereum' | 'Tezos';
   address: string;
   nonce: string;
   signature: string;
   userFriendlyWalletName: string;
 };
 
+type GnosisPayloadVariables = {
+  authMechanismType: 'eoa' | 'gnosisSafe';
+  address: string;
+  nonce: string;
+  userFriendlyWalletName: string;
+};
+
+export type AuthPayloadVariables = EoaPayloadVariables | GnosisPayloadVariables;
+
+export function isEoaPayload(payload: AuthPayloadVariables): payload is EoaPayloadVariables {
+  return payload.authMechanismType === 'eoa';
+}
+
 export default function useAuthPayloadQuery(): AuthPayloadVariables | null {
   const { query } = useRouter();
 
+  // need weird typechecking logic in this func due to the fact that nextjs queries can be
+  // a variety of types, and doesn't offer generics
   if (
+    typeof query.authMechanismType !== 'string' ||
     typeof query.address !== 'string' ||
     typeof query.nonce !== 'string' ||
-    typeof query.signature !== 'string' ||
     Array.isArray(query.userFriendlyWalletName)
   ) {
     return null;
   }
 
+  if (query.authMechanismType === 'eoa') {
+    if (typeof query.signature !== 'string') {
+      return null;
+    }
+
+    return {
+      authMechanismType: 'eoa',
+      chain: query.chain as EoaPayloadVariables['chain'],
+      address: query.address,
+      nonce: query.nonce,
+      signature: query.signature,
+      userFriendlyWalletName: query.userFriendlyWalletName || 'unknown',
+    };
+  }
+
   return {
-    chain: 'Ethereum',
+    authMechanismType: 'gnosisSafe',
     address: query.address,
     nonce: query.nonce,
-    signature: query.signature,
     userFriendlyWalletName: query.userFriendlyWalletName || 'unknown',
   };
 }

src/hooks/api/users/useCreateUser.ts

@@ -1,7 +1,7 @@
 import { usePromisifiedMutation } from 'hooks/usePromisifiedMutation';
 import { useCallback } from 'react';
 import { graphql } from 'relay-runtime';
-import { AuthPayloadVariables } from './useAuthPayloadQuery';
+import { AuthPayloadVariables, isEoaPayload } from './useAuthPayloadQuery';
 
 export default function useCreateUser() {
   const [createUser] = usePromisifiedMutation<any>(
@@ -38,13 +38,33 @@ export default function useCreateUser() {
 
   return useCallback(
     async (authPayloadVariables: AuthPayloadVariables, username: string, bio: string) => {
-      const { chain, address, nonce, signature } = authPayloadVariables;
+      let authMechanism;
+
+      if (isEoaPayload(authPayloadVariables)) {
+        const { chain, address, nonce, signature } = authPayloadVariables;
+        authMechanism = {
+          eoa: {
+            chainAddress: {
+              chain,
+              address,
+            },
+            nonce,
+            signature,
+          },
+        };
+      } else {
+        const { address, nonce } = authPayloadVariables;
+        authMechanism = {
+          gnosisSafe: {
+            address,
+            nonce,
+          },
+        };
+      }
 
       const response = await createUser({
         variables: {
-          authMechanism: {
-            eoa: { chainAddress: { address, chain }, nonce, signature },
-          },
+          authMechanism,
           username,
           bio,
         },