better-near-auth 0.3.3 → 0.3.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "better-near-auth",
-  "version": "0.3.3",
+  "version": "0.3.4",
   "description": "Sign in with NEAR (SIWN) plugin for Better Auth",
   "main": "src/index.ts",
   "module": "src/index.ts",
@@ -60,18 +60,18 @@
     "typescript": "^5.9.3"
   },
   "dependencies": {
-    "@hot-labs/near-connect": "^0.8.1",
+    "@hot-labs/near-connect": "^0.8.2",
     "nanostores": "^1.1.0",
     "near-kit": "^0.7.0",
     "near-sign-verify": "^0.4.5",
-    "zod": "^4.2.1"
+    "zod": "^4.3.5"
   },
   "devDependencies": {
     "@types/bun": "latest",
-    "@types/node": "^22.19.3",
-    "better-auth": "^1.4.9",
+    "@types/node": "^25.0.9",
+    "better-auth": "^1.4.13",
     "typescript": "^5.9.3",
-    "vitest": "^3.2.4"
+    "vitest": "^4.0.17"
   },
   "files": [
     "src/",

package/src/client.ts

@@ -1,5 +1,7 @@
 import { NearConnector } from "@hot-labs/near-connect";
-import type { Account, NearWalletBase } from "@hot-labs/near-connect/build/types/wallet";
+import type { NearWalletBase } from "@hot-labs/near-connect";
+
+type Account = Awaited<ReturnType<NearWalletBase["getAccounts"]>>[number];
 import type { BetterAuthClientPlugin, BetterFetch, BetterFetchOption, BetterFetchResponse } from "better-auth/client";
 import { atom } from "nanostores";
 import { Near, fromHotConnect } from "near-kit";
@@ -22,7 +24,7 @@ export interface SIWNClientConfig {
 export interface CachedNonceData {
 	nonce: string;
 	accountId: string;
-	publicKey: string;
+	publicKey?: string | null;
 	networkId: string;
 	timestamp: number;
 }
@@ -92,10 +94,9 @@ export const siwnClient = (config: SIWNClientConfig): SIWNClientPlugin => {
 			const accountId = accounts?.[0]?.accountId;
 			if (!accountId) return;
 
-			// Create Near instance with Hot Connect wallet adapter
 			nearInstance = new Near({
 				network,
-				wallet: fromHotConnect(connector),
+				wallet: fromHotConnect(connector as Parameters<typeof fromHotConnect>[0]),
 			});
 
 			// Update state with account info
@@ -217,10 +218,8 @@ export const siwnClient = (config: SIWNClientConfig): SIWNClientPlugin => {
 								throw error;
 							}
 
-							// Get nonce first
 							const nonceRequest: NonceRequestT = {
 								accountId,
-								publicKey: state.publicKey || "",
 								networkId: (state.networkId || network) as "mainnet" | "testnet"
 							};
 
@@ -330,18 +329,8 @@ export const siwnClient = (config: SIWNClientConfig): SIWNClientPlugin => {
 
 							const { accountId, networkId, publicKey } = state;
 
-							if (!publicKey) {
-								throw new Error("Failed to get public key from wallet");
-							}
-
-							nearState.set({
-								...state,
-								publicKey,
-							});
-
 							const nonceRequest: NonceRequestT = {
 								accountId,
-								publicKey: publicKey,
 								networkId: networkId as "mainnet" | "testnet"
 							};
 

package/src/index.ts

@@ -140,12 +140,10 @@ export const siwn = (options: SIWNPluginOptions) =>
 						...(options.validateMessage ? { validateMessage: options.validateMessage } : {}),
 					} as VerifyOptions;
 
-					// Verify the signature using near-sign-verify to extract publicKey
 					const result: VerificationResult = await verify(authToken, verifyOptions);
 
-					// Now retrieve the nonce using accountId, network, AND publicKey
 					const verification = await ctx.context.internalAdapter.findVerificationValue(
-						`siwn:${accountId}:${network}:${result.publicKey}`,
+						`siwn:${accountId}:${network}`,
 					);
 
 					if (!verification || new Date() > verification.expiresAt) {
@@ -372,7 +370,7 @@ export const siwn = (options: SIWNPluginOptions) =>
 					body: NonceRequest,
 				},
 			async (ctx) => {
-				const { accountId, networkId, publicKey } = ctx.body;
+				const { accountId, networkId } = ctx.body;
 				const network = getNetworkFromAccountId(accountId);
 
 				if (networkId !== network) {
@@ -384,12 +382,10 @@ export const siwn = (options: SIWNPluginOptions) =>
 
 				const nonce = options.getNonce ? await options.getNonce() : generateNonce();
 
-				// Store nonce as base64 string for database compatibility
 				const nonceString = bytesToBase64(nonce);
 
-				// Store nonce with accountId, network, and publicKey for unique identification
 				await ctx.context.internalAdapter.createVerificationValue({
-					identifier: `siwn:${accountId}:${network}:${publicKey}`,
+					identifier: `siwn:${accountId}:${network}`,
 					value: nonceString!,
 					expiresAt: new Date(Date.now() + 15 * 60 * 1000),
 				});
@@ -479,13 +475,11 @@ export const siwn = (options: SIWNPluginOptions) =>
 						...(options.validateMessage ? { validateMessage: options.validateMessage } : {}),
 					} as VerifyOptions;
 
-					// Verify the signature using near-sign-verify to extract publicKey
 					const result: VerificationResult = await verify(authToken, verifyOptions);
 
-					// Now retrieve the nonce using accountId, network, AND publicKey
 					const verification =
 						await ctx.context.internalAdapter.findVerificationValue(
-							`siwn:${accountId}:${network}:${result.publicKey}`,
+							`siwn:${accountId}:${network}`,
 						);
 
 					if (!verification || new Date() > verification.expiresAt) {

package/src/types.ts

@@ -36,7 +36,7 @@ export type Profile = z.infer<typeof profileSchema>;
 
 export const NonceRequest = z.object({
 	accountId: accountIdSchema,
-	publicKey: z.string(),
+	publicKey: z.string().optional(),
 	networkId: z.union([z.literal("mainnet"), z.literal("testnet")])
 });
 export const VerifyRequest = z.object({