@meistrari/auth-core 1.1.0 → 1.2.0

package/dist/index.mjs

@@ -1,11 +1,11 @@
-import { createRemoteJWKSet, jwtVerify } from 'jose';
-import { createAuthClient } from 'better-auth/client';
-import { organizationClient, twoFactorClient, jwtClient, adminClient, inferAdditionalFields } from 'better-auth/client/plugins';
+import { createRemoteJWKSet, jwtVerify, decodeJwt } from 'jose';
 import { ssoClient } from '@better-auth/sso/client';
+import { createAuthClient } from 'better-auth/client';
+import { organizationClient, twoFactorClient, jwtClient, apiKeyClient, adminClient, inferAdditionalFields } from 'better-auth/client/plugins';
 import { createAccessControl } from 'better-auth/plugins/access';
 import { defaultStatements } from 'better-auth/plugins/organization/access';
 
-const version = "1.1.0";
+const version = "1.2.0";
 
 const statements = {
   ...defaultStatements,
@@ -47,37 +47,21 @@ const organizationAdditionalFields = {
   }
 };
 
-class BaseError extends Error {
-  code;
-  constructor(code, message, options) {
-    super(message, options);
-    this.code = code;
-  }
-}
-
-class InvalidSocialProvider extends BaseError {
-  constructor(message) {
-    super("INVALID_SOCIAL_PROVIDER", message);
-  }
-}
-class InvalidCallbackURL extends BaseError {
-  constructor(message) {
-    super("INVALID_CALLBACK_URL", message);
-  }
-}
-class EmailRequired extends BaseError {
-  constructor(message) {
-    super("EMAIL_REQUIRED", message);
-  }
-}
-
 const customEndpointsPluginClient = () => {
   return {
     id: "custom-endpoints",
     $InferServerPlugin: {}
   };
 };
