fix siwe tests

nucypher · Jun 5, 2024 · 7129745 · 7129745
1 parent d2a8baf
commit 7129745
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 10 deletions.
diff --git a/packages/taco-auth/src/eip4361.ts b/packages/taco-auth/src/eip4361.ts
@@ -34,25 +34,38 @@ export class EIP4361SignatureProvider {
 
   private async createSiweMessage(): Promise<AuthSignature> {
     const address = await this.signer.getAddress();
-    const domain = (window?.location?.origin || '').split('//')[1].split('.')[0];
+    const { domain, uri } = this.getParametersOrDefault();
     const version = '1';
     const nonce = generateNonce();
-    const uri = window?.location?.origin || '';
     const chainId = (await this.provider.getNetwork()).chainId;
     const siweMessage = new SiweMessage({
       domain,
       address,
-      statement: `TACo wants you to verify ownership of Ethereum account: ${address}`,
+      statement: `${domain} wants you to sign in with your Ethereum account: ${address}`,
       uri,
       version,
       nonce,
       chainId,
     });
-
     const scheme = 'EIP4361';
     const message = siweMessage.prepareMessage();
     const signature = await this.signer.signMessage(message);
-
     return { signature, address, scheme, typedData: message };
   }
+
+  private getParametersOrDefault() {
+    // If we are in a browser environment, we can get the domain and uri from the window object
+    if (typeof window !== 'undefined') {
+      const maybeOrigin = window?.location?.origin;
+      return {
+        domain: maybeOrigin.split('//')[1].split('.')[0],
+        uri: maybeOrigin,
+      };
+    }
+    // TODO: Add a facility to manage this case
+    return {
+      domain: 'localhost',
+      uri: 'http://localhost:3000',
+    };
+  }
 }
diff --git a/packages/taco-auth/test/taco-auth.test.ts b/packages/taco-auth/test/taco-auth.test.ts
@@ -67,13 +67,12 @@ describe('taco authorization', () => {
     expect(typedSignature.address).toEqual(await signer.getAddress());
     expect(typedSignature.scheme).toEqual('EIP4361');
 
-    console.log(typedSignature.typedData);
     const typedDataSiweMessage = new SiweMessage(`${typedSignature.typedData}`);
     expect(typedDataSiweMessage).toBeDefined();
-    expect(typedDataSiweMessage.domain).toEqual('TACo');
+    expect(typedDataSiweMessage.domain).toEqual('localhost');
     expect(typedDataSiweMessage.version).toEqual('1');
     expect(typedDataSiweMessage.nonce).toBeDefined(); // random
-    expect(typedDataSiweMessage.uri).toEqual('https://TACo');
+    expect(typedDataSiweMessage.uri).toEqual('http://localhost:3000');
     expect(typedDataSiweMessage.chainId).toEqual(
       (await provider.getNetwork()).chainId,
     );

diff --git a/packages/taco/test/conditions/context.test.ts b/packages/taco/test/conditions/context.test.ts
@@ -440,9 +440,9 @@ describe('authentication provider', () => {
     expect(typedSignature.address).toEqual(signerAddress);
 
     expect(typedSignature.typedData).toContain(
-      `TACo wants you to sign in with your Ethereum account:\n${signerAddress}`,
+      `localhost wants you to sign in with your Ethereum account:\n${signerAddress}`,
     );
-    expect(typedSignature.typedData).toContain('URI: https://TACo');
+    expect(typedSignature.typedData).toContain('URI: http://localhost:3000');
 
     const chainId = (await provider.getNetwork()).chainId;
     expect(typedSignature.typedData).toContain(`Chain ID: ${chainId}`);