Updates

dist/package-shared/functions/api/users/api-create-user.js

@@ -46,7 +46,7 @@ function apiCreateUser(_a) {
             password: String(payload.password),
         });
         payload.password = hashedPassword;
-        const fieldsQuery = `SHOW COLUMNS FROM users`;
+        const fieldsQuery = `SHOW COLUMNS FROM ${dbFullName}.users`;
         let fields = yield (0, varDatabaseDbHandler_1.default)({
             queryString: fieldsQuery,
             database: dbFullName,
@@ -91,7 +91,7 @@ function apiCreateUser(_a) {
                 msg: `${invalidField} is not a valid field!`,
             };
         }
-        const existingUserQuery = `SELECT * FROM users WHERE email = ?${payload.username ? " OR username = ?" : ""}`;
+        const existingUserQuery = `SELECT * FROM ${dbFullName}.users WHERE email = ?${payload.username ? " OR username = ?" : ""}`;
         const existingUserValues = payload.username
             ? [payload.email, payload.username]
             : [payload.email];
@@ -119,7 +119,7 @@ function apiCreateUser(_a) {
             useLocal,
         });
         if (addUser === null || addUser === void 0 ? void 0 : addUser.insertId) {
-            const newlyAddedUserQuery = `SELECT id,first_name,last_name,email,username,phone,image,image_thumbnail,city,state,country,zip_code,address,verification_status,more_user_data FROM users WHERE id='${addUser.insertId}'`;
+            const newlyAddedUserQuery = `SELECT id,first_name,last_name,email,username,phone,image,image_thumbnail,city,state,country,zip_code,address,verification_status,more_user_data FROM ${dbFullName}.users WHERE id='${addUser.insertId}'`;
             const newlyAddedUser = yield (0, varDatabaseDbHandler_1.default)({
                 queryString: newlyAddedUserQuery,
                 database: dbFullName,

dist/package-shared/functions/api/users/api-delete-user.js

@@ -20,7 +20,7 @@ const varDatabaseDbHandler_1 = __importDefault(require("../../backend/varDatabas
  */
 function apiDeleteUser(_a) {
     return __awaiter(this, arguments, void 0, function* ({ dbFullName, deletedUserId, useLocal, }) {
-        const existingUserQuery = `SELECT * FROM users WHERE id = ?`;
+        const existingUserQuery = `SELECT * FROM ${dbFullName}.users WHERE id = ?`;
         const existingUserValues = [deletedUserId];
         const existingUser = yield (0, varDatabaseDbHandler_1.default)({
             queryString: existingUserQuery,

dist/package-shared/functions/api/users/api-get-user.js

@@ -19,12 +19,13 @@ const varDatabaseDbHandler_1 = __importDefault(require("../../backend/varDatabas
  */
 function apiGetUser(_a) {
     return __awaiter(this, arguments, void 0, function* ({ fields, dbFullName, userId, useLocal, }) {
-        const query = `SELECT ${fields.join(",")} FROM users WHERE id=?`;
+        const finalDbName = dbFullName.replace(/[^a-z0-9_]/g, "");
+        const query = `SELECT ${fields.join(",")} FROM ${finalDbName}.users WHERE id=?`;
         const API_USER_ID = userId || process.env.DSQL_API_USER_ID;
         let foundUser = yield (0, varDatabaseDbHandler_1.default)({
             queryString: query,
             queryValuesArray: [API_USER_ID],
-            database: dbFullName.replace(/[^a-z0-9_]/g, ""),
+            database: finalDbName,
             useLocal,
         });
         if (!foundUser || !foundUser[0]) {

dist/package-shared/functions/api/users/api-login.js

@@ -20,7 +20,7 @@ const hashPassword_1 = __importDefault(require("../../dsql/hashPassword"));
  */
 function apiLoginUser(_a) {
     return __awaiter(this, arguments, void 0, function* ({ encryptionKey, email, username, password, database, additionalFields, email_login, email_login_code, email_login_field, token, skipPassword, social, useLocal, }) {
-        const dbFullName = database;
+        const dbFullName = database.replace(/[^a-z0-9_]/g, "");
         /**
          * Check input validity
          *
@@ -46,9 +46,9 @@ function apiLoginUser(_a) {
             })
             : null;
         let foundUser = yield (0, varDatabaseDbHandler_1.default)({
-            queryString: `SELECT * FROM users WHERE email = ? OR username = ?`,
+            queryString: `SELECT * FROM ${dbFullName}.users WHERE email = ? OR username = ?`,
             queryValuesArray: [email, username],
-            database: dbFullName.replace(/[^a-z0-9_]/g, ""),
+            database: dbFullName,
             useLocal,
         });
         if ((!foundUser || !foundUser[0]) && !social)
@@ -91,9 +91,9 @@ function apiLoginUser(_a) {
         }
         if (isPasswordCorrect && email_login) {
             const resetTempCode = yield (0, varDatabaseDbHandler_1.default)({
-                queryString: `UPDATE users SET ${email_login_field} = '' WHERE email = ? OR username = ?`,
+                queryString: `UPDATE ${dbFullName}.users SET ${email_login_field} = '' WHERE email = ? OR username = ?`,
                 queryValuesArray: [email, username],
-                database: dbFullName.replace(/[^a-z0-9_]/g, ""),
+                database: dbFullName,
                 useLocal,
             });
         }

dist/package-shared/functions/api/users/api-reauth-user.js

@@ -21,7 +21,7 @@ function apiReauthUser(_a) {
     return __awaiter(this, arguments, void 0, function* ({ existingUser, database, additionalFields, useLocal, }) {
         let foundUser = (existingUser === null || existingUser === void 0 ? void 0 : existingUser.id) && existingUser.id.toString().match(/./)
             ? yield (0, varDatabaseDbHandler_1.default)({
-                queryString: `SELECT * FROM users WHERE id=?`,
+                queryString: `SELECT * FROM ${database}.users WHERE id=?`,
                 queryValuesArray: [existingUser.id.toString()],
                 database,
                 useLocal,

dist/package-shared/functions/api/users/api-send-email-code.js

@@ -30,7 +30,7 @@ function apiSendEmailCode(_a) {
             };
         }
         const createdAt = Date.now();
-        const foundUserQuery = `SELECT * FROM users WHERE email = ?`;
+        const foundUserQuery = `SELECT * FROM ${database}.users WHERE email = ?`;
         const foundUserValues = [email];
         let foundUser = yield (0, varDatabaseDbHandler_1.default)({
             queryString: foundUserQuery,
@@ -79,12 +79,12 @@ function apiSendEmailCode(_a) {
             const info = yield transporter.sendMail(mailObject);
             if (!(info === null || info === void 0 ? void 0 : info.accepted))
                 throw new Error("Mail not Sent!");
-            const setTempCodeQuery = `UPDATE users SET ${email_login_field} = ? WHERE email = ?`;
+            const setTempCodeQuery = `UPDATE ${database}.users SET ${email_login_field} = ? WHERE email = ?`;
             const setTempCodeValues = [tempCode + `-${createdAt}`, email];
             let setTempCode = yield (0, varDatabaseDbHandler_1.default)({
                 queryString: setTempCodeQuery,
                 queryValuesArray: setTempCodeValues,
-                database: database,
+                database,
                 useLocal,
             });
             /** @type {import("../../../types").SendOneTimeCodeEmailResponse} */

dist/package-shared/functions/api/users/api-update-user.js

@@ -23,7 +23,7 @@ const varDatabaseDbHandler_1 = __importDefault(require("../../backend/varDatabas
  */
 function apiUpdateUser(_a) {
     return __awaiter(this, arguments, void 0, function* ({ payload, dbFullName, updatedUserId, useLocal, dbSchema, }) {
-        const existingUserQuery = `SELECT * FROM users WHERE id = ?`;
+        const existingUserQuery = `SELECT * FROM ${dbFullName}.users WHERE id = ?`;
         const existingUserValues = [updatedUserId];
         const existingUser = yield (0, varDatabaseDbHandler_1.default)({
             queryString: existingUserQuery,