@joystick.js/node-canary 0.0.0-canary.65 → 0.0.0-canary.67

package/_package.json

@@ -39,6 +39,7 @@
     "node-html-parser": "^5.1.0",
     "nodemailer": "^6.7.0",
     "pg": "^8.7.3",
+    "pg-escape": "^0.2.0",
     "process": "^0.11.10",
     "query-string": "^7.0.1",
     "sanitize-html": "^2.7.3",

package/dist/app/accounts/createMetadataTableColumns.js

@@ -0,0 +1,12 @@
+import escape from "pg-escape";
+var createMetadataTableColumns_default = async (usersDatabase = "", sqlizedMetadata = {}) => {
+  if (usersDatabase === "postgresql") {
+    const columns = Object.keys(sqlizedMetadata);
+    for (let i = 0; i < columns?.length; i += 1) {
+      await process.databases.postgresql.query(escape(`ALTER TABLE users ADD COLUMN IF NOT EXISTS %I TEXT;`, columns[i]));
+    }
+  }
+};
+export {
+  createMetadataTableColumns_default as default
+};

package/dist/app/accounts/signup.js

@@ -6,6 +6,9 @@ import { isObject } from "../../validation/lib/typeValidators";
 import getOutput from "../getOutput";
 import typesMap from "../databases/typesMap";
 import getTargetDatabaseProvider from "../databases/getTargetDatabaseProvider.js";
+import stringToSnakeCase from "../databases/stringToSnakeCase.js";
+import createMetadataTableColumns from "./createMetadataTableColumns.js";
+import roles from "./roles/index.js";
 const addSessionToUser = (userId = null, session = null) => {
   try {
     return runUserQuery("addSession", { userId, session });
@@ -27,6 +30,16 @@ const insertUserInDatabase = async (user = {}) => {
     throw new Error(formatErrorString("signup.insertUserInDatabase", exception));
   }
 };
+const sqlizeMetadata = (metadata = {}) => {
+  try {
+    return Object.entries(metadata).reduce((sqlized = {}, [key, value]) => {
+      sqlized[stringToSnakeCase(key)] = value;
+      return sqlized;
+    }, {});
+  } catch (exception) {
+    throw new Error(`[actionName.sqlizeMetadata] ${exception.message}`);
+  }
+};
 const getUserToCreate = async (options = {}) => {
   try {
     const usersDatabase = getTargetDatabaseProvider("users");
@@ -40,12 +53,19 @@ const getUserToCreate = async (options = {}) => {
     if (options?.username) {
       user.username = options?.username;
     }
-    if (options?.metadata && isObject(options.metadata) && usersDatabaseType === "sql" && options?.metadata?.language) {
-      user.language = options?.metadata?.language;
+    if (options?.metadata && isObject(options.metadata) && usersDatabaseType === "sql") {
+      const sqlizedMetadata = sqlizeMetadata(options.metadata);
+      await createMetadataTableColumns(usersDatabase, sqlizedMetadata);
+      const { roles: [], ...restOfMetadata } = options?.metadata;
+      user = {
+        ...sqlizeMetadata(restOfMetadata),
+        ...user
+      };
     }
     if (options?.metadata && isObject(options.metadata) && usersDatabaseType === "nosql") {
+      const { roles: [], ...restOfMetadata } = options?.metadata;
       user = {
-        ...options.metadata,
+        ...restOfMetadata || {},
         ...user
       };
     }
@@ -78,7 +98,13 @@ const signup = async (options, { resolve, reject }) => {
     const user = await getUserByUserId(userId);
     const session = generateSession();
     if (user?._id || user?.user_id) {
-      await addSessionToUser(user._id || user?.user_id, session);
+      await addSessionToUser(user?._id || user?.user_id, session);
+    }
+    if (options?.metadata?.roles?.length > 0 && process.env.NODE_ENV === "test") {
+      for (let i = 0; i < options?.metadata?.roles?.length; i += 1) {
+        const role = options?.metadata?.roles[i];
+        roles.grant(user?._id || user?.user_id, role);
+      }
     }
     return resolve({
       ...session,

package/dist/app/databases/stringToSnakeCase.js

@@ -0,0 +1,6 @@
+var stringToSnakeCase_default = (string = "") => {
+  return string?.split(/\.?(?=[A-Z])/).join("_").toLowerCase();
+};
+export {
+  stringToSnakeCase_default as default
+};

package/dist/app/index.js

@@ -462,11 +462,20 @@ class App {
           metadata: req?.body?.metadata,
           output: req?.body?.output || defaultUserOutputFields
         });
-        accounts._setAuthenticationCookie(res, {
-          token: signup?.token,
-          tokenExpiresAt: signup?.tokenExpiresAt
-        });
-        res.status(200).send(JSON.stringify(signup?.user || {}));
+        if (!process.env.NODE_ENV !== "test") {
+          accounts._setAuthenticationCookie(res, {
+            token: signup?.token,
+            tokenExpiresAt: signup?.tokenExpiresAt
+          });
+        }
+        const response = {
+          ...signup?.user || {}
+        };
+        if (process.env.NODE_ENV === "test") {
+          response.joystickToken = signup?.token;
+          response.joystickLoginTokenExpiresAt = signup?.tokenExpiresAt;
+        }
+        res.status(200).send(JSON.stringify(response));
       } catch (exception) {
         console.log(exception);
         return res.status(500).send(JSON.stringify({
@@ -482,11 +491,20 @@ class App {
           password: req?.body?.password,
           output: req?.body?.output || defaultUserOutputFields
         });
-        accounts._setAuthenticationCookie(res, {
-          token: login?.token,
-          tokenExpiresAt: login?.tokenExpiresAt
-        });
-        res.status(200).send(JSON.stringify(login?.user || {}));
+        if (!process.env.NODE_ENV !== "test") {
+          accounts._setAuthenticationCookie(res, {
+            token: login?.token,
+            tokenExpiresAt: login?.tokenExpiresAt
+          });
+        }
+        const response = {
+          ...login?.user || {}
+        };
+        if (process.env.NODE_ENV === "test") {
+          response.joystickToken = login?.token;
+          response.joystickLoginTokenExpiresAt = login?.tokenExpiresAt;
+        }
+        res.status(200).send(JSON.stringify(response));
       } catch (exception) {
         console.log(exception);
         return res.status(500).send(JSON.stringify({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@joystick.js/node-canary",
-  "version": "0.0.0-canary.65",
+  "version": "0.0.0-canary.67",
   "type": "module",
   "description": "A Node.js framework for building web apps.",
   "main": "./dist/index.js",