@aeriajs/builtins 0.0.226 → 0.0.228

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

@@ -12,7 +12,7 @@ export declare const activate: (payload: {
     password?: string;
     userId?: string;
     token?: string;
-}, context: Context<typeof description>) => Promise<import("@aeriajs/types").GenericResponse | Result.Error<{
+}, context: Context<typeof description>) => Promise<Result.Error<{
     readonly code: ActivationError.InvalidLink;
 } & {
     httpStatus: HTTPStatus.NotFound;
@@ -38,4 +38,4 @@ export declare const activate: (payload: {
     readonly result: {
         readonly userId: ObjectId;
     };
-} | undefined>;
+}>;

package/dist/collections/user/activate.js

@@ -47,11 +47,6 @@ const activate = async (payload, context) => {
     }
     if (!user.password) {
         if (!password) {
-            if (context.request.method === 'GET') {
-                return context.response.writeHead(302, {
-                    location: `/user/activation?step=password&u=${userId}&t=${token}`,
-                }).end();
-            }
             return context.error(types_1.HTTPStatus.UnprocessableContent, {
                 code: types_1.ACError.MalformedInput,
             });
@@ -64,20 +59,22 @@ const activate = async (payload, context) => {
                 password: await bcrypt.hash(password, 10),
             },
         });
-        return;
     }
