add helpers for siwe

.eslintrc.json

@@ -6,8 +6,7 @@
     "eslint:all",
     "plugin:@typescript-eslint/stylistic-type-checked",
     "plugin:@typescript-eslint/strict-type-checked",
-    "prettier",
-    "plugin:prettier/recommended"
+    "prettier"
   ],
   "parserOptions": {
     "project": ["tsconfig.json"]

apps/laboratory/src/pages/api/auth/[...nextauth].ts

@@ -1,19 +1,19 @@
-import type { SIWESession } from '@web3modal/siwe'
 import type { NextApiRequest, NextApiResponse } from 'next'
 import nextAuth from 'next-auth'
 import credentialsProvider from 'next-auth/providers/credentials'
-import { isValidEip191Signature, isValidEip1271Signature } from '@walletconnect/utils'
+import {
+  type SIWESession,
+  verifySignature,
+  getChainIdFromMessage,
+  getAddressFromMessage
+} from '@web3modal/siwe'
 
 declare module 'next-auth' {
   interface Session extends SIWESession {
     address: string
     chainId: number
   }
 }
-
-const ETH_ADDRESS_PATTERN = /0x[a-fA-F0-9]{40}/u
-const ETH_CHAIN_ID_IN_SIWE_PATTERN = /Chain ID: (?<temp1>\d+)/u
-
 /*
  * For more information on each option (and a full list of options) go to
  * https://next-auth.js.org/configuration/options
@@ -49,14 +49,10 @@ export default async function auth(req: NextApiRequest, res: NextApiResponse) {
             throw new Error('SiweMessage is undefined')
           }
           const { message, signature } = credentials
-          const address = message.match(ETH_ADDRESS_PATTERN)?.[0] || ''
-          const chainId = `eip155:${
-            credentials.message.match(ETH_CHAIN_ID_IN_SIWE_PATTERN)?.[1] || 1
-          }`
-          let isValid = isValidEip191Signature(address, message, signature)
-          if (!isValid) {
-            isValid = await isValidEip1271Signature(address, message, signature, chainId, projectId)
-          }
+          const address = getAddressFromMessage(message)
+          const chainId = getChainIdFromMessage(message)
+
+          const isValid = await verifySignature({ address, message, signature, chainId, projectId })
 
           if (isValid) {
             return {

packages/siwe/core/helpers/index.ts

@@ -0,0 +1,33 @@
+import { isValidEip191Signature, isValidEip1271Signature } from '@walletconnect/utils'
+
+const ETH_ADDRESS_PATTERN = /0x[a-fA-F0-9]{40}/u
+const ETH_CHAIN_ID_IN_SIWE_PATTERN = /Chain ID: (?<temp1>\d+)/u
+
+export function getAddressFromMessage(message: string) {
+  return message.match(ETH_ADDRESS_PATTERN)?.[0] || ''
+}
+
+export function getChainIdFromMessage(message: string) {
+  return `eip155:${message.match(ETH_CHAIN_ID_IN_SIWE_PATTERN)?.[1] || 1}`
+}
+
+export async function verifySignature({
+  address,
+  message,
+  signature,
+  chainId,
+  projectId
+}: {
+  address: string
+  message: string
+  signature: string
+  chainId: string
+  projectId: string
+}) {
+  let isValid = isValidEip191Signature(address, message, signature)
+  if (!isValid) {
+    isValid = await isValidEip1271Signature(address, message, signature, chainId, projectId)
+  }
+
+  return isValid
+}

packages/siwe/exports/index.ts

@@ -6,6 +6,11 @@ import type {
   SIWEClientMethods
 } from '../core/utils/TypeUtils.js'
 import { Web3ModalSIWEClient } from '../src/client.js'
+export {
+  getAddressFromMessage,
+  getChainIdFromMessage,
+  verifySignature
+} from '../core/helpers/index.js'
 export { SIWEController, type SIWEControllerClient } from '../core/controller/SIWEController.js'
 
 export type {

packages/siwe/package.json

@@ -18,6 +18,7 @@
   "dependencies": {
     "@web3modal/core": "4.1.5",
     "@web3modal/scaffold-utils": "4.1.5",
+    "@walletconnect/utils": "2.12.0",
     "valtio": "1.11.2",
     "lit": "3.1.0"
   },