-function createAPIClient(apiUrl, headers) {
+const handshakePluginClient = () => {
+  return {
+    id: "handshake",
+    $InferServerPlugin: {}
+  };
+};
+function createAPIClient(apiUrl, fetchOptions = {}) {
+  const serviceName = typeof process !== "undefined" ? process.env.SERVICE_NAME : "";
+  const userAgent = `auth-sdk:core:${version}${serviceName ? `@${serviceName}` : ""}`;
   return createAuthClient({
     baseURL: apiUrl,
     plugins: [
@@ -101,19 +85,22 @@ function createAPIClient(apiUrl, headers) {
         // })
       }),
       customEndpointsPluginClient(),
+      handshakePluginClient(),
       ssoClient(),
       twoFactorClient(),
       jwtClient(),
+      apiKeyClient(),
       adminClient(),
       inferAdditionalFields({
         user: userAdditionalFields
       })
     ],
     fetchOptions: {
+      ...fetchOptions,
       credentials: "include",
       headers: {
-        "User-Agent": `auth-sdk:core:${version}`,
-        ...headers
+        "User-Agent": userAgent,
+        ...fetchOptions.headers ?? {}
       },
       throw: true
     }
@@ -354,7 +341,7 @@ class OrganizationService {
    * @param userId - The user ID to add
    */
   async addTeamMember(teamId, userId) {
-    await this.client.organization.addTeamMember({
+    return this.client.organization.addTeamMember({
       teamId,
       userId
     });
@@ -373,6 +360,30 @@ class OrganizationService {
   }
 }
 
+class BaseError extends Error {
+  code;
+  constructor(code, message, options) {
+    super(message, options);
+    this.code = code;
+  }
+}
+
+class InvalidSocialProvider extends BaseError {
+  constructor(message) {
+    super("INVALID_SOCIAL_PROVIDER", message);
+  }
+}
+class InvalidCallbackURL extends BaseError {
+  constructor(message) {
+    super("INVALID_CALLBACK_URL", message);
+  }
+}
+class EmailRequired extends BaseError {
+  constructor(message) {
+    super("EMAIL_REQUIRED", message);
+  }
+}
+
 function isValidUrl(url) {
   try {
     new URL(url);
@@ -392,6 +403,30 @@ class SessionService {
     this.client = client;
     this.apiUrl = apiUrl;
   }
+  /**
+   * Retrieves the current user session.
+   *
+   * @returns The current user session
+   */
+  async getSession(token) {
+    return this.client.getSession({
+      ...token && {
+        fetchOptions: {
+          headers: {
+            Authorization: `Bearer ${token}`
+          }
+        }
+      }
+    });
+  }
+  /**
+   * Retrieves a valid JWT token.
+   *
+   * @returns The JWT token
+   */
+  async getToken() {
+    return this.client.token();
+  }
   /**
    * Initiates social authentication flow with Google or Microsoft.
    *
@@ -506,6 +541,19 @@ class SessionService {
       newPassword: password
     });
   }
+  /**
+   * Retrieves the JWT token for a nonce.
+   *
+   * @param nonce - The nonce to retrieve the token for
+   * @returns The JWT token for the nonce
+   */
+  async getNoncePayload(nonce) {
+    return this.client.handshake.noncePayload({
+      query: {
+        nonce
+      }
+    });
+  }
 }
 
 class AuthClient {
@@ -522,10 +570,10 @@ class AuthClient {
    * Creates a new AuthClient instance.
    *
    * @param apiUrl - The base URL of the authentication API
-   * @param headers - Custom headers to include in all API requests
+   * @param fetchOptions - Custom fetch options to include in all API requests
    */
-  constructor(apiUrl, headers) {
-    this.client = createAPIClient(apiUrl, headers);
+  constructor(apiUrl, fetchOptions = {}) {
+    this.client = createAPIClient(apiUrl, fetchOptions);
     this.session = new SessionService(this.client, apiUrl);
     this.organization = new OrganizationService(this.client);
   }
@@ -551,5 +599,9 @@ async function validateToken(token, apiUrl) {
     return false;
   }
 }
+function extractTokenPayload(token) {
+  const payload = decodeJwt(token);
+  return payload;
+}
 
-export { AuthClient, Roles, ac, isTokenExpired, organizationAdditionalFields, rolesAccessControl, userAdditionalFields, validateToken };
+export { AuthClient, EmailRequired, InvalidCallbackURL, InvalidSocialProvider, Roles, ac, extractTokenPayload, isTokenExpired, organizationAdditionalFields, rolesAccessControl, userAdditionalFields, validateToken };

package/package.json

@@ -1,31 +1,32 @@
 {
-  "name": "@meistrari/auth-core",
-  "version": "1.1.0",
-  "type": "module",
-  "exports": {
-    ".": {
-      "types": "./dist/index.d.ts",
-      "import": "./dist/index.mjs"
+    "name": "@meistrari/auth-core",
+    "version": "1.2.0",
+    "type": "module",
+    "exports": {
+        ".": {
+            "types": "./dist/index.d.ts",
+            "import": "./dist/index.mjs"
+        }
+    },
+    "main": "./dist/index.mjs",
+    "types": "./dist/index.d.ts",
+    "files": [
+        "dist"
+    ],
+    "scripts": {
+        "build": "unbuild"
+    },
+    "dependencies": {
+        "@better-auth/sso": "1.4.1",
+        "better-auth": "1.4.1",
+        "jose": "6.1.0",
+        "nanostores": "1.0.1",
+        "@better-fetch/fetch": "1.1.18",
+        "better-call": "1.1.5"
+    },
+    "devDependencies": {
+        "@types/node": "latest",
+        "typescript": "5.9.2",
+        "unbuild": "3.6.1"
     }
-  },
-  "main": "./dist/index.mjs",
-  "types": "./dist/index.d.ts",
-  "files": [
-    "dist"
-  ],
-  "scripts": {
-    "build": "unbuild"
-  },
-  "dependencies": {
-    "@better-auth/sso": "1.4.1",
-    "better-auth": "1.4.1",
-    "jose": "6.1.0",
-    "nanostores": "1.0.1",
-    "@better-fetch/fetch": "1.1.18"
-  },
-  "devDependencies": {
-    "@types/node": "latest",
-    "typescript": "5.9.2",
-    "unbuild": "3.6.1"
-  }
-}
+}