-    await context.collection.model.updateOne({
-        _id: user._id,
-    }, {
-        $set: {
-            active: true,
-        },
-    });
-    if (context.request.method === 'GET') {
-        return context.response.writeHead(302, {
-            location: '/user/activation',
-        }).end();
+    else {
+        await context.collection.model.updateOne({
+            _id: user._id,
+        }, {
+            $set: {
+                active: true,
+            },
+        });
     }
+    // if( context.request.method === 'GET' ) {
+    //   return context.response.writeHead(302, {
+    //     location: '/user/activation',
+    //   }).end()
+    // }
+    //
     return types_1.Result.result({
         userId: user._id,
     });

package/dist/collections/user/activate.mjs

@@ -49,42 +49,26 @@ export const activate = async (payload, context) => {
   }
   if (!user.password) {
     if (!password) {
-      if (context.request.method === "GET") {
-        return context.response.writeHead(302, {
-          location: `/user/activation?step=password&u=${userId}&t=${token}`
-        }).end();
-      }
       return context.error(HTTPStatus.UnprocessableContent, {
         code: ACError.MalformedInput
       });
     }
-    await context.collection.model.updateOne(
-      {
-        _id: user._id
-      },
-      {
-        $set: {
-          active: true,
-          password: await bcrypt.hash(password, 10)
-        }
+    await context.collection.model.updateOne({
+      _id: user._id
+    }, {
+      $set: {
+        active: true,
+        password: await bcrypt.hash(password, 10)
       }
-    );
-    return;
-  }
-  await context.collection.model.updateOne(
-    {
+    });
+  } else {
+    await context.collection.model.updateOne({
       _id: user._id
-    },
-    {
+    }, {
       $set: {
         active: true
       }
-    }
-  );
-  if (context.request.method === "GET") {
-    return context.response.writeHead(302, {
-      location: "/user/activation"
-    }).end();
+    });
   }
   return Result.result({
     userId: user._id

package/dist/collections/user/authenticate.js

@@ -23,6 +23,7 @@ const authenticate = async (props, context) => {
         const { error, result: user } = await context.collections.user.functions.get({
             filters: {
                 _id: decodedToken.sub,
+                active: true,
             },
             populate: ['picture_file'],
         });

package/dist/collections/user/authenticate.mjs

@@ -18,7 +18,8 @@ export const authenticate = async (props, context) => {
     }
     const { error, result: user2 } = await context.collections.user.functions.get({
       filters: {
-        _id: decodedToken.sub
+        _id: decodedToken.sub,
+        active: true
       },
       populate: ["picture_file"]
     });

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

@@ -1,5 +1,5 @@
+import type { description } from './description.js';
 import { HTTPStatus, ACError, type Context, type SchemaWithId, type PackReferences } from '@aeriajs/types';
-import { type description } from './description.js';
 export declare const editProfile: (payload: Partial<PackReferences<SchemaWithId<typeof description>>> & Record<string, unknown>, context: Context<typeof description>) => Promise<import("@aeriajs/types").InsertReturnType<SchemaWithId<{
     readonly $id: "user";
     readonly icon: "users";
@@ -103,14 +103,6 @@ export declare const editProfile: (payload: Partial<PackReferences<SchemaWithId<
         };
     };
 }>> | import("@aeriajs/types").Result.Error<{
-    readonly code: ACError.MalformedInput;
-} & {
-    httpStatus: HTTPStatus.BadRequest;
-}> | import("@aeriajs/types").Result.Error<{
-    readonly code: ACError.AuthorizationError;
-} & {
-    httpStatus: HTTPStatus.Unauthorized;
-}> | import("@aeriajs/types").Result.Error<{
     readonly code: ACError.TargetImmutable;
 } & {
     httpStatus: HTTPStatus.Forbidden;

package/dist/collections/user/editProfile.js

@@ -6,19 +6,9 @@ const core_1 = require("@aeriajs/core");
 const bcrypt = require("bcrypt");
 const editProfile = async (payload, context) => {
     const mutableProperties = context.config.security.mutableUserProperties;
-    if (!context.token.authenticated || !context.token.sub) {
+    if (!context.token.sub) {
         throw new Error;
     }
-    if (!payload._id) {
-        return context.error(types_1.HTTPStatus.BadRequest, {
-            code: types_1.ACError.MalformedInput,
-        });
-    }
-    if (!context.token.sub.equals(payload._id)) {
-        return context.error(types_1.HTTPStatus.Unauthorized, {
-            code: types_1.ACError.AuthorizationError,
-        });
-    }
     const user = await context.collections.user.model.findOne({
         _id: context.token.sub,
     });
@@ -37,8 +27,8 @@ const editProfile = async (payload, context) => {
     }
     return (0, core_1.insert)({
         what: {
-            _id: payload._id,
             ...payload,
+            _id: context.token.sub,
         },
     }, context);
 };

package/dist/collections/user/editProfile.mjs

@@ -4,19 +4,9 @@ import { insert as originalInsert } from "@aeriajs/core";
 import * as bcrypt from "bcrypt";
 export const editProfile = async (payload, context) => {
   const mutableProperties = context.config.security.mutableUserProperties;
-  if (!context.token.authenticated || !context.token.sub) {
+  if (!context.token.sub) {
     throw new Error();
   }
-  if (!payload._id) {
-    return context.error(HTTPStatus.BadRequest, {
-      code: ACError.MalformedInput
-    });
-  }
-  if (!context.token.sub.equals(payload._id)) {
-    return context.error(HTTPStatus.Unauthorized, {
-      code: ACError.AuthorizationError
-    });
-  }
   const user = await context.collections.user.model.findOne({
     _id: context.token.sub
   });
@@ -33,13 +23,10 @@ export const editProfile = async (payload, context) => {
       code: ACError.TargetImmutable
     });
   }
-  return originalInsert(
-    {
-      what: {
-        _id: payload._id,
-        ...payload
-      }
-    },
-    context
-  );
+  return originalInsert({
+    what: {
+      ...payload,
+      _id: context.token.sub
+    }
+  }, context);
 };

package/dist/collections/user/getActivationLink.js

@@ -42,9 +42,11 @@ const getActivationLink = async (payload, context) => {
     const activationToken = await (0, exports.getActivationToken)(payload.userId.toString(), context);
     //const url = `${context.config.webPublicUrl}/user/activation?step=password&u=${payload.userId.toString()}&t=${activationToken}`
     const url = new URL(`${context.config.webPublicUrl}/user/activation`);
-    url.searchParams.set('step', 'password'),
-        url.searchParams.set('u', payload.userId.toString());
+    url.searchParams.set('u', payload.userId.toString());
     url.searchParams.set('t', activationToken);
+    if (!user.password) {
+        url.searchParams.set('step', 'password');
+    }
     if (payload.redirect) {
         url.searchParams.set('next', payload.redirect);
     }

package/dist/collections/user/getActivationLink.mjs

@@ -38,8 +38,11 @@ export const getActivationLink = async (payload, context) => {
   }
   const activationToken = await getActivationToken(payload.userId.toString(), context);
   const url = new URL(`${context.config.webPublicUrl}/user/activation`);
-  url.searchParams.set("step", "password"), url.searchParams.set("u", payload.userId.toString());
+  url.searchParams.set("u", payload.userId.toString());
   url.searchParams.set("t", activationToken);
+  if (!user.password) {
+    url.searchParams.set("step", "password");
+  }
   if (payload.redirect) {
     url.searchParams.set("next", payload.redirect);
   }

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

@@ -449,14 +449,6 @@ export declare const user: Omit<Collection<never>, "functions" | "description" |
                 };
             };
         }>> | import("@aeriajs/types").Result.Error<{
-            readonly code: import("@aeriajs/types").ACError.MalformedInput;
-        } & {
-            httpStatus: import("@aeriajs/types").HTTPStatus.BadRequest;
-        }> | import("@aeriajs/types").Result.Error<{
-            readonly code: import("@aeriajs/types").ACError.AuthorizationError;
-        } & {
-            httpStatus: import("@aeriajs/types").HTTPStatus.Unauthorized;
-        }> | import("@aeriajs/types").Result.Error<{
             readonly code: import("@aeriajs/types").ACError.TargetImmutable;
         } & {
             httpStatus: import("@aeriajs/types").HTTPStatus.Forbidden;
@@ -504,7 +496,7 @@ export declare const user: Omit<Collection<never>, "functions" | "description" |
             password?: string;
             userId?: string;
             token?: string;
-        }, context: Omit<Context, "token">) => Promise<import("@aeriajs/types").GenericResponse | import("@aeriajs/types").Result.Error<{
+        }, context: Omit<Context, "token">) => Promise<import("@aeriajs/types").Result.Error<{
             readonly code: import("./activate.js").ActivationError.InvalidLink;
         } & {
             httpStatus: import("@aeriajs/types").HTTPStatus.NotFound;
@@ -530,7 +522,7 @@ export declare const user: Omit<Collection<never>, "functions" | "description" |
             readonly result: {
                 readonly userId: import("@aeriajs/core").ObjectId;
             };
-        } | undefined>;
+        }>;
         readonly createAccount: (payload: Partial<import("@aeriajs/types").PackReferences<import("@aeriajs/types").SchemaWithId<{
             readonly $id: "user";
             readonly icon: "users";

package/dist/index.d.ts

@@ -913,14 +913,6 @@ export declare const collections: {
                     };
                 };
             }>> | import("@aeriajs/types").Result.Error<{
-                readonly code: import("@aeriajs/types").ACError.MalformedInput;
-            } & {
-                httpStatus: import("@aeriajs/types").HTTPStatus.BadRequest;
-            }> | import("@aeriajs/types").Result.Error<{
-                readonly code: import("@aeriajs/types").ACError.AuthorizationError;
-            } & {
-                httpStatus: import("@aeriajs/types").HTTPStatus.Unauthorized;
-            }> | import("@aeriajs/types").Result.Error<{
                 readonly code: import("@aeriajs/types").ACError.TargetImmutable;
             } & {
                 httpStatus: import("@aeriajs/types").HTTPStatus.Forbidden;
@@ -968,7 +960,7 @@ export declare const collections: {
                 password?: string;
                 userId?: string;
                 token?: string;
-            }, context: Omit<import("@aeriajs/types").Context, "token">) => Promise<import("@aeriajs/types").GenericResponse | import("@aeriajs/types").Result.Error<{
+            }, context: Omit<import("@aeriajs/types").Context, "token">) => Promise<import("@aeriajs/types").Result.Error<{
                 readonly code: import("./collections/user/activate.js").ActivationError.InvalidLink;
             } & {
                 httpStatus: import("@aeriajs/types").HTTPStatus.NotFound;
@@ -994,7 +986,7 @@ export declare const collections: {
                 readonly result: {
                     readonly userId: import("mongodb").ObjectId;
                 };
-            } | undefined>;
+            }>;
             readonly createAccount: (payload: Partial<import("@aeriajs/types").PackReferences<import("@aeriajs/types").SchemaWithId<{
                 readonly $id: "user";
                 readonly icon: "users";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aeriajs/builtins",
-  "version": "0.0.226",
+  "version": "0.0.228",
   "description": "## Installation",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -55,7 +55,7 @@
     "mongodb": "^6.5.0"
   },
   "peerDependencies": {
-    "@aeriajs/core": "^0.0.226",
+    "@aeriajs/core": "^0.0.228",
     "@aeriajs/common": "^0.0.130",
     "@aeriajs/entrypoint": "^0.0.133",
     "@aeriajs/types": "^0.0.112",