chore(web): initial-wrapper-update

Author: tractorss

web/package.json

@@ -117,7 +117,7 @@
     "siwe": "^2.3.1",
     "styled-components": "^5.3.11",
     "vanilla-jsoneditor": "^0.21.4",
-    "viem": "^2.1.0",
+    "viem": "^2.17.3",
     "vite": "^5.2.10",
     "wagmi": "^2.2.1"
   }

web/src/components/EnsureAuth.tsx

@@ -1,7 +1,7 @@
 import React, { useMemo, useState } from "react";
 
 import * as jwt from "jose";
-import { SiweMessage } from "siwe";
+import { createSiweMessage } from "viem/siwe";
 import { useAccount, useChainId, useSignMessage } from "wagmi";
 
 import { Button } from "@kleros/ui-components-library";
@@ -41,7 +41,7 @@ export const EnsureAuth: React.FC<IEnsureAuth> = ({ children, className }) => {
       setIsLoading(true);
       if (!address) return;
 
-      const message = await createSiweMessage(address, "Sign In to Kleros with Ethereum.", chainId);
+      const message = await createMessage(address, "Sign In to Kleros with Ethereum.", chainId);
 
       const signature = await signMessageAsync({ message });
 
@@ -52,9 +52,8 @@ export const EnsureAuth: React.FC<IEnsureAuth> = ({ children, className }) => {
         signature,
         message,
       })
