@aeriajs/builtins 0.0.64 → 0.0.65

package/dist/collections/user/authenticate.d.ts

@@ -1,20 +1,18 @@
-import type { Context, SchemaWithId } from '@aeriajs/types';
+import type { Context, SchemaWithId, TokenRecipient } from '@aeriajs/types';
 import type { description } from './description.js';
 import type { ObjectId } from '@aeriajs/core';
 type Props = {
     email: string;
     password: string;
 } | {
+    token?: TokenRecipient;
     revalidate: true;
 };
 type Return = {
     user: Pick<SchemaWithId<typeof description>, 'name' | 'email' | 'roles' | 'active'> & {
         _id: ObjectId | null;
     };
-    token: {
-        type: 'bearer';
-        content: string;
-    };
+    token: TokenRecipient;
 };
 export declare enum AuthenticationErrors {
     Unauthenticated = "UNAUTHENTICATED",

package/dist/collections/user/authenticate.js

@@ -81,11 +81,15 @@ const getDefaultUser = async () => {
 exports.getDefaultUser = getDefaultUser;
 const authenticate = async (props, context) => {
     if ('revalidate' in props) {
-        if (!context.token.authenticated) {
+        const { token } = props;
+        if (!token && !context.token.authenticated) {
             return (0, common_1.left)(AuthenticationErrors.Unauthenticated);
         }
-        return (0, common_1.right)(context.token.sub
-            ? await getUser(context.token.sub, context)
+        const decodedToken = token
+            ? await (0, core_1.decodeToken)(token.content)
+            : context.token;
+        return (0, common_1.right)(decodedToken.sub
+            ? await getUser(decodedToken.sub, context)
             : await (0, exports.getDefaultUser)());
     }
     if (typeof props.email !== 'string') {

package/dist/collections/user/authenticate.mjs

@@ -1,6 +1,6 @@
 "use strict";
 import { compare as bcryptCompare } from "bcrypt";
-import { signToken } from "@aeriajs/core";
+import { signToken, decodeToken } from "@aeriajs/core";
 import { left, right } from "@aeriajs/common";
 export var AuthenticationErrors = /* @__PURE__ */ ((AuthenticationErrors2) => {
   AuthenticationErrors2["Unauthenticated"] = "UNAUTHENTICATED";
@@ -77,10 +77,12 @@ export const getDefaultUser = async () => {
 };
 export const authenticate = async (props, context) => {
   if ("revalidate" in props) {
-    if (!context.token.authenticated) {
+    const { token } = props;
+    if (!token && !context.token.authenticated) {
       return left("UNAUTHENTICATED" /* Unauthenticated */);
     }
-    return right(context.token.sub ? await getUser(context.token.sub, context) : await getDefaultUser());
+    const decodedToken = token ? await decodeToken(token.content) : context.token;
+    return right(decodedToken.sub ? await getUser(decodedToken.sub, context) : await getDefaultUser());
   }
   if (typeof props.email !== "string") {
     return left("INVALID_CREDENTIALS" /* InvalidCredentials */);

package/dist/collections/user/index.d.ts

@@ -415,6 +415,7 @@ export declare const user: Omit<import("@aeriajs/types").Collection<{
             email: string;
             password: string;
         } | {
+            token?: import("@aeriajs/types").TokenRecipient | undefined;
             revalidate: true;
         }, context: import("@aeriajs/types").Context<{
             readonly $id: "user";
@@ -620,10 +621,7 @@ export declare const user: Omit<import("@aeriajs/types").Collection<{
             }>, "name" | "roles" | "email" | "active"> & {
                 _id: any;
             };
-            token: {
-                type: "bearer";
-                content: string;
-            };
+            token: import("@aeriajs/types").TokenRecipient;
         } | {
             user: {
                 _id: null;
@@ -1713,6 +1711,7 @@ export declare const user: Omit<import("@aeriajs/types").Collection<{
             email: string;
             password: string;
         } | {
+            token?: import("@aeriajs/types").TokenRecipient | undefined;
             revalidate: true;
         }, context: import("@aeriajs/types").Context<{
             readonly $id: "user";
@@ -1918,10 +1917,7 @@ export declare const user: Omit<import("@aeriajs/types").Collection<{
             }>, "name" | "roles" | "email" | "active"> & {
                 _id: any;
             };
-            token: {
-                type: "bearer";
-                content: string;
-            };
+            token: import("@aeriajs/types").TokenRecipient;
         } | {
             user: {
                 _id: null;

package/dist/functions/describe.d.ts

@@ -114,10 +114,7 @@ export declare const describe: (contextOrPayload: RouteContext | Payload) => Pro
         }>, "name" | "roles" | "email" | "active"> & {
             _id: any;
         };
-        token: {
-            type: "bearer";
-            content: string;
-        };
+        token: import("@aeriajs/types").TokenRecipient;
     } | {
         user: {
             _id: null;

package/dist/index.d.ts

@@ -1600,6 +1600,7 @@ export declare const collections: {
                 email: string;
                 password: string;
             } | {
+                token?: import("@aeriajs/types").TokenRecipient | undefined;
                 revalidate: true;
             }, context: import("@aeriajs/types").Context<{
                 readonly $id: "user";
@@ -1805,10 +1806,7 @@ export declare const collections: {
                 }>, "name" | "roles" | "email" | "active"> & {
                     _id: any;
                 };
-                token: {
-                    type: "bearer";
-                    content: string;
-                };
+                token: import("@aeriajs/types").TokenRecipient;
             } | {
                 user: {
                     _id: null;
@@ -2898,6 +2896,7 @@ export declare const collections: {
                 email: string;
                 password: string;
             } | {
+                token?: import("@aeriajs/types").TokenRecipient | undefined;
                 revalidate: true;
             }, context: import("@aeriajs/types").Context<{
                 readonly $id: "user";
@@ -3103,10 +3102,7 @@ export declare const collections: {
                 }>, "name" | "roles" | "email" | "active"> & {
                     _id: any;
                 };
-                token: {
-                    type: "bearer";
-                    content: string;
-                };
+                token: import("@aeriajs/types").TokenRecipient;
             } | {
                 user: {
                     _id: null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aeriajs/builtins",
-  "version": "0.0.64",
+  "version": "0.0.65",
   "description": "## Installation",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -36,22 +36,22 @@
     "bcrypt": "^5.1.1"
   },
   "devDependencies": {
-    "@aeriajs/access-control": "^0.0.35",
-    "@aeriajs/core": "^0.0.64",
-    "@aeriajs/common": "^0.0.35",
-    "@aeriajs/entrypoint": "^0.0.35",
-    "@aeriajs/types": "^0.0.32",
-    "@aeriajs/validation": "^0.0.38",
+    "@aeriajs/access-control": "^0.0.36",
+    "@aeriajs/core": "^0.0.65",
+    "@aeriajs/common": "^0.0.36",
+    "@aeriajs/entrypoint": "^0.0.36",
+    "@aeriajs/types": "^0.0.33",
+    "@aeriajs/validation": "^0.0.39",
     "@types/bcrypt": "^5.0.2",
     "mongodb": "^6.5.0"
   },
   "peerDependencies": {
-    "@aeriajs/access-control": "^0.0.35",
-    "@aeriajs/core": "^0.0.64",
-    "@aeriajs/common": "^0.0.35",
-    "@aeriajs/entrypoint": "^0.0.35",
-    "@aeriajs/types": "^0.0.32",
-    "@aeriajs/validation": "^0.0.38"
+    "@aeriajs/access-control": "^0.0.36",
+    "@aeriajs/core": "^0.0.65",
+    "@aeriajs/common": "^0.0.36",
+    "@aeriajs/entrypoint": "^0.0.36",
+    "@aeriajs/types": "^0.0.33",
+    "@aeriajs/validation": "^0.0.39"
   },
   "scripts": {
     "test": "echo skipping",