-        .then(async (res) => {
-          const response = await res.json();
-          setAuthToken(response["token"]);
+        .then(async (token) => {
+          setAuthToken(token);
         })
         .catch((err) => console.log({ err }))
         .finally(() => setIsLoading(false));
@@ -77,16 +76,15 @@ export const EnsureAuth: React.FC<IEnsureAuth> = ({ children, className }) => {
   );
 };
 
-async function createSiweMessage(address: `0x${string}`, statement: string, chainId: number = DEFAULT_CHAIN) {
+async function createMessage(address: `0x${string}`, statement: string, chainId: number = DEFAULT_CHAIN) {
   const domain = window.location.host;
   const origin = window.location.origin;
-  const response = await getNonce(address);
-  const nonce = (await response.json()).nonce;
+  const nonce = await getNonce(address);
 
   // signature is valid only for 10 mins
-  const expirationTime = new Date(Date.now() + 10 * 60 * 1000).toISOString();
+  const expirationTime = new Date(Date.now() + 10 * 60 * 1000);
 
-  const message = new SiweMessage({
+  const message = createSiweMessage({
     domain,
     address,
     statement,
@@ -96,5 +94,5 @@ async function createSiweMessage(address: `0x${string}`, statement: string, chai
     nonce,
     expirationTime,
   });
-  return message.prepareMessage();
+  return message;
 }

web/src/utils/authoriseUser.ts

@@ -1,4 +1,5 @@
 import { toast } from "react-toastify";
+
 import { OPTIONS } from "utils/wrapWithToast";
 
 type AuthoriseUserData = {
@@ -7,20 +8,25 @@ type AuthoriseUserData = {
   message: string;
 };
 
-export function authoriseUser(authData: AuthoriseUserData): Promise<Response> {
-  return toast.promise<Response, Error>(
+export function authoriseUser(authData: AuthoriseUserData): Promise<string> {
+  const query = `mutation Login {
+    login(message: "${authData.message}", signature: "${authData.signature}")
+  }
+  `;
+
+  return toast.promise<string, Error>(
     fetch(`/.netlify/functions/authUser`, {
       method: "POST",
       headers: {
         "Content-Type": "application/json",
       },
-      body: JSON.stringify(authData),
+      body: JSON.stringify({ query }),
     }).then(async (response) => {
       if (response.status !== 200) {
         const error = await response.json().catch(() => ({ message: "Error signing in" }));
         throw new Error(error.message);
       }
-      return response;
+      return (await response.json()).data.login.access_token;
     }),
     {
       pending: `Signing in User...`,
@@ -35,16 +41,24 @@ export function authoriseUser(authData: AuthoriseUserData): Promise<Response> {
   );
 }
 
-export function getNonce(address: string): Promise<Response> {
-  return toast.promise<Response, Error>(
+export function getNonce(address: string): Promise<string> {
+  const query = `mutation GetNonce {
+    nonce(address: "${address}")
+}`;
+
+  return toast.promise<string, Error>(
     fetch(`/.netlify/functions/getNonce?address=${address}`, {
-      method: "GET",
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+      },
+      body: JSON.stringify({ query }),
     }).then(async (response) => {
       if (response.status !== 200) {
         const error = await response.json().catch(() => ({ message: "Error getting nonce" }));
         throw new Error(error.message);
       }
-      return response;
+      return (await response.json()).data.nonce;
     }),
     {
       error: {

yarn.lock

@@ -6685,7 +6685,7 @@ __metadata:
     supabase: "npm:^1.133.3"
     typescript: "npm:^5.3.3"
     vanilla-jsoneditor: "npm:^0.21.4"
-    viem: "npm:^2.1.0"
+    viem: "npm:^2.17.3"
     vite: "npm:^5.2.10"
     vite-plugin-node-polyfills: "npm:^0.21.0"
     vite-plugin-svgr: "npm:^4.2.0"
@@ -7727,6 +7727,24 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@noble/curves@npm:1.4.0":
+  version: 1.4.0
+  resolution: "@noble/curves@npm:1.4.0"
+  dependencies:
+    "@noble/hashes": "npm:1.4.0"
+  checksum: b21b30a36ff02bfcc0f5e6163d245cdbaf7f640511fff97ccf83fc207ee79cfd91584b4d97977374de04cb118a55eb63a7964c82596a64162bbc42bc685ae6d9
+  languageName: node
+  linkType: hard
+
+"@noble/curves@npm:~1.4.0":
+  version: 1.4.2
+  resolution: "@noble/curves@npm:1.4.2"
+  dependencies:
+    "@noble/hashes": "npm:1.4.0"
+  checksum: f433a2e8811ae345109388eadfa18ef2b0004c1f79417553241db4f0ad0d59550be6298a4f43d989c627e9f7551ffae6e402a4edf0173981e6da95fc7cab5123
+  languageName: node
+  linkType: hard
+
 "@noble/ed25519@npm:^1.6.0":
   version: 1.7.3
   resolution: "@noble/ed25519@npm:1.7.3"
@@ -7769,7 +7787,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@noble/hashes@npm:^1.1.2":
+"@noble/hashes@npm:1.4.0, @noble/hashes@npm:^1.1.2, @noble/hashes@npm:~1.4.0":
   version: 1.4.0
   resolution: "@noble/hashes@npm:1.4.0"
   checksum: e156e65794c473794c52fa9d06baf1eb20903d0d96719530f523cc4450f6c721a957c544796e6efd0197b2296e7cd70efeb312f861465e17940a3e3c7e0febc6
@@ -9137,6 +9155,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@scure/base@npm:~1.1.6":
+  version: 1.1.7
+  resolution: "@scure/base@npm:1.1.7"
+  checksum: fc50ffaab36cb46ff9fa4dc5052a06089ab6a6707f63d596bb34aaaec76173c9a564ac312a0b981b5e7a5349d60097b8878673c75d6cbfc4da7012b63a82099b
+  languageName: node
+  linkType: hard
+
 "@scure/bip32@npm:1.1.5":
   version: 1.1.5
   resolution: "@scure/bip32@npm:1.1.5"
@@ -9181,6 +9206,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@scure/bip32@npm:1.4.0":
+  version: 1.4.0
+  resolution: "@scure/bip32@npm:1.4.0"
+  dependencies:
+    "@noble/curves": "npm:~1.4.0"
+    "@noble/hashes": "npm:~1.4.0"
+    "@scure/base": "npm:~1.1.6"
+  checksum: 6cd5062d902564d9e970597ec8b1adacb415b2eadfbb95aee1a1a0480a52eb0de4d294d3753aa8b48548064c9795ed108d348a31a8ce3fc88785377bb12c63b9
+  languageName: node
+  linkType: hard
+
 "@scure/bip39@npm:1.1.1":
   version: 1.1.1
   resolution: "@scure/bip39@npm:1.1.1"
@@ -9211,6 +9247,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@scure/bip39@npm:1.3.0":
+  version: 1.3.0
+  resolution: "@scure/bip39@npm:1.3.0"
+  dependencies:
+    "@noble/hashes": "npm:~1.4.0"
+    "@scure/base": "npm:~1.1.6"
+  checksum: 7d71fd58153de22fe8cd65b525f6958a80487bc9d0fbc32c71c328aeafe41fa259f989d2f1e0fa4fdfeaf83b8fcf9310d52ed9862987e46c2f2bfb9dd8cf9fc1
+  languageName: node
+  linkType: hard
+
 "@selderee/plugin-htmlparser2@npm:^0.6.0":
   version: 0.6.0
   resolution: "@selderee/plugin-htmlparser2@npm:0.6.0"
@@ -12796,6 +12842,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"abitype@npm:1.0.5":
+  version: 1.0.5
+  resolution: "abitype@npm:1.0.5"
+  peerDependencies:
+    typescript: ">=5.0.4"
+    zod: ^3 >=3.22.0
+  peerDependenciesMeta:
+    typescript:
+      optional: true
+    zod:
+      optional: true
+  checksum: 1acd0d9687945dd78442b71bd84ff3b9dceae27d15f0d8b14b16554a0c8c9518eeb971ff8e94d507f4d9f05a8a8b91eb8fafd735eaecebac37d5c5a4aac06d8e
+  languageName: node
+  linkType: hard
+
 "abitype@npm:^0.10.3":
   version: 0.10.3
   resolution: "abitype@npm:0.10.3"
@@ -23846,6 +23907,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"isows@npm:1.0.4":
+  version: 1.0.4
+  resolution: "isows@npm:1.0.4"
+  peerDependencies:
+    ws: "*"
+  checksum: a3ee62e3d6216abb3adeeb2a551fe2e7835eac87b05a6ecc3e7739259bf5f8e83290501f49e26137390c8093f207fc3378d4a7653aab76ad7bbab4b2dba9c5b9
+  languageName: node
+  linkType: hard
+
 "isstream@npm:~0.1.2":
   version: 0.1.2
   resolution: "isstream@npm:0.1.2"
@@ -36577,24 +36647,24 @@ __metadata:
   languageName: node
   linkType: hard
 
-"viem@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "viem@npm:2.1.0"
+"viem@npm:^2.17.3":
+  version: 2.17.4
+  resolution: "viem@npm:2.17.4"
   dependencies:
     "@adraffy/ens-normalize": "npm:1.10.0"
-    "@noble/curves": "npm:1.2.0"
-    "@noble/hashes": "npm:1.3.2"
-    "@scure/bip32": "npm:1.3.2"
-    "@scure/bip39": "npm:1.2.1"
-    abitype: "npm:0.10.0"
-    isows: "npm:1.0.3"
-    ws: "npm:8.13.0"
+    "@noble/curves": "npm:1.4.0"
+    "@noble/hashes": "npm:1.4.0"
+    "@scure/bip32": "npm:1.4.0"
+    "@scure/bip39": "npm:1.3.0"
+    abitype: "npm:1.0.5"
+    isows: "npm:1.0.4"
+    ws: "npm:8.17.1"
   peerDependencies:
     typescript: ">=5.0.4"
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 594406567b7666eaffe60b4ae5a7d1b98953d12e1b455c07594ae38e8f41bf910dfa2ddab69911fa9fd092b82e5a347f64df2919e5424b3d13b2e6c5ad2f7f92
+  checksum: 29e2b7d9034ea0520c47ef25cd8048078f8a0bacd24e1c468ee2ec5c51f780429e1bbb914611b54b8ee19f7eb251e171af67db7f27b97209c16cf8e917b405bf
   languageName: node
   linkType: hard
 
@@ -37934,6 +38004,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ws@npm:8.17.1":
+  version: 8.17.1
+  resolution: "ws@npm:8.17.1"
+  peerDependencies:
+    bufferutil: ^4.0.1
+    utf-8-validate: ">=5.0.2"
+  peerDependenciesMeta:
+    bufferutil:
+      optional: true
+    utf-8-validate:
+      optional: true
+  checksum: 4264ae92c0b3e59c7e309001e93079b26937aab181835fb7af79f906b22cd33b6196d96556dafb4e985742dd401e99139572242e9847661fdbc96556b9e6902d
+  languageName: node
+  linkType: hard
+
 "ws@npm:8.5.0":
   version: 8.5.0
   resolution: "ws@npm:8.5.0"