Updates
This commit is contained in:
parent
8a8257d17e
commit
7bd4b2fe65
24
client/auth/google/getAccessToken.d.ts
vendored
24
client/auth/google/getAccessToken.d.ts
vendored
@ -1,7 +1,19 @@
|
|||||||
declare function _exports({ clientId, element, triggerPrompt, readyStateDispatch, }: {
|
declare namespace _exports {
|
||||||
clientId: string;
|
export { GoogleGetAccessTokenFunctionParams };
|
||||||
element: HTMLElement;
|
}
|
||||||
triggerPrompt: boolean;
|
declare function _exports(params: GoogleGetAccessTokenFunctionParams): Promise<boolean>;
|
||||||
readyStateDispatch?: () => void;
|
|
||||||
}): Promise<boolean>;
|
|
||||||
export = _exports;
|
export = _exports;
|
||||||
|
type GoogleGetAccessTokenFunctionParams = {
|
||||||
|
/**
|
||||||
|
* - Google app client ID: {@link https://datasquirel.com/docs}
|
||||||
|
*/
|
||||||
|
clientId: string;
|
||||||
|
/**
|
||||||
|
* - Whether to trigger Google signing popup or not: {@link https://datasquirel.com/docs}
|
||||||
|
*/
|
||||||
|
triggerPrompt?: boolean;
|
||||||
|
/**
|
||||||
|
* - React setState Function: sets whether the google login button is ready or not
|
||||||
|
*/
|
||||||
|
setLoading?: React.Dispatch<React.SetStateAction<boolean>>;
|
||||||
|
};
|
||||||
|
@ -1,9 +1,15 @@
|
|||||||
//////////////////////////////////////////////////////////////////////////////////
|
// @ts-check
|
||||||
//////////////////////////////////////////////////////////////////////////////////
|
|
||||||
//////////////////////////////////////////////////////////////////////////////////
|
/**
|
||||||
//////////////////////////////////////////////////////////////////////////////////
|
* @typedef {object} GoogleGetAccessTokenFunctionParams
|
||||||
//////////////////////////////////////////////////////////////////////////////////
|
* @property {string} clientId - Google app client ID: {@link https://datasquirel.com/docs}
|
||||||
//////////////////////////////////////////////////////////////////////////////////
|
* @property {boolean} [triggerPrompt] - Whether to trigger Google signing popup or not: {@link https://datasquirel.com/docs}
|
||||||
|
* @property {React.Dispatch<React.SetStateAction<boolean>>} [setLoading] - React setState Function: sets whether the google login button is ready or not
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
/** @type {any} */
|
||||||
|
let interval;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Login with Google Function
|
* Login with Google Function
|
||||||
@ -12,89 +18,73 @@
|
|||||||
*
|
*
|
||||||
* @async
|
* @async
|
||||||
*
|
*
|
||||||
* @param {object} params - Single object passed
|
* @requires script "https://accounts.google.com/gsi/client" async script added to head
|
||||||
* @param {string} params.clientId - Google app client ID: {@link https://datasquirel.com/docs}
|
|
||||||
* @param {HTMLElement} params.element - HTML Element to display google login button
|
|
||||||
* @param {boolean} params.triggerPrompt - Whether to trigger Google signing popup or not: {@link https://datasquirel.com/docs}
|
|
||||||
* @param {function(): void} [params.readyStateDispatch] - React setState Function: sets whether the google login button is ready or not
|
|
||||||
*
|
*
|
||||||
|
* @param {GoogleGetAccessTokenFunctionParams} params - Single object passed
|
||||||
|
|
||||||
* @returns {Promise<boolean>} - Return
|
* @returns {Promise<boolean>} - Return
|
||||||
*/
|
*/
|
||||||
module.exports = async function getAccessToken({
|
module.exports = async function getAccessToken(params) {
|
||||||
clientId,
|
/** @type {any} */
|
||||||
element,
|
|
||||||
triggerPrompt,
|
|
||||||
readyStateDispatch,
|
|
||||||
}) {
|
|
||||||
/**
|
|
||||||
* == Initialize
|
|
||||||
*
|
|
||||||
* @description Initialize
|
|
||||||
*/
|
|
||||||
const googleScript = document.createElement("script");
|
|
||||||
googleScript.src = "https://accounts.google.com/gsi/client";
|
|
||||||
googleScript.className = "social-script-tag";
|
|
||||||
|
|
||||||
document.body.appendChild(googleScript);
|
params.setLoading?.(true);
|
||||||
|
|
||||||
const response = await new Promise((resolve, reject) => {
|
const response = await new Promise((resolve, reject) => {
|
||||||
googleScript.onload = function (e) {
|
interval = setInterval(() => {
|
||||||
|
// @ts-ignore
|
||||||
|
let google = window.google;
|
||||||
|
|
||||||
if (google) {
|
if (google) {
|
||||||
if (readyStateDispatch) readyStateDispatch(true);
|
window.clearInterval(interval);
|
||||||
|
resolve(googleLogin({ ...params, google }));
|
||||||
////////////////////////////////////////
|
|
||||||
////////////////////////////////////////
|
|
||||||
////////////////////////////////////////
|
|
||||||
|
|
||||||
if (element) {
|
|
||||||
/**
|
|
||||||
* Handle google credentials response
|
|
||||||
* ========================================================
|
|
||||||
* @param {object} response - Google response with credentials
|
|
||||||
* @param {string} response.credential - Google access token
|
|
||||||
*/
|
|
||||||
function handleCredentialResponse(response) {
|
|
||||||
resolve(response.credential);
|
|
||||||
}
|
}
|
||||||
|
}, 500);
|
||||||
google.accounts.id.initialize({
|
|
||||||
client_id: clientId,
|
|
||||||
callback: handleCredentialResponse,
|
|
||||||
});
|
});
|
||||||
|
|
||||||
google.accounts.id.renderButton(element, {
|
params.setLoading?.(false);
|
||||||
theme: "outline",
|
|
||||||
size: "large",
|
|
||||||
logo_alignment: "center",
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
////////////////////////////////////////
|
|
||||||
////////////////////////////////////////
|
|
||||||
////////////////////////////////////////
|
|
||||||
|
|
||||||
if (triggerPrompt) {
|
|
||||||
google.accounts.id.prompt(
|
|
||||||
/**
|
|
||||||
* Google prompt notification callback
|
|
||||||
* ========================================================
|
|
||||||
* @param {import("../../../types/user.td").GoogleIdentityPromptNotification} notification - Notification object
|
|
||||||
*/
|
|
||||||
(notification) => {
|
|
||||||
notification.isDisplayed();
|
|
||||||
}
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
|
||||||
});
|
|
||||||
|
|
||||||
//////////////////////////////////////////////////////////////////////////////////
|
|
||||||
//////////////////////////////////////////////////////////////////////////////////
|
|
||||||
//////////////////////////////////////////////////////////////////////////////////
|
|
||||||
//////////////////////////////////////////////////////////////////////////////////
|
|
||||||
//////////////////////////////////////////////////////////////////////////////////
|
|
||||||
//////////////////////////////////////////////////////////////////////////////////
|
|
||||||
|
|
||||||
return response;
|
return response;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* # Google Login Function
|
||||||
|
*
|
||||||
|
* @param {GoogleGetAccessTokenFunctionParams & { google: any }} params
|
||||||
|
* @returns
|
||||||
|
*/
|
||||||
|
function googleLogin({ google, clientId, setLoading, triggerPrompt }) {
|
||||||
|
setTimeout(() => {
|
||||||
|
setLoading?.(false);
|
||||||
|
}, 3000);
|
||||||
|
|
||||||
|
return new Promise((resolve, reject) => {
|
||||||
|
/**
|
||||||
|
* # Callback Function
|
||||||
|
* @param {import("../../../package-shared/types").GoogleAccessTokenObject} response
|
||||||
|
*/
|
||||||
|
function handleCredentialResponse(response) {
|
||||||
|
resolve(response.access_token);
|
||||||
|
}
|
||||||
|
|
||||||
|
const googleAuth = google.accounts.oauth2.initTokenClient({
|
||||||
|
client_id: clientId,
|
||||||
|
scope: "email profile",
|
||||||
|
callback: handleCredentialResponse,
|
||||||
|
});
|
||||||
|
|
||||||
|
googleAuth.requestAccessToken();
|
||||||
|
|
||||||
|
if (triggerPrompt) {
|
||||||
|
google.accounts.id.prompt(triggerGooglePromptCallback);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Google prompt notification callback
|
||||||
|
* ========================================================
|
||||||
|
* @param {import("../../../package-shared/types").GoogleIdentityPromptNotification} notification
|
||||||
|
*/
|
||||||
|
function triggerGooglePromptCallback(notification) {
|
||||||
|
console.log(notification);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
@ -120,7 +120,6 @@ async function run() {
|
|||||||
` - ${colors.FgBlue}Info:${colors.Reset} Now generating and mapping databases ...`
|
` - ${colors.FgBlue}Info:${colors.Reset} Now generating and mapping databases ...`
|
||||||
);
|
);
|
||||||
|
|
||||||
// deepcode ignore reDOS: <please specify a reason of ignoring this>
|
|
||||||
await createDbFromSchema({
|
await createDbFromSchema({
|
||||||
dbSchemaData: schemaData,
|
dbSchemaData: schemaData,
|
||||||
});
|
});
|
||||||
|
5
index.d.ts
vendored
5
index.d.ts
vendored
@ -7,6 +7,7 @@ export namespace media {
|
|||||||
}
|
}
|
||||||
export namespace user {
|
export namespace user {
|
||||||
export { createUser };
|
export { createUser };
|
||||||
|
export let deleteUser: typeof import("./users/delete-user");
|
||||||
export { loginUser };
|
export { loginUser };
|
||||||
export { sendEmailCode };
|
export { sendEmailCode };
|
||||||
export { logoutUser };
|
export { logoutUser };
|
||||||
@ -61,9 +62,9 @@ export declare namespace utils {
|
|||||||
encryptionKey?: string;
|
encryptionKey?: string;
|
||||||
encryptionSalt?: string;
|
encryptionSalt?: string;
|
||||||
}) => string;
|
}) => string;
|
||||||
let hashPassword: ({ password, encryptionKey }: {
|
let hash: ({ password, encryptionKey }: {
|
||||||
password: string;
|
password: string;
|
||||||
encryptionKey: string;
|
encryptionKey?: string;
|
||||||
}) => string;
|
}) => string;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
3
index.js
3
index.js
@ -42,6 +42,7 @@ const trimSql = require("./package-shared/utils/trim-sql");
|
|||||||
*/
|
*/
|
||||||
const user = {
|
const user = {
|
||||||
createUser: createUser,
|
createUser: createUser,
|
||||||
|
deleteUser: require("./users/delete-user"),
|
||||||
loginUser: loginUser,
|
loginUser: loginUser,
|
||||||
sendEmailCode: sendEmailCode,
|
sendEmailCode: sendEmailCode,
|
||||||
logoutUser: logoutUser,
|
logoutUser: logoutUser,
|
||||||
@ -92,7 +93,7 @@ const datasquirel = {
|
|||||||
crypto: {
|
crypto: {
|
||||||
encrypt: require("./package-shared/functions/dsql/encrypt"),
|
encrypt: require("./package-shared/functions/dsql/encrypt"),
|
||||||
decrypt: require("./package-shared/functions/dsql/decrypt"),
|
decrypt: require("./package-shared/functions/dsql/decrypt"),
|
||||||
hashPassword: require("./package-shared/functions/dsql/hashPassword"),
|
hash: require("./package-shared/functions/dsql/hashPassword"),
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
@ -17,5 +17,6 @@
|
|||||||
"onUpdate": "CURRENT_TIMESTAMP",
|
"onUpdate": "CURRENT_TIMESTAMP",
|
||||||
"onUpdateLiteral": "CURRENT_TIMESTAMP",
|
"onUpdateLiteral": "CURRENT_TIMESTAMP",
|
||||||
"onDelete": "CURRENT_TIMESTAMP",
|
"onDelete": "CURRENT_TIMESTAMP",
|
||||||
"onDeleteLiteral": "CURRENT_TIMESTAMP"
|
"onDeleteLiteral": "CURRENT_TIMESTAMP",
|
||||||
|
"encrypted": false
|
||||||
}
|
}
|
||||||
|
@ -33,8 +33,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldName": "password",
|
"fieldName": "password",
|
||||||
"dataType": "VARCHAR(250)",
|
"dataType": "TEXT"
|
||||||
"notNullValue": true
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldName": "image",
|
"fieldName": "image",
|
||||||
|
@ -27,10 +27,9 @@ module.exports = async function apiGet({
|
|||||||
}) {
|
}) {
|
||||||
if (
|
if (
|
||||||
typeof query == "string" &&
|
typeof query == "string" &&
|
||||||
(query.match(/^alter|^delete|information_schema|databases|^create/i) ||
|
query.match(/^alter|^delete|information_schema|databases|^create/i)
|
||||||
!query.match(/^select/i))
|
|
||||||
) {
|
) {
|
||||||
return { success: false, msg: "Wrong Input" };
|
return { success: false, msg: "Wrong Input." };
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -8,8 +8,8 @@
|
|||||||
|
|
||||||
const DB_HANDLER = require("../../../utils/backend/global-db/DB_HANDLER");
|
const DB_HANDLER = require("../../../utils/backend/global-db/DB_HANDLER");
|
||||||
const handleNodemailer = require("../../backend/handleNodemailer");
|
const handleNodemailer = require("../../backend/handleNodemailer");
|
||||||
const { hashPassword } = require("../../backend/passwordHash");
|
|
||||||
const serverError = require("../../backend/serverError");
|
const serverError = require("../../backend/serverError");
|
||||||
|
const hashPassword = require("../../dsql/hashPassword");
|
||||||
|
|
||||||
//////////////////////////////////////////////////////////////////////////////////
|
//////////////////////////////////////////////////////////////////////////////////
|
||||||
//////////////////////////////////////////////////////////////////////////////////
|
//////////////////////////////////////////////////////////////////////////////////
|
||||||
@ -44,7 +44,9 @@ module.exports = async function facebookLogin({ usertype, body }) {
|
|||||||
////////////////////////////////////////////////
|
////////////////////////////////////////////////
|
||||||
////////////////////////////////////////////////
|
////////////////////////////////////////////////
|
||||||
|
|
||||||
let socialHashedPassword = hashPassword(body.facebookUserId);
|
let socialHashedPassword = hashPassword({
|
||||||
|
password: body.facebookUserId,
|
||||||
|
});
|
||||||
|
|
||||||
let newUser = await DB_HANDLER(`INSERT INTO ${usertype} (
|
let newUser = await DB_HANDLER(`INSERT INTO ${usertype} (
|
||||||
first_name,
|
first_name,
|
||||||
|
@ -13,10 +13,10 @@ const fs = require("fs");
|
|||||||
|
|
||||||
const { OAuth2Client } = require("google-auth-library");
|
const { OAuth2Client } = require("google-auth-library");
|
||||||
|
|
||||||
const { hashPassword } = require("../../backend/passwordHash");
|
|
||||||
const serverError = require("../../backend/serverError");
|
const serverError = require("../../backend/serverError");
|
||||||
const { ServerResponse } = require("http");
|
const { ServerResponse } = require("http");
|
||||||
const DB_HANDLER = require("../../../utils/backend/global-db/DB_HANDLER");
|
const DB_HANDLER = require("../../../utils/backend/global-db/DB_HANDLER");
|
||||||
|
const hashPassword = require("../../dsql/hashPassword");
|
||||||
|
|
||||||
//////////////////////////////////////////////////////////////////////////////////
|
//////////////////////////////////////////////////////////////////////////////////
|
||||||
//////////////////////////////////////////////////////////////////////////////////
|
//////////////////////////////////////////////////////////////////////////////////
|
||||||
@ -81,7 +81,9 @@ module.exports = async function googleLogin({
|
|||||||
////// If request specified a G Suite domain:
|
////// If request specified a G Suite domain:
|
||||||
////// const domain = payload['hd'];
|
////// const domain = payload['hd'];
|
||||||
|
|
||||||
let socialHashedPassword = hashPassword(payload.at_hash || "");
|
let socialHashedPassword = hashPassword({
|
||||||
|
password: payload.at_hash || "",
|
||||||
|
});
|
||||||
|
|
||||||
////////////////////////////////////////////////
|
////////////////////////////////////////////////
|
||||||
////////////////////////////////////////////////
|
////////////////////////////////////////////////
|
||||||
|
@ -1,19 +1,2 @@
|
|||||||
declare namespace _exports {
|
|
||||||
export { FunctionReturn };
|
|
||||||
}
|
|
||||||
declare const _exports: import("../../../types").HandleSocialDbFunction;
|
declare const _exports: import("../../../types").HandleSocialDbFunction;
|
||||||
export = _exports;
|
export = _exports;
|
||||||
type FunctionReturn = {
|
|
||||||
/**
|
|
||||||
* - Did the operation complete successfully or not?
|
|
||||||
*/
|
|
||||||
success: boolean;
|
|
||||||
/**
|
|
||||||
* - User payload object: or "null"
|
|
||||||
*/
|
|
||||||
user: {
|
|
||||||
id: number;
|
|
||||||
first_name: string;
|
|
||||||
last_name: string;
|
|
||||||
} | null;
|
|
||||||
};
|
|
||||||
|
@ -1,43 +1,13 @@
|
|||||||
// @ts-check
|
// @ts-check
|
||||||
|
|
||||||
/**
|
|
||||||
* ==============================================================================
|
|
||||||
* Imports
|
|
||||||
* ==============================================================================
|
|
||||||
*/
|
|
||||||
const fs = require("fs");
|
const fs = require("fs");
|
||||||
|
|
||||||
////////////////////////////////////////////////
|
|
||||||
////////////////////////////////////////////////
|
|
||||||
////////////////////////////////////////////////
|
|
||||||
|
|
||||||
const addAdminUserOnLogin = require("../../backend/addAdminUserOnLogin");
|
|
||||||
const handleNodemailer = require("../../backend/handleNodemailer");
|
const handleNodemailer = require("../../backend/handleNodemailer");
|
||||||
const { ServerResponse } = require("http");
|
|
||||||
const path = require("path");
|
const path = require("path");
|
||||||
const addMariadbUser = require("../../backend/addMariadbUser");
|
const addMariadbUser = require("../../backend/addMariadbUser");
|
||||||
const varDatabaseDbHandler = require("../../backend/varDatabaseDbHandler");
|
const varDatabaseDbHandler = require("../../backend/varDatabaseDbHandler");
|
||||||
const encrypt = require("../../dsql/encrypt");
|
const encrypt = require("../../dsql/encrypt");
|
||||||
const addDbEntry = require("../../backend/db/addDbEntry");
|
const addDbEntry = require("../../backend/db/addDbEntry");
|
||||||
const getAuthCookieNames = require("../../backend/cookies/get-auth-cookie-names");
|
const loginSocialUser = require("./loginSocialUser");
|
||||||
const LOCAL_DB_HANDLER = require("../../../utils/backend/global-db/LOCAL_DB_HANDLER");
|
|
||||||
|
|
||||||
//////////////////////////////////////////////////////////////////////////////////
|
|
||||||
//////////////////////////////////////////////////////////////////////////////////
|
|
||||||
//////////////////////////////////////////////////////////////////////////////////
|
|
||||||
//////////////////////////////////////////////////////////////////////////////////
|
|
||||||
//////////////////////////////////////////////////////////////////////////////////
|
|
||||||
//////////////////////////////////////////////////////////////////////////////////
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @typedef {object} FunctionReturn
|
|
||||||
* @property {boolean} success - Did the operation complete successfully or not?
|
|
||||||
* @property {{
|
|
||||||
* id: number,
|
|
||||||
* first_name: string,
|
|
||||||
* last_name: string,
|
|
||||||
* }|null} user - User payload object: or "null"
|
|
||||||
*/
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @type {import("../../../types").HandleSocialDbFunction}
|
* @type {import("../../../types").HandleSocialDbFunction}
|
||||||
@ -48,43 +18,29 @@ module.exports = async function handleSocialDb({
|
|||||||
email,
|
email,
|
||||||
social_platform,
|
social_platform,
|
||||||
payload,
|
payload,
|
||||||
res,
|
|
||||||
invitation,
|
invitation,
|
||||||
supEmail,
|
supEmail,
|
||||||
additionalFields,
|
additionalFields,
|
||||||
useLocal,
|
useLocal,
|
||||||
}) {
|
}) {
|
||||||
////////////////////////////////////////////////
|
|
||||||
////////////////////////////////////////////////
|
|
||||||
////////////////////////////////////////////////
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
////////////////////////////////////////////////
|
|
||||||
////////////////////////////////////////////////
|
|
||||||
////////////////////////////////////////////////
|
|
||||||
|
|
||||||
const existingSocialIdUserQuery = `SELECT * FROM users WHERE social_id = ? AND social_login='1' AND social_platform = ? `;
|
const existingSocialIdUserQuery = `SELECT * FROM users WHERE social_id = ? AND social_login='1' AND social_platform = ? `;
|
||||||
const existingSocialIdUserValues = [
|
const existingSocialIdUserValues = [
|
||||||
social_id.toString(),
|
social_id.toString(),
|
||||||
social_platform,
|
social_platform,
|
||||||
];
|
];
|
||||||
|
|
||||||
let existingSocialIdUser = useLocal
|
let existingSocialIdUser = await varDatabaseDbHandler({
|
||||||
? await LOCAL_DB_HANDLER(
|
|
||||||
existingSocialIdUserQuery,
|
|
||||||
existingSocialIdUserValues
|
|
||||||
)
|
|
||||||
: await varDatabaseDbHandler({
|
|
||||||
database: database ? database : "datasquirel",
|
database: database ? database : "datasquirel",
|
||||||
queryString: existingSocialIdUserQuery,
|
queryString: existingSocialIdUserQuery,
|
||||||
queryValuesArray: existingSocialIdUserValues,
|
queryValuesArray: existingSocialIdUserValues,
|
||||||
|
useLocal,
|
||||||
});
|
});
|
||||||
|
|
||||||
if (existingSocialIdUser && existingSocialIdUser[0]) {
|
if (existingSocialIdUser && existingSocialIdUser[0]) {
|
||||||
return await loginSocialUser({
|
return await loginSocialUser({
|
||||||
user: existingSocialIdUser[0],
|
user: existingSocialIdUser[0],
|
||||||
social_platform,
|
social_platform,
|
||||||
res,
|
|
||||||
invitation,
|
invitation,
|
||||||
database,
|
database,
|
||||||
additionalFields,
|
additionalFields,
|
||||||
@ -92,63 +48,46 @@ module.exports = async function handleSocialDb({
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
////////////////////////////////////////////////
|
|
||||||
////////////////////////////////////////////////
|
|
||||||
////////////////////////////////////////////////
|
|
||||||
|
|
||||||
const finalEmail = email ? email : supEmail ? supEmail : null;
|
const finalEmail = email ? email : supEmail ? supEmail : null;
|
||||||
|
|
||||||
if (!finalEmail) {
|
if (!finalEmail) {
|
||||||
return {
|
return {
|
||||||
success: false,
|
success: false,
|
||||||
user: null,
|
payload: null,
|
||||||
msg: "No Email Present",
|
msg: "No Email Present",
|
||||||
social_id,
|
|
||||||
social_platform,
|
|
||||||
payload,
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
////////////////////////////////////////////////
|
|
||||||
////////////////////////////////////////////////
|
|
||||||
////////////////////////////////////////////////
|
|
||||||
|
|
||||||
const existingEmailOnlyQuery = `SELECT * FROM users WHERE email='${finalEmail}'`;
|
const existingEmailOnlyQuery = `SELECT * FROM users WHERE email='${finalEmail}'`;
|
||||||
|
|
||||||
let existingEmailOnly = useLocal
|
let existingEmailOnly = await varDatabaseDbHandler({
|
||||||
? await LOCAL_DB_HANDLER(existingEmailOnlyQuery)
|
|
||||||
: await varDatabaseDbHandler({
|
|
||||||
database: database ? database : "datasquirel",
|
database: database ? database : "datasquirel",
|
||||||
queryString: existingEmailOnlyQuery,
|
queryString: existingEmailOnlyQuery,
|
||||||
|
useLocal,
|
||||||
});
|
});
|
||||||
|
|
||||||
if (existingEmailOnly && existingEmailOnly[0]) {
|
if (existingEmailOnly && existingEmailOnly[0]) {
|
||||||
return {
|
return {
|
||||||
success: false,
|
success: false,
|
||||||
user: null,
|
payload: null,
|
||||||
msg: "This Email is already taken",
|
msg: "This Email is already taken",
|
||||||
alert: true,
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
////////////////////////////////////////////////
|
const foundUserQuery = `SELECT * FROM users WHERE email=? AND social_login='1' AND social_platform=? AND social_id=?`;
|
||||||
////////////////////////////////////////////////
|
const foundUserQueryValues = [finalEmail, social_platform, social_id];
|
||||||
////////////////////////////////////////////////
|
|
||||||
|
|
||||||
const foundUserQuery = `SELECT * FROM users WHERE email='${finalEmail}' AND social_login='1' AND social_platform='${social_platform}' AND social_id='${social_id}'`;
|
const foundUser = await varDatabaseDbHandler({
|
||||||
|
|
||||||
const foundUser = useLocal
|
|
||||||
? await LOCAL_DB_HANDLER(foundUserQuery)
|
|
||||||
: await varDatabaseDbHandler({
|
|
||||||
database: database ? database : "datasquirel",
|
database: database ? database : "datasquirel",
|
||||||
queryString: foundUserQuery,
|
queryString: foundUserQuery,
|
||||||
|
queryValuesArray: foundUserQueryValues,
|
||||||
|
useLocal,
|
||||||
});
|
});
|
||||||
|
|
||||||
if (foundUser && foundUser[0]) {
|
if (foundUser && foundUser[0]) {
|
||||||
return await loginSocialUser({
|
return await loginSocialUser({
|
||||||
user: payload,
|
user: payload,
|
||||||
social_platform,
|
social_platform,
|
||||||
res,
|
|
||||||
invitation,
|
invitation,
|
||||||
database,
|
database,
|
||||||
additionalFields,
|
additionalFields,
|
||||||
@ -156,10 +95,6 @@ module.exports = async function handleSocialDb({
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
////////////////////////////////////////////////
|
|
||||||
////////////////////////////////////////////////
|
|
||||||
////////////////////////////////////////////////
|
|
||||||
|
|
||||||
const socialHashedPassword = encrypt({
|
const socialHashedPassword = encrypt({
|
||||||
data: social_id.toString(),
|
data: social_id.toString(),
|
||||||
});
|
});
|
||||||
@ -200,24 +135,19 @@ module.exports = async function handleSocialDb({
|
|||||||
|
|
||||||
const newUserQueriedQuery = `SELECT * FROM users WHERE id='${newUser.insertId}'`;
|
const newUserQueriedQuery = `SELECT * FROM users WHERE id='${newUser.insertId}'`;
|
||||||
|
|
||||||
const newUserQueried = useLocal
|
const newUserQueried = await varDatabaseDbHandler({
|
||||||
? await LOCAL_DB_HANDLER(newUserQueriedQuery)
|
|
||||||
: await varDatabaseDbHandler({
|
|
||||||
database: database ? database : "datasquirel",
|
database: database ? database : "datasquirel",
|
||||||
queryString: newUserQueriedQuery,
|
queryString: newUserQueriedQuery,
|
||||||
|
useLocal,
|
||||||
});
|
});
|
||||||
|
|
||||||
if (!newUserQueried || !newUserQueried[0])
|
if (!newUserQueried || !newUserQueried[0])
|
||||||
return {
|
return {
|
||||||
success: false,
|
success: false,
|
||||||
user: null,
|
payload: null,
|
||||||
msg: "User Insertion Failed!",
|
msg: "User Insertion Failed!",
|
||||||
};
|
};
|
||||||
|
|
||||||
////////////////////////////////////////////////
|
|
||||||
////////////////////////////////////////////////
|
|
||||||
////////////////////////////////////////////////
|
|
||||||
|
|
||||||
if (supEmail && database?.match(/^datasquirel$/)) {
|
if (supEmail && database?.match(/^datasquirel$/)) {
|
||||||
/**
|
/**
|
||||||
* Send email Verification
|
* Send email Verification
|
||||||
@ -246,15 +176,15 @@ module.exports = async function handleSocialDb({
|
|||||||
}).then((mail) => {});
|
}).then((mail) => {});
|
||||||
}
|
}
|
||||||
|
|
||||||
////////////////////////////////////////////////
|
|
||||||
////////////////////////////////////////////////
|
|
||||||
////////////////////////////////////////////////
|
|
||||||
|
|
||||||
const STATIC_ROOT = process.env.DSQL_STATIC_SERVER_DIR;
|
const STATIC_ROOT = process.env.DSQL_STATIC_SERVER_DIR;
|
||||||
|
|
||||||
if (!STATIC_ROOT) {
|
if (!STATIC_ROOT) {
|
||||||
console.log("Static File ENV not Found!");
|
console.log("Static File ENV not Found!");
|
||||||
return null;
|
return {
|
||||||
|
success: false,
|
||||||
|
payload: null,
|
||||||
|
msg: "Static File ENV not Found!",
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -280,23 +210,14 @@ module.exports = async function handleSocialDb({
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
////////////////////////////////////////////////
|
|
||||||
////////////////////////////////////////////////
|
|
||||||
////////////////////////////////////////////////
|
|
||||||
|
|
||||||
return await loginSocialUser({
|
return await loginSocialUser({
|
||||||
user: newUserQueried[0],
|
user: newUserQueried[0],
|
||||||
social_platform,
|
social_platform,
|
||||||
res,
|
|
||||||
invitation,
|
invitation,
|
||||||
database,
|
database,
|
||||||
additionalFields,
|
additionalFields,
|
||||||
useLocal,
|
useLocal,
|
||||||
});
|
});
|
||||||
|
|
||||||
////////////////////////////////////////////////
|
|
||||||
////////////////////////////////////////////////
|
|
||||||
////////////////////////////////////////////////
|
|
||||||
} else {
|
} else {
|
||||||
console.log(
|
console.log(
|
||||||
"Social User Failed to insert in 'handleSocialDb.js' backend function =>",
|
"Social User Failed to insert in 'handleSocialDb.js' backend function =>",
|
||||||
@ -305,15 +226,10 @@ module.exports = async function handleSocialDb({
|
|||||||
|
|
||||||
return {
|
return {
|
||||||
success: false,
|
success: false,
|
||||||
user: null,
|
payload: null,
|
||||||
msg: "Social User Failed to insert in 'handleSocialDb.js' backend function => ",
|
msg: "Social User Failed to insert in 'handleSocialDb.js' backend function",
|
||||||
newUser: newUser,
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
////////////////////////////////////////////////
|
|
||||||
////////////////////////////////////////////////
|
|
||||||
////////////////////////////////////////////////
|
|
||||||
} catch (/** @type {any} */ error) {
|
} catch (/** @type {any} */ error) {
|
||||||
console.log(
|
console.log(
|
||||||
"ERROR in 'handleSocialDb.js' backend function =>",
|
"ERROR in 'handleSocialDb.js' backend function =>",
|
||||||
@ -322,126 +238,8 @@ module.exports = async function handleSocialDb({
|
|||||||
|
|
||||||
return {
|
return {
|
||||||
success: false,
|
success: false,
|
||||||
user: null,
|
payload: null,
|
||||||
error: error.message,
|
msg: error.message,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
//////////////////////////////////////////////////////////////////////////////////
|
|
||||||
//////////////////////////////////////////////////////////////////////////////////
|
|
||||||
//////////////////////////////////////////////////////////////////////////////////
|
|
||||||
//////////////////////////////////////////////////////////////////////////////////
|
|
||||||
//////////////////////////////////////////////////////////////////////////////////
|
|
||||||
//////////////////////////////////////////////////////////////////////////////////
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Function to login social user
|
|
||||||
* ==============================================================================
|
|
||||||
* @description This function logs in the user after 'handleSocialDb' function finishes
|
|
||||||
* the user creation or confirmation process
|
|
||||||
*
|
|
||||||
* @async
|
|
||||||
*
|
|
||||||
* @param {object} params - function parameters inside an object
|
|
||||||
* @param {{
|
|
||||||
* first_name: string,
|
|
||||||
* last_name: string,
|
|
||||||
* email: string,
|
|
||||||
* social_id: string|number,
|
|
||||||
* }} params.user - user object
|
|
||||||
* @param {string} params.social_platform - Whether its "google" or "facebook" or "github"
|
|
||||||
* @param {ServerResponse} [params.res] - Https response object
|
|
||||||
* @param {any} [params.invitation] - A query object if user was invited
|
|
||||||
* @param {string} [params.database] - Target Database
|
|
||||||
* @param {object} [params.additionalFields] - Additional fields to be added to the user payload
|
|
||||||
* @param {boolean} [params.useLocal]
|
|
||||||
*
|
|
||||||
* @returns {Promise<any>}
|
|
||||||
*/
|
|
||||||
async function loginSocialUser({
|
|
||||||
user,
|
|
||||||
social_platform,
|
|
||||||
res,
|
|
||||||
invitation,
|
|
||||||
database,
|
|
||||||
additionalFields,
|
|
||||||
useLocal,
|
|
||||||
}) {
|
|
||||||
const foundUserQuery = `SELECT * FROM users WHERE email='${user.email}' AND social_id='${user.social_id}' AND social_platform='${social_platform}'`;
|
|
||||||
|
|
||||||
const foundUser = useLocal
|
|
||||||
? await LOCAL_DB_HANDLER(foundUserQuery)
|
|
||||||
: await varDatabaseDbHandler({
|
|
||||||
database: database ? database : "datasquirel",
|
|
||||||
queryString: foundUserQuery,
|
|
||||||
});
|
|
||||||
|
|
||||||
if (!foundUser?.[0])
|
|
||||||
return {
|
|
||||||
success: false,
|
|
||||||
user: null,
|
|
||||||
};
|
|
||||||
|
|
||||||
let csrfKey =
|
|
||||||
Math.random().toString(36).substring(2) +
|
|
||||||
"-" +
|
|
||||||
Math.random().toString(36).substring(2);
|
|
||||||
|
|
||||||
/** @type {any} */
|
|
||||||
let userPayload = {
|
|
||||||
id: foundUser[0].id,
|
|
||||||
type: foundUser[0].type || "",
|
|
||||||
stripe_id: foundUser[0].stripe_id || "",
|
|
||||||
first_name: foundUser[0].first_name,
|
|
||||||
last_name: foundUser[0].last_name,
|
|
||||||
username: foundUser[0].username,
|
|
||||||
email: foundUser[0].email,
|
|
||||||
social_id: foundUser[0].social_id,
|
|
||||||
image: foundUser[0].image,
|
|
||||||
image_thumbnail: foundUser[0].image_thumbnail,
|
|
||||||
verification_status: foundUser[0].verification_status,
|
|
||||||
social_login: foundUser[0].social_login,
|
|
||||||
social_platform: foundUser[0].social_platform,
|
|
||||||
csrf_k: csrfKey,
|
|
||||||
logged_in_status: true,
|
|
||||||
date: Date.now(),
|
|
||||||
};
|
|
||||||
|
|
||||||
if (additionalFields && Object.keys(additionalFields).length > 0) {
|
|
||||||
Object.keys(additionalFields).forEach((key) => {
|
|
||||||
userPayload[key] = foundUser[0][key];
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
let encryptedPayload = encrypt({ data: JSON.stringify(userPayload) });
|
|
||||||
|
|
||||||
const { keyCookieName, csrfCookieName } = getAuthCookieNames();
|
|
||||||
|
|
||||||
if (res?.setHeader) {
|
|
||||||
res.setHeader("Set-Cookie", [
|
|
||||||
`${keyCookieName}=${encryptedPayload};samesite=strict;path=/;HttpOnly=true;Secure=true`,
|
|
||||||
`${csrfCookieName}=${csrfKey};samesite=strict;path=/;HttpOnly=true`,
|
|
||||||
]);
|
|
||||||
}
|
|
||||||
|
|
||||||
////////////////////////////////////////////////
|
|
||||||
////////////////////////////////////////////////
|
|
||||||
////////////////////////////////////////////////
|
|
||||||
|
|
||||||
if (invitation && (!database || database?.match(/^datasquirel$/))) {
|
|
||||||
addAdminUserOnLogin({
|
|
||||||
query: invitation,
|
|
||||||
user: userPayload,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
////////////////////////////////////////////////
|
|
||||||
////////////////////////////////////////////////
|
|
||||||
////////////////////////////////////////////////
|
|
||||||
|
|
||||||
return {
|
|
||||||
success: true,
|
|
||||||
user: userPayload,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
37
package-shared/functions/api/social-login/loginSocialUser.d.ts
vendored
Normal file
37
package-shared/functions/api/social-login/loginSocialUser.d.ts
vendored
Normal file
@ -0,0 +1,37 @@
|
|||||||
|
export = loginSocialUser;
|
||||||
|
/**
|
||||||
|
* Function to login social user
|
||||||
|
* ==============================================================================
|
||||||
|
* @description This function logs in the user after 'handleSocialDb' function finishes
|
||||||
|
* the user creation or confirmation process
|
||||||
|
*
|
||||||
|
* @async
|
||||||
|
*
|
||||||
|
* @param {object} params - function parameters inside an object
|
||||||
|
* @param {{
|
||||||
|
* first_name: string,
|
||||||
|
* last_name: string,
|
||||||
|
* email: string,
|
||||||
|
* social_id: string|number,
|
||||||
|
* }} params.user - user object
|
||||||
|
* @param {string} params.social_platform - Whether its "google" or "facebook" or "github"
|
||||||
|
* @param {any} [params.invitation] - A query object if user was invited
|
||||||
|
* @param {string} [params.database] - Target Database
|
||||||
|
* @param {string[]} [params.additionalFields] - Additional fields to be added to the user payload
|
||||||
|
* @param {boolean} [params.useLocal]
|
||||||
|
*
|
||||||
|
* @returns {Promise<import("../../../types").APILoginFunctionReturn>}
|
||||||
|
*/
|
||||||
|
declare function loginSocialUser({ user, social_platform, invitation, database, additionalFields, useLocal, }: {
|
||||||
|
user: {
|
||||||
|
first_name: string;
|
||||||
|
last_name: string;
|
||||||
|
email: string;
|
||||||
|
social_id: string | number;
|
||||||
|
};
|
||||||
|
social_platform: string;
|
||||||
|
invitation?: any;
|
||||||
|
database?: string;
|
||||||
|
additionalFields?: string[];
|
||||||
|
useLocal?: boolean;
|
||||||
|
}): Promise<import("../../../types").APILoginFunctionReturn>;
|
104
package-shared/functions/api/social-login/loginSocialUser.js
Executable file
104
package-shared/functions/api/social-login/loginSocialUser.js
Executable file
@ -0,0 +1,104 @@
|
|||||||
|
// @ts-check
|
||||||
|
|
||||||
|
const addAdminUserOnLogin = require("../../backend/addAdminUserOnLogin");
|
||||||
|
const { ServerResponse } = require("http");
|
||||||
|
const varDatabaseDbHandler = require("../../backend/varDatabaseDbHandler");
|
||||||
|
const encrypt = require("../../dsql/encrypt");
|
||||||
|
const getAuthCookieNames = require("../../backend/cookies/get-auth-cookie-names");
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Function to login social user
|
||||||
|
* ==============================================================================
|
||||||
|
* @description This function logs in the user after 'handleSocialDb' function finishes
|
||||||
|
* the user creation or confirmation process
|
||||||
|
*
|
||||||
|
* @async
|
||||||
|
*
|
||||||
|
* @param {object} params - function parameters inside an object
|
||||||
|
* @param {{
|
||||||
|
* first_name: string,
|
||||||
|
* last_name: string,
|
||||||
|
* email: string,
|
||||||
|
* social_id: string|number,
|
||||||
|
* }} params.user - user object
|
||||||
|
* @param {string} params.social_platform - Whether its "google" or "facebook" or "github"
|
||||||
|
* @param {any} [params.invitation] - A query object if user was invited
|
||||||
|
* @param {string} [params.database] - Target Database
|
||||||
|
* @param {string[]} [params.additionalFields] - Additional fields to be added to the user payload
|
||||||
|
* @param {boolean} [params.useLocal]
|
||||||
|
*
|
||||||
|
* @returns {Promise<import("../../../types").APILoginFunctionReturn>}
|
||||||
|
*/
|
||||||
|
async function loginSocialUser({
|
||||||
|
user,
|
||||||
|
social_platform,
|
||||||
|
invitation,
|
||||||
|
database,
|
||||||
|
additionalFields,
|
||||||
|
useLocal,
|
||||||
|
}) {
|
||||||
|
const foundUserQuery = `SELECT * FROM users WHERE email=? AND social_id=? AND social_platform=?`;
|
||||||
|
const foundUserValues = [user.email, user.social_id, social_platform];
|
||||||
|
|
||||||
|
const foundUser = await varDatabaseDbHandler({
|
||||||
|
database: database ? database : "datasquirel",
|
||||||
|
queryString: foundUserQuery,
|
||||||
|
queryValuesArray: foundUserValues,
|
||||||
|
useLocal,
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!foundUser?.[0])
|
||||||
|
return {
|
||||||
|
success: false,
|
||||||
|
payload: null,
|
||||||
|
};
|
||||||
|
|
||||||
|
let csrfKey =
|
||||||
|
Math.random().toString(36).substring(2) +
|
||||||
|
"-" +
|
||||||
|
Math.random().toString(36).substring(2);
|
||||||
|
|
||||||
|
/** @type {import("../../../types").DATASQUIREL_LoggedInUser} */
|
||||||
|
let userPayload = {
|
||||||
|
id: foundUser[0].id,
|
||||||
|
first_name: foundUser[0].first_name,
|
||||||
|
last_name: foundUser[0].last_name,
|
||||||
|
username: foundUser[0].username,
|
||||||
|
user_type: foundUser[0].user_type,
|
||||||
|
email: foundUser[0].email,
|
||||||
|
social_id: foundUser[0].social_id,
|
||||||
|
image: foundUser[0].image,
|
||||||
|
image_thumbnail: foundUser[0].image_thumbnail,
|
||||||
|
verification_status: foundUser[0].verification_status,
|
||||||
|
social_login: foundUser[0].social_login,
|
||||||
|
social_platform: foundUser[0].social_platform,
|
||||||
|
csrf_k: csrfKey,
|
||||||
|
logged_in_status: true,
|
||||||
|
date: Date.now(),
|
||||||
|
};
|
||||||
|
|
||||||
|
if (additionalFields?.[0]) {
|
||||||
|
additionalFields.forEach((key) => {
|
||||||
|
userPayload[key] = foundUser[0][key];
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
if (invitation && (!database || database?.match(/^datasquirel$/))) {
|
||||||
|
addAdminUserOnLogin({
|
||||||
|
query: invitation,
|
||||||
|
user: userPayload,
|
||||||
|
useLocal,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @type {import("../../../types").APILoginFunctionReturn} */
|
||||||
|
let result = {
|
||||||
|
success: true,
|
||||||
|
payload: userPayload,
|
||||||
|
csrf: csrfKey,
|
||||||
|
};
|
||||||
|
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
module.exports = loginSocialUser;
|
@ -1,8 +1,8 @@
|
|||||||
// @ts-check
|
// @ts-check
|
||||||
|
|
||||||
const LOCAL_DB_HANDLER = require("../../../utils/backend/global-db/LOCAL_DB_HANDLER");
|
|
||||||
const addUsersTableToDb = require("../../backend/addUsersTableToDb");
|
const addUsersTableToDb = require("../../backend/addUsersTableToDb");
|
||||||
const addDbEntry = require("../../backend/db/addDbEntry");
|
const addDbEntry = require("../../backend/db/addDbEntry");
|
||||||
|
const updateUsersTableSchema = require("../../backend/updateUsersTableSchema");
|
||||||
const varDatabaseDbHandler = require("../../backend/varDatabaseDbHandler");
|
const varDatabaseDbHandler = require("../../backend/varDatabaseDbHandler");
|
||||||
const hashPassword = require("../../dsql/hashPassword");
|
const hashPassword = require("../../dsql/hashPassword");
|
||||||
|
|
||||||
@ -42,27 +42,30 @@ module.exports = async function apiCreateUser({
|
|||||||
|
|
||||||
payload.password = hashedPassword;
|
payload.password = hashedPassword;
|
||||||
|
|
||||||
let fields = useLocal
|
const fieldsQuery = `SHOW COLUMNS FROM users`;
|
||||||
? await LOCAL_DB_HANDLER(`SHOW COLUMNS FROM users`)
|
|
||||||
: await varDatabaseDbHandler({
|
|
||||||
queryString: `SHOW COLUMNS FROM users`,
|
|
||||||
database: dbFullName,
|
|
||||||
});
|
|
||||||
|
|
||||||
if (!fields) {
|
let fields = await varDatabaseDbHandler({
|
||||||
const newTable = await addUsersTableToDb({
|
queryString: fieldsQuery,
|
||||||
userId: Number(userId),
|
database: dbFullName,
|
||||||
database: database,
|
|
||||||
useLocal,
|
useLocal,
|
||||||
});
|
});
|
||||||
|
|
||||||
fields = await varDatabaseDbHandler({
|
if (!fields?.[0]) {
|
||||||
queryString: `SHOW COLUMNS FROM users`,
|
const newTable = await addUsersTableToDb({
|
||||||
|
userId: Number(userId),
|
||||||
database: dbFullName,
|
database: dbFullName,
|
||||||
|
useLocal,
|
||||||
|
payload: payload,
|
||||||
|
});
|
||||||
|
|
||||||
|
fields = await varDatabaseDbHandler({
|
||||||
|
queryString: fieldsQuery,
|
||||||
|
database: dbFullName,
|
||||||
|
useLocal,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!fields) {
|
if (!fields?.[0]) {
|
||||||
return {
|
return {
|
||||||
success: false,
|
success: false,
|
||||||
msg: "Could not create users table",
|
msg: "Could not create users table",
|
||||||
@ -78,8 +81,13 @@ module.exports = async function apiCreateUser({
|
|||||||
for (let i = 0; i < Object.keys(payload).length; i++) {
|
for (let i = 0; i < Object.keys(payload).length; i++) {
|
||||||
const key = Object.keys(payload)[i];
|
const key = Object.keys(payload)[i];
|
||||||
if (!fieldsTitles.includes(key)) {
|
if (!fieldsTitles.includes(key)) {
|
||||||
invalidField = key;
|
await updateUsersTableSchema({
|
||||||
break;
|
userId: Number(userId),
|
||||||
|
database: dbFullName,
|
||||||
|
newPayload: {
|
||||||
|
[key]: payload[key],
|
||||||
|
},
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -90,14 +98,18 @@ module.exports = async function apiCreateUser({
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
const existingUser = await varDatabaseDbHandler({
|
const existingUserQuery = `SELECT * FROM users WHERE email = ?${
|
||||||
queryString: `SELECT * FROM users WHERE email = ?${
|
|
||||||
payload.username ? " OR username = ?" : ""
|
payload.username ? " OR username = ?" : ""
|
||||||
}`,
|
}`;
|
||||||
queryValuesArray: payload.username
|
const existingUserValues = payload.username
|
||||||
? [payload.email, payload.username]
|
? [payload.email, payload.username]
|
||||||
: [payload.email],
|
: [payload.email];
|
||||||
|
|
||||||
|
const existingUser = await varDatabaseDbHandler({
|
||||||
|
queryString: existingUserQuery,
|
||||||
|
queryValuesArray: existingUserValues,
|
||||||
database: dbFullName,
|
database: dbFullName,
|
||||||
|
useLocal,
|
||||||
});
|
});
|
||||||
|
|
||||||
if (existingUser?.[0]) {
|
if (existingUser?.[0]) {
|
||||||
@ -121,9 +133,12 @@ module.exports = async function apiCreateUser({
|
|||||||
});
|
});
|
||||||
|
|
||||||
if (addUser?.insertId) {
|
if (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 newlyAddedUser = await varDatabaseDbHandler({
|
const newlyAddedUser = await varDatabaseDbHandler({
|
||||||
queryString: `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}'`,
|
queryString: newlyAddedUserQuery,
|
||||||
database: dbFullName,
|
database: dbFullName,
|
||||||
|
useLocal,
|
||||||
});
|
});
|
||||||
|
|
||||||
return {
|
return {
|
||||||
|
10
package-shared/functions/api/users/api-delete-user.d.ts
vendored
Normal file
10
package-shared/functions/api/users/api-delete-user.d.ts
vendored
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
declare function _exports({ dbFullName, deletedUserId, useLocal, }: {
|
||||||
|
dbFullName: string;
|
||||||
|
deletedUserId: string | number;
|
||||||
|
useLocal?: boolean;
|
||||||
|
}): Promise<{
|
||||||
|
success: boolean;
|
||||||
|
result?: any;
|
||||||
|
msg?: string;
|
||||||
|
}>;
|
||||||
|
export = _exports;
|
52
package-shared/functions/api/users/api-delete-user.js
Normal file
52
package-shared/functions/api/users/api-delete-user.js
Normal file
@ -0,0 +1,52 @@
|
|||||||
|
// @ts-check
|
||||||
|
|
||||||
|
const deleteDbEntry = require("../../backend/db/deleteDbEntry");
|
||||||
|
const varDatabaseDbHandler = require("../../backend/varDatabaseDbHandler");
|
||||||
|
|
||||||
|
/**
|
||||||
|
* # Update API User Function
|
||||||
|
*
|
||||||
|
* @param {object} params
|
||||||
|
* @param {string} params.dbFullName
|
||||||
|
* @param {string | number} params.deletedUserId
|
||||||
|
* @param {boolean} [params.useLocal]
|
||||||
|
*
|
||||||
|
* @returns {Promise<{ success: boolean, result?: any, msg?: string }>}
|
||||||
|
*/
|
||||||
|
module.exports = async function apiDeleteUser({
|
||||||
|
dbFullName,
|
||||||
|
deletedUserId,
|
||||||
|
useLocal,
|
||||||
|
}) {
|
||||||
|
const existingUserQuery = `SELECT * FROM users WHERE id = ?`;
|
||||||
|
const existingUserValues = [deletedUserId];
|
||||||
|
|
||||||
|
const existingUser = await varDatabaseDbHandler({
|
||||||
|
queryString: existingUserQuery,
|
||||||
|
queryValuesArray: existingUserValues,
|
||||||
|
database: dbFullName,
|
||||||
|
useLocal,
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!existingUser?.[0]) {
|
||||||
|
return {
|
||||||
|
success: false,
|
||||||
|
msg: "User not found",
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
const deleteUser = await deleteDbEntry({
|
||||||
|
dbContext: "Dsql User",
|
||||||
|
paradigm: "Full Access",
|
||||||
|
dbFullName,
|
||||||
|
tableName: "users",
|
||||||
|
identifierColumnName: "id",
|
||||||
|
identifierValue: deletedUserId,
|
||||||
|
useLocal,
|
||||||
|
});
|
||||||
|
|
||||||
|
return {
|
||||||
|
success: true,
|
||||||
|
result: deleteUser,
|
||||||
|
};
|
||||||
|
};
|
@ -1,6 +1,5 @@
|
|||||||
// @ts-check
|
// @ts-check
|
||||||
|
|
||||||
const LOCAL_DB_HANDLER = require("../../../utils/backend/global-db/LOCAL_DB_HANDLER");
|
|
||||||
const varDatabaseDbHandler = require("../../backend/varDatabaseDbHandler");
|
const varDatabaseDbHandler = require("../../backend/varDatabaseDbHandler");
|
||||||
|
|
||||||
/** @type {import("../../../types").APIGetUserFunction} */
|
/** @type {import("../../../types").APIGetUserFunction} */
|
||||||
@ -12,12 +11,11 @@ module.exports = async function apiGetUser({
|
|||||||
}) {
|
}) {
|
||||||
const query = `SELECT ${fields.join(",")} FROM users WHERE id=?`;
|
const query = `SELECT ${fields.join(",")} FROM users WHERE id=?`;
|
||||||
|
|
||||||
let foundUser = useLocal
|
let foundUser = await varDatabaseDbHandler({
|
||||||
? await LOCAL_DB_HANDLER(query, [userId])
|
|
||||||
: await varDatabaseDbHandler({
|
|
||||||
queryString: query,
|
queryString: query,
|
||||||
queryValuesArray: [userId],
|
queryValuesArray: [userId],
|
||||||
database: dbFullName.replace(/[^a-z0-9_]/g, ""),
|
database: dbFullName.replace(/[^a-z0-9_]/g, ""),
|
||||||
|
useLocal,
|
||||||
});
|
});
|
||||||
|
|
||||||
if (!foundUser || !foundUser[0]) {
|
if (!foundUser || !foundUser[0]) {
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
// @ts-check
|
// @ts-check
|
||||||
|
|
||||||
const LOCAL_DB_HANDLER = require("../../../utils/backend/global-db/LOCAL_DB_HANDLER");
|
const LOCAL_DB_HANDLER = require("../../../utils/backend/global-db/LOCAL_DB_HANDLER");
|
||||||
|
const { writeAuthFile } = require("../../backend/auth/write-auth-files");
|
||||||
const varDatabaseDbHandler = require("../../backend/varDatabaseDbHandler");
|
const varDatabaseDbHandler = require("../../backend/varDatabaseDbHandler");
|
||||||
const hashPassword = require("../../dsql/hashPassword");
|
const hashPassword = require("../../dsql/hashPassword");
|
||||||
|
|
||||||
@ -50,15 +51,11 @@ module.exports = async function apiLoginUser({
|
|||||||
})
|
})
|
||||||
: null;
|
: null;
|
||||||
|
|
||||||
let foundUser = useLocal
|
let foundUser = await varDatabaseDbHandler({
|
||||||
? await LOCAL_DB_HANDLER(
|
|
||||||
`SELECT * FROM users WHERE email = ? OR username = ?`,
|
|
||||||
[email, username]
|
|
||||||
)
|
|
||||||
: await varDatabaseDbHandler({
|
|
||||||
queryString: `SELECT * FROM users WHERE email = ? OR username = ?`,
|
queryString: `SELECT * FROM users WHERE email = ? OR username = ?`,
|
||||||
queryValuesArray: [email, username],
|
queryValuesArray: [email, username],
|
||||||
database: dbFullName.replace(/[^a-z0-9_]/g, ""),
|
database: dbFullName.replace(/[^a-z0-9_]/g, ""),
|
||||||
|
useLocal,
|
||||||
});
|
});
|
||||||
|
|
||||||
if ((!foundUser || !foundUser[0]) && !social)
|
if ((!foundUser || !foundUser[0]) && !social)
|
||||||
@ -107,15 +104,11 @@ module.exports = async function apiLoginUser({
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (isPasswordCorrect && email_login) {
|
if (isPasswordCorrect && email_login) {
|
||||||
const resetTempCode = useLocal
|
const resetTempCode = await varDatabaseDbHandler({
|
||||||
? await LOCAL_DB_HANDLER(
|
|
||||||
`UPDATE users SET ${email_login_field} = ? WHERE email = ? OR username = ?`,
|
|
||||||
["", email, username]
|
|
||||||
)
|
|
||||||
: await varDatabaseDbHandler({
|
|
||||||
queryString: `UPDATE users SET ${email_login_field} = ? WHERE email = ? OR username = ?`,
|
queryString: `UPDATE users SET ${email_login_field} = ? WHERE email = ? OR username = ?`,
|
||||||
queryValuesArray: ["", email, username],
|
queryValuesArray: ["", email, username],
|
||||||
database: dbFullName.replace(/[^a-z0-9_]/g, ""),
|
database: dbFullName.replace(/[^a-z0-9_]/g, ""),
|
||||||
|
useLocal,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -144,6 +137,7 @@ module.exports = async function apiLoginUser({
|
|||||||
date: Date.now(),
|
date: Date.now(),
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/** @type {import("../../../types").APILoginFunctionReturn} */
|
||||||
const resposeObject = {
|
const resposeObject = {
|
||||||
success: true,
|
success: true,
|
||||||
msg: "Login Successful",
|
msg: "Login Successful",
|
||||||
@ -152,6 +146,7 @@ module.exports = async function apiLoginUser({
|
|||||||
userPayload
|
userPayload
|
||||||
),
|
),
|
||||||
userId: foundUser[0].id,
|
userId: foundUser[0].id,
|
||||||
|
csrf: csrfKey,
|
||||||
};
|
};
|
||||||
|
|
||||||
if (
|
if (
|
||||||
|
@ -1,10 +1,9 @@
|
|||||||
declare function _exports({ existingUser, database, userId, additionalFields, useLocal, }: {
|
declare function _exports({ existingUser, database, additionalFields, useLocal, }: {
|
||||||
existingUser: {
|
existingUser: {
|
||||||
[x: string]: any;
|
[x: string]: any;
|
||||||
};
|
};
|
||||||
database: string;
|
database: string;
|
||||||
userId?: string | number;
|
|
||||||
additionalFields?: string[];
|
additionalFields?: string[];
|
||||||
useLocal?: boolean;
|
useLocal?: boolean;
|
||||||
}): Promise<import("../../../types").ApiReauthUserReturn>;
|
}): Promise<import("../../../types").APILoginFunctionReturn>;
|
||||||
export = _exports;
|
export = _exports;
|
||||||
|
@ -9,16 +9,14 @@ const nodemailer = require("nodemailer");
|
|||||||
* @param {object} param
|
* @param {object} param
|
||||||
* @param {Object<string, any>} param.existingUser
|
* @param {Object<string, any>} param.existingUser
|
||||||
* @param {string} param.database
|
* @param {string} param.database
|
||||||
* @param {string | number} [param.userId]
|
|
||||||
* @param {string[]} [param.additionalFields]
|
* @param {string[]} [param.additionalFields]
|
||||||
* @param {boolean} [param.useLocal]
|
* @param {boolean} [param.useLocal]
|
||||||
*
|
*
|
||||||
* @returns {Promise<import("../../../types").ApiReauthUserReturn>}
|
* @returns {Promise<import("../../../types").APILoginFunctionReturn>}
|
||||||
*/
|
*/
|
||||||
module.exports = async function apiReauthUser({
|
module.exports = async function apiReauthUser({
|
||||||
existingUser,
|
existingUser,
|
||||||
database,
|
database,
|
||||||
userId,
|
|
||||||
additionalFields,
|
additionalFields,
|
||||||
useLocal,
|
useLocal,
|
||||||
}) {
|
}) {
|
||||||
@ -55,7 +53,7 @@ module.exports = async function apiReauthUser({
|
|||||||
"-" +
|
"-" +
|
||||||
Math.random().toString(36).substring(2);
|
Math.random().toString(36).substring(2);
|
||||||
|
|
||||||
/** @type {Object<string, string | number | boolean>} */
|
/** @type {import("../../../types").DATASQUIREL_LoggedInUser} */
|
||||||
let userPayload = {
|
let userPayload = {
|
||||||
id: foundUser[0].id,
|
id: foundUser[0].id,
|
||||||
first_name: foundUser[0].first_name,
|
first_name: foundUser[0].first_name,
|
||||||
@ -94,6 +92,6 @@ module.exports = async function apiReauthUser({
|
|||||||
success: true,
|
success: true,
|
||||||
msg: "Login Successful",
|
msg: "Login Successful",
|
||||||
payload: userPayload,
|
payload: userPayload,
|
||||||
userId,
|
csrf: csrfKey,
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -47,12 +47,11 @@ module.exports = async function apiSendEmailCode({
|
|||||||
const foundUserQuery = `SELECT * FROM users WHERE email = ?`;
|
const foundUserQuery = `SELECT * FROM users WHERE email = ?`;
|
||||||
const foundUserValues = [email];
|
const foundUserValues = [email];
|
||||||
|
|
||||||
let foundUser = useLocal
|
let foundUser = await varDatabaseDbHandler({
|
||||||
? await LOCAL_DB_HANDLER(foundUserQuery, foundUserValues)
|
|
||||||
: await varDatabaseDbHandler({
|
|
||||||
queryString: foundUserQuery,
|
queryString: foundUserQuery,
|
||||||
queryValuesArray: foundUserValues,
|
queryValuesArray: foundUserValues,
|
||||||
database,
|
database,
|
||||||
|
useLocal,
|
||||||
});
|
});
|
||||||
|
|
||||||
////////////////////////////////////////
|
////////////////////////////////////////
|
||||||
@ -105,12 +104,11 @@ module.exports = async function apiSendEmailCode({
|
|||||||
const setTempCodeQuery = `UPDATE users SET ${email_login_field} = ? WHERE email = ?`;
|
const setTempCodeQuery = `UPDATE users SET ${email_login_field} = ? WHERE email = ?`;
|
||||||
const setTempCodeValues = [tempCode + `-${Date.now()}`, email];
|
const setTempCodeValues = [tempCode + `-${Date.now()}`, email];
|
||||||
|
|
||||||
let setTempCode = useLocal
|
let setTempCode = await varDatabaseDbHandler({
|
||||||
? await LOCAL_DB_HANDLER(setTempCodeQuery, setTempCodeValues)
|
|
||||||
: await varDatabaseDbHandler({
|
|
||||||
queryString: setTempCodeQuery,
|
queryString: setTempCodeQuery,
|
||||||
queryValuesArray: setTempCodeValues,
|
queryValuesArray: setTempCodeValues,
|
||||||
database: database,
|
database: database,
|
||||||
|
useLocal,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,13 +1,14 @@
|
|||||||
declare function _exports({ payload, dbFullName, useLocal, }: {
|
declare function _exports({ payload, dbFullName, updatedUserId, useLocal, dbSchema, }: {
|
||||||
payload: {
|
payload: {
|
||||||
id: string | number;
|
[x: string]: any;
|
||||||
} & {
|
|
||||||
[x: string]: (string | number | null | undefined);
|
|
||||||
};
|
};
|
||||||
dbFullName: string;
|
dbFullName: string;
|
||||||
|
updatedUserId: string | number;
|
||||||
useLocal?: boolean;
|
useLocal?: boolean;
|
||||||
|
dbSchema?: import("../../../types").DSQL_DatabaseSchemaType;
|
||||||
}): Promise<{
|
}): Promise<{
|
||||||
success: boolean;
|
success: boolean;
|
||||||
payload: any;
|
payload?: any;
|
||||||
|
msg?: string;
|
||||||
}>;
|
}>;
|
||||||
export = _exports;
|
export = _exports;
|
||||||
|
@ -1,33 +1,83 @@
|
|||||||
// @ts-check
|
// @ts-check
|
||||||
|
|
||||||
|
const LOCAL_DB_HANDLER = require("../../../utils/backend/global-db/LOCAL_DB_HANDLER");
|
||||||
const updateDbEntry = require("../../backend/db/updateDbEntry");
|
const updateDbEntry = require("../../backend/db/updateDbEntry");
|
||||||
|
const encrypt = require("../../dsql/encrypt");
|
||||||
|
const hashPassword = require("../../dsql/hashPassword");
|
||||||
|
const varDatabaseDbHandler = require("../../backend/varDatabaseDbHandler");
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* # Update API User Function
|
* # Update API User Function
|
||||||
*
|
*
|
||||||
* @param {object} params
|
* @param {object} params
|
||||||
* @param {{ id: string | number } & Object<string, (string | number | null | undefined)>} params.payload
|
* @param {Object<string, any>} params.payload
|
||||||
* @param {string} params.dbFullName
|
* @param {string} params.dbFullName
|
||||||
|
* @param {string | number} params.updatedUserId
|
||||||
* @param {boolean} [params.useLocal]
|
* @param {boolean} [params.useLocal]
|
||||||
|
* @param {import("../../../types").DSQL_DatabaseSchemaType} [params.dbSchema]
|
||||||
*
|
*
|
||||||
* @returns {Promise<{ success: boolean, payload: any }>}
|
* @returns {Promise<{ success: boolean, payload?: any, msg?: string }>}
|
||||||
*/
|
*/
|
||||||
module.exports = async function apiUpdateUser({
|
module.exports = async function apiUpdateUser({
|
||||||
payload,
|
payload,
|
||||||
dbFullName,
|
dbFullName,
|
||||||
|
updatedUserId,
|
||||||
useLocal,
|
useLocal,
|
||||||
|
dbSchema,
|
||||||
}) {
|
}) {
|
||||||
|
const existingUserQuery = `SELECT * FROM users WHERE id = ?`;
|
||||||
|
const existingUserValues = [updatedUserId];
|
||||||
|
|
||||||
|
const existingUser = await varDatabaseDbHandler({
|
||||||
|
queryString: existingUserQuery,
|
||||||
|
queryValuesArray: existingUserValues,
|
||||||
|
database: dbFullName,
|
||||||
|
useLocal,
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!existingUser?.[0]) {
|
||||||
|
return {
|
||||||
|
success: false,
|
||||||
|
msg: "User not found",
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
const data = (() => {
|
const data = (() => {
|
||||||
const reqBodyKeys = Object.keys(payload);
|
const reqBodyKeys = Object.keys(payload);
|
||||||
|
|
||||||
|
const targetTableSchema = (() => {
|
||||||
|
try {
|
||||||
|
const targetDatabaseSchema = dbSchema?.tables?.find(
|
||||||
|
(tbl) => tbl.tableName == "users"
|
||||||
|
);
|
||||||
|
return targetDatabaseSchema;
|
||||||
|
} catch (error) {
|
||||||
|
return undefined;
|
||||||
|
}
|
||||||
|
})();
|
||||||
|
|
||||||
/** @type {any} */
|
/** @type {any} */
|
||||||
const finalData = {};
|
const finalData = {};
|
||||||
|
|
||||||
reqBodyKeys.forEach((key) => {
|
reqBodyKeys.forEach((key) => {
|
||||||
if (key?.match(/^date_|^id$/)) return;
|
const targetFieldSchema = targetTableSchema?.fields?.find(
|
||||||
finalData[key] = payload[key];
|
(field) => field.fieldName == key
|
||||||
|
);
|
||||||
|
|
||||||
|
if (key?.match(/^date_|^id$|^uuid$/)) return;
|
||||||
|
let value = payload[key];
|
||||||
|
|
||||||
|
if (targetFieldSchema?.encrypted) {
|
||||||
|
value = encrypt({ data: value });
|
||||||
|
}
|
||||||
|
|
||||||
|
finalData[key] = value;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
if (finalData.password && typeof finalData.password == "string") {
|
||||||
|
finalData.password = hashPassword({ password: finalData.password });
|
||||||
|
}
|
||||||
|
|
||||||
return finalData;
|
return finalData;
|
||||||
})();
|
})();
|
||||||
|
|
||||||
@ -37,7 +87,7 @@ module.exports = async function apiUpdateUser({
|
|||||||
dbFullName,
|
dbFullName,
|
||||||
tableName: "users",
|
tableName: "users",
|
||||||
identifierColumnName: "id",
|
identifierColumnName: "id",
|
||||||
identifierValue: payload.id,
|
identifierValue: updatedUserId,
|
||||||
data: data,
|
data: data,
|
||||||
useLocal,
|
useLocal,
|
||||||
});
|
});
|
||||||
|
@ -3,9 +3,7 @@ declare function _exports({ code, clientId, clientSecret, database, additionalFi
|
|||||||
clientId?: string;
|
clientId?: string;
|
||||||
clientSecret?: string;
|
clientSecret?: string;
|
||||||
database?: string;
|
database?: string;
|
||||||
additionalFields?: {
|
additionalFields?: string[];
|
||||||
[x: string]: any;
|
|
||||||
};
|
|
||||||
res?: any;
|
res?: any;
|
||||||
email?: string;
|
email?: string;
|
||||||
userId?: string | number;
|
userId?: string | number;
|
||||||
|
@ -11,7 +11,7 @@ const camelJoinedtoCamelSpace = require("../../../../utils/camelJoinedtoCamelSpa
|
|||||||
* @param {string} [param.clientId]
|
* @param {string} [param.clientId]
|
||||||
* @param {string} [param.clientSecret]
|
* @param {string} [param.clientSecret]
|
||||||
* @param {string} [param.database]
|
* @param {string} [param.database]
|
||||||
* @param {Object<string, any>} [param.additionalFields]
|
* @param {string[]} [param.additionalFields]
|
||||||
* @param {any} [param.res]
|
* @param {any} [param.res]
|
||||||
* @param {string} [param.email]
|
* @param {string} [param.email]
|
||||||
* @param {string | number} [param.userId]
|
* @param {string | number} [param.userId]
|
||||||
@ -84,19 +84,11 @@ module.exports = async function apiGithubLogin({
|
|||||||
username: "github-user-" + socialId,
|
username: "github-user-" + socialId,
|
||||||
};
|
};
|
||||||
|
|
||||||
if (additionalFields && Object.keys(additionalFields).length > 0) {
|
|
||||||
Object.keys(additionalFields).forEach((key) => {
|
|
||||||
// @ts-ignore
|
|
||||||
payload[key] = additionalFields[key];
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
const loggedInGithubUser = await handleSocialDb({
|
const loggedInGithubUser = await handleSocialDb({
|
||||||
database,
|
database,
|
||||||
email: gitHubUser.email,
|
email: gitHubUser.email,
|
||||||
payload: payload,
|
payload: payload,
|
||||||
social_platform: "github",
|
social_platform: "github",
|
||||||
res: res,
|
|
||||||
social_id: socialId,
|
social_id: socialId,
|
||||||
supEmail: email,
|
supEmail: email,
|
||||||
additionalFields,
|
additionalFields,
|
||||||
@ -106,5 +98,5 @@ module.exports = async function apiGithubLogin({
|
|||||||
////////////////////////////////////////////////
|
////////////////////////////////////////////////
|
||||||
////////////////////////////////////////////////
|
////////////////////////////////////////////////
|
||||||
|
|
||||||
return { success: true, ...loggedInGithubUser, dsqlUserId: userId };
|
return { ...loggedInGithubUser };
|
||||||
};
|
};
|
||||||
|
@ -1,34 +1,42 @@
|
|||||||
// @ts-check
|
// @ts-check
|
||||||
|
|
||||||
const { OAuth2Client } = require("google-auth-library");
|
const https = require("https");
|
||||||
const handleSocialDb = require("../../social-login/handleSocialDb");
|
const handleSocialDb = require("../../social-login/handleSocialDb");
|
||||||
|
const EJSON = require("../../../../utils/ejson");
|
||||||
|
|
||||||
/** @type {import("../../../../types").APIGoogleLoginFunction} */
|
/** @type {import("../../../../types").APIGoogleLoginFunction} */
|
||||||
module.exports = async function apiGoogleLogin({
|
module.exports = async function apiGoogleLogin({
|
||||||
clientId,
|
|
||||||
token,
|
token,
|
||||||
database,
|
database,
|
||||||
userId,
|
|
||||||
additionalFields,
|
additionalFields,
|
||||||
res,
|
|
||||||
}) {
|
}) {
|
||||||
const client = new OAuth2Client(clientId);
|
try {
|
||||||
|
/** @type {import("../../../../types").GoogleOauth2User | undefined} */
|
||||||
const ticket = await client.verifyIdToken({
|
const gUser = await new Promise((resolve, reject) => {
|
||||||
idToken: token,
|
https
|
||||||
audience: clientId,
|
.request(
|
||||||
|
{
|
||||||
|
method: "GET",
|
||||||
|
hostname: "www.googleapis.com",
|
||||||
|
path: "/oauth2/v3/userinfo",
|
||||||
|
headers: {
|
||||||
|
Authorization: `Bearer ${token}`,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
(res) => {
|
||||||
|
let data = "";
|
||||||
|
res.on("data", (chunk) => {
|
||||||
|
data += chunk;
|
||||||
|
});
|
||||||
|
res.on("end", () => {
|
||||||
|
resolve(/** @type {any} */ (EJSON.parse(data)));
|
||||||
|
});
|
||||||
|
}
|
||||||
|
)
|
||||||
|
.end();
|
||||||
});
|
});
|
||||||
|
|
||||||
if (!ticket?.getPayload()?.email_verified) {
|
if (!gUser?.email_verified) throw new Error("No Google User.");
|
||||||
return {
|
|
||||||
success: false,
|
|
||||||
user: null,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
const payload = ticket.getPayload();
|
|
||||||
|
|
||||||
if (!payload) throw new Error("No Payload");
|
|
||||||
|
|
||||||
////////////////////////////////////////
|
////////////////////////////////////////
|
||||||
////////////////////////////////////////
|
////////////////////////////////////////
|
||||||
@ -47,10 +55,8 @@ module.exports = async function apiGoogleLogin({
|
|||||||
*
|
*
|
||||||
* @description Create new user folder and file
|
* @description Create new user folder and file
|
||||||
*/
|
*/
|
||||||
const targetDbName = `datasquirel_user_${userId}_${database}`;
|
|
||||||
|
|
||||||
const { given_name, family_name, email, sub, picture, email_verified } =
|
const { given_name, family_name, email, sub, picture } = gUser;
|
||||||
payload;
|
|
||||||
|
|
||||||
/** @type {Object<string, any>} */
|
/** @type {Object<string, any>} */
|
||||||
const payloadObject = {
|
const payloadObject = {
|
||||||
@ -64,15 +70,8 @@ module.exports = async function apiGoogleLogin({
|
|||||||
username: `google-user-${sub}`,
|
username: `google-user-${sub}`,
|
||||||
};
|
};
|
||||||
|
|
||||||
if (additionalFields && Object.keys(additionalFields).length > 0) {
|
|
||||||
Object.keys(additionalFields).forEach((key) => {
|
|
||||||
payloadObject[key] = additionalFields[key];
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
const loggedInGoogleUser = await handleSocialDb({
|
const loggedInGoogleUser = await handleSocialDb({
|
||||||
res,
|
database,
|
||||||
database: targetDbName,
|
|
||||||
email: email || "",
|
email: email || "",
|
||||||
payload: payloadObject,
|
payload: payloadObject,
|
||||||
social_platform: "google",
|
social_platform: "google",
|
||||||
@ -84,5 +83,14 @@ module.exports = async function apiGoogleLogin({
|
|||||||
////////////////////////////////////////
|
////////////////////////////////////////
|
||||||
////////////////////////////////////////
|
////////////////////////////////////////
|
||||||
|
|
||||||
return { success: true, ...loggedInGoogleUser, dsqlUserId: userId };
|
return { ...loggedInGoogleUser };
|
||||||
|
} catch (/** @type {any} */ error) {
|
||||||
|
console.log(`apo-google-login.js ERROR: ${error.message}`);
|
||||||
|
|
||||||
|
return {
|
||||||
|
success: false,
|
||||||
|
user: undefined,
|
||||||
|
msg: error.message,
|
||||||
|
};
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
@ -1,10 +1,11 @@
|
|||||||
declare function _exports({ query, user }: {
|
declare function _exports({ query, user, useLocal }: {
|
||||||
query: {
|
query: {
|
||||||
invite: number;
|
invite: number;
|
||||||
database_access: string;
|
database_access: string;
|
||||||
priviledge: string;
|
priviledge: string;
|
||||||
email: string;
|
email: string;
|
||||||
};
|
};
|
||||||
user: import("../../types").UserType;
|
useLocal?: boolean;
|
||||||
|
user: import("../../types").DATASQUIREL_LoggedInUser;
|
||||||
}): Promise<any>;
|
}): Promise<any>;
|
||||||
export = _exports;
|
export = _exports;
|
||||||
|
@ -3,13 +3,7 @@
|
|||||||
const serverError = require("./serverError");
|
const serverError = require("./serverError");
|
||||||
const DB_HANDLER = require("../../utils/backend/global-db/DB_HANDLER");
|
const DB_HANDLER = require("../../utils/backend/global-db/DB_HANDLER");
|
||||||
const addDbEntry = require("./db/addDbEntry");
|
const addDbEntry = require("./db/addDbEntry");
|
||||||
|
const LOCAL_DB_HANDLER = require("../../utils/backend/global-db/LOCAL_DB_HANDLER");
|
||||||
/** ****************************************************************************** */
|
|
||||||
/** ****************************************************************************** */
|
|
||||||
/** ****************************************************************************** */
|
|
||||||
/** ****************************************************************************** */
|
|
||||||
/** ****************************************************************************** */
|
|
||||||
/** ****************************************************************************** */
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Add Admin User on Login
|
* Add Admin User on Login
|
||||||
@ -27,32 +21,23 @@ const addDbEntry = require("./db/addDbEntry");
|
|||||||
* @param {string} params.query.priviledge - String containing databases priviledges
|
* @param {string} params.query.priviledge - String containing databases priviledges
|
||||||
* @param {string} params.query.email - Inviting user email address
|
* @param {string} params.query.email - Inviting user email address
|
||||||
*
|
*
|
||||||
* @param {import("../../types").UserType} params.user - invited user object
|
* @param {boolean} [params.useLocal]
|
||||||
|
* @param {import("../../types").DATASQUIREL_LoggedInUser} params.user - invited user object
|
||||||
*
|
*
|
||||||
* @returns {Promise<any>} new user auth object payload
|
* @returns {Promise<any>} new user auth object payload
|
||||||
*/
|
*/
|
||||||
module.exports = async function addAdminUserOnLogin({ query, user }) {
|
module.exports = async function addAdminUserOnLogin({ query, user, useLocal }) {
|
||||||
try {
|
try {
|
||||||
/**
|
const finalDbHandler = useLocal ? LOCAL_DB_HANDLER : DB_HANDLER;
|
||||||
* Fetch user
|
|
||||||
*
|
|
||||||
* @description Fetch user from db
|
|
||||||
*/ // @ts-ignore
|
|
||||||
const { invite, database_access, priviledge, email } = query;
|
const { invite, database_access, priviledge, email } = query;
|
||||||
|
|
||||||
const lastInviteTimeArray = await DB_HANDLER(
|
const lastInviteTimeQuery = `SELECT date_created_code FROM invitations WHERE inviting_user_id=? AND invited_user_email=?`;
|
||||||
`SELECT date_created_code FROM invitations WHERE inviting_user_id=? AND invited_user_email=?`,
|
const lastInviteTimeValues = [invite, email];
|
||||||
[invite, email]
|
|
||||||
);
|
|
||||||
|
|
||||||
// if (lastInviteTimeArray && lastInviteTimeArray[0]?.date_created_code) {
|
const lastInviteTimeArray = await finalDbHandler(
|
||||||
// const timeSinceLastInvite = Date.now() - parseInt(lastInviteTimeArray[0].date_created_code);
|
lastInviteTimeQuery,
|
||||||
// if (timeSinceLastInvite > 21600000) {
|
lastInviteTimeValues
|
||||||
// throw new Error("Invitation expired");
|
);
|
||||||
// }
|
|
||||||
// } else if (!lastInviteTimeArray || !lastInviteTimeArray[0]) {
|
|
||||||
// throw new Error("No Invitation Found");
|
|
||||||
// }
|
|
||||||
|
|
||||||
if (!lastInviteTimeArray || !lastInviteTimeArray[0]) {
|
if (!lastInviteTimeArray || !lastInviteTimeArray[0]) {
|
||||||
throw new Error("No Invitation Found");
|
throw new Error("No Invitation Found");
|
||||||
@ -62,14 +47,16 @@ module.exports = async function addAdminUserOnLogin({ query, user }) {
|
|||||||
////////////////////////////////////////////////
|
////////////////////////////////////////////////
|
||||||
////////////////////////////////////////////////
|
////////////////////////////////////////////////
|
||||||
|
|
||||||
// @ts-ignore
|
const invitingUserDbQuery = `SELECT first_name,last_name,email FROM users WHERE id=?`;
|
||||||
const invitingUserDb = await DB_HANDLER(
|
const invitingUserDbValues = [invite];
|
||||||
`SELECT first_name,last_name,email FROM users WHERE id=?`,
|
|
||||||
[invite]
|
const invitingUserDb = await finalDbHandler(
|
||||||
|
invitingUserDbQuery,
|
||||||
|
invitingUserDbValues
|
||||||
);
|
);
|
||||||
|
|
||||||
if (invitingUserDb?.[0]) {
|
if (invitingUserDb?.[0]) {
|
||||||
const existingUserUser = await DB_HANDLER(
|
const existingUserUser = await finalDbHandler(
|
||||||
`SELECT email FROM user_users WHERE user_id=? AND invited_user_id=? AND user_type='admin' AND email=?`,
|
`SELECT email FROM user_users WHERE user_id=? AND invited_user_id=? AND user_type='admin' AND email=?`,
|
||||||
[invite, user.id, email]
|
[invite, user.id, email]
|
||||||
);
|
);
|
||||||
@ -77,25 +64,6 @@ module.exports = async function addAdminUserOnLogin({ query, user }) {
|
|||||||
if (existingUserUser?.[0]) {
|
if (existingUserUser?.[0]) {
|
||||||
console.log("User already added");
|
console.log("User already added");
|
||||||
} else {
|
} else {
|
||||||
// const newUserUser = await DB_HANDLER(
|
|
||||||
// `INSERT IGNORE INTO user_users
|
|
||||||
// (user_id, invited_user_id, database_access, first_name, last_name, phone, email, username, user_type, user_priviledge)
|
|
||||||
// VALUES
|
|
||||||
// (?,?,?,?,?,?,?,?,?,?)
|
|
||||||
// )`,
|
|
||||||
// [
|
|
||||||
// invite,
|
|
||||||
// user.id,
|
|
||||||
// database_access,
|
|
||||||
// user.first_name,
|
|
||||||
// user.last_name,
|
|
||||||
// user.phone,
|
|
||||||
// user.email,
|
|
||||||
// user.username,
|
|
||||||
// "admin",
|
|
||||||
// priviledge,
|
|
||||||
// ]
|
|
||||||
// );
|
|
||||||
addDbEntry({
|
addDbEntry({
|
||||||
dbFullName: "datasquirel",
|
dbFullName: "datasquirel",
|
||||||
tableName: "user_users",
|
tableName: "user_users",
|
||||||
@ -113,20 +81,19 @@ module.exports = async function addAdminUserOnLogin({ query, user }) {
|
|||||||
image: user.image,
|
image: user.image,
|
||||||
image_thumbnail: user.image_thumbnail,
|
image_thumbnail: user.image_thumbnail,
|
||||||
},
|
},
|
||||||
|
useLocal,
|
||||||
});
|
});
|
||||||
|
|
||||||
////////////////////////////////////////////////
|
////////////////////////////////////////////////
|
||||||
////////////////////////////////////////////////
|
////////////////////////////////////////////////
|
||||||
////////////////////////////////////////////////
|
////////////////////////////////////////////////
|
||||||
|
|
||||||
// @ts-ignore
|
const dbTableData = await finalDbHandler(
|
||||||
const dbTableData = await DB_HANDLER(
|
|
||||||
`SELECT db_tables_data FROM invitations WHERE inviting_user_id=? AND invited_user_email=?`,
|
`SELECT db_tables_data FROM invitations WHERE inviting_user_id=? AND invited_user_email=?`,
|
||||||
[invite, email]
|
[invite, email]
|
||||||
);
|
);
|
||||||
|
|
||||||
// @ts-ignore
|
const clearEntries = await finalDbHandler(
|
||||||
const clearEntries = await DB_HANDLER(
|
|
||||||
`DELETE FROM delegated_user_tables WHERE root_user_id=? AND delegated_user_id=?`,
|
`DELETE FROM delegated_user_tables WHERE root_user_id=? AND delegated_user_id=?`,
|
||||||
[invite, user.id]
|
[invite, user.id]
|
||||||
);
|
);
|
||||||
@ -154,17 +121,13 @@ module.exports = async function addAdminUserOnLogin({ query, user }) {
|
|||||||
table: table_slug,
|
table: table_slug,
|
||||||
priviledge: priviledge,
|
priviledge: priviledge,
|
||||||
},
|
},
|
||||||
|
useLocal,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
////////////////////////////////////////////////
|
|
||||||
////////////////////////////////////////////////
|
|
||||||
////////////////////////////////////////////////
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// @ts-ignore
|
const inviteAccepted = await finalDbHandler(
|
||||||
const inviteAccepted = await DB_HANDLER(
|
|
||||||
`UPDATE invitations SET invitation_status='Accepted' WHERE inviting_user_id=? AND invited_user_email=?`,
|
`UPDATE invitations SET invitation_status='Accepted' WHERE inviting_user_id=? AND invited_user_email=?`,
|
||||||
[invite, email]
|
[invite, email]
|
||||||
);
|
);
|
||||||
|
@ -1,6 +1,9 @@
|
|||||||
declare function _exports({ userId, database, useLocal, }: {
|
declare function _exports({ userId, database, useLocal, payload, }: {
|
||||||
userId: number;
|
userId: number;
|
||||||
database: string;
|
database: string;
|
||||||
useLocal?: boolean;
|
useLocal?: boolean;
|
||||||
|
payload?: {
|
||||||
|
[x: string]: any;
|
||||||
|
};
|
||||||
}): Promise<any>;
|
}): Promise<any>;
|
||||||
export = _exports;
|
export = _exports;
|
||||||
|
@ -10,6 +10,7 @@ const { default: setUserSchemaData } = require("./setUserSchemaData");
|
|||||||
const addDbEntry = require("./db/addDbEntry");
|
const addDbEntry = require("./db/addDbEntry");
|
||||||
const createDbFromSchema = require("../../shell/createDbFromSchema");
|
const createDbFromSchema = require("../../shell/createDbFromSchema");
|
||||||
const LOCAL_DB_HANDLER = require("../../utils/backend/global-db/LOCAL_DB_HANDLER");
|
const LOCAL_DB_HANDLER = require("../../utils/backend/global-db/LOCAL_DB_HANDLER");
|
||||||
|
const grabNewUsersTableSchema = require("./grabNewUsersTableSchema");
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* # Add User Table to Database
|
* # Add User Table to Database
|
||||||
@ -18,6 +19,7 @@ const LOCAL_DB_HANDLER = require("../../utils/backend/global-db/LOCAL_DB_HANDLER
|
|||||||
* @param {number} params.userId - user id
|
* @param {number} params.userId - user id
|
||||||
* @param {string} params.database
|
* @param {string} params.database
|
||||||
* @param {boolean} [params.useLocal]
|
* @param {boolean} [params.useLocal]
|
||||||
|
* @param {Object<string, any>} [params.payload] - payload object
|
||||||
*
|
*
|
||||||
* @returns {Promise<any>} new user auth object payload
|
* @returns {Promise<any>} new user auth object payload
|
||||||
*/
|
*/
|
||||||
@ -25,39 +27,30 @@ module.exports = async function addUsersTableToDb({
|
|||||||
userId,
|
userId,
|
||||||
database,
|
database,
|
||||||
useLocal,
|
useLocal,
|
||||||
|
payload,
|
||||||
}) {
|
}) {
|
||||||
/**
|
|
||||||
* Initialize
|
|
||||||
*
|
|
||||||
* @description Initialize
|
|
||||||
*/
|
|
||||||
const dbFullName = `datasquirel_user_${userId}_${database}`;
|
|
||||||
/** @type {import("../../types").DSQL_TableSchemaType} */
|
|
||||||
const userPreset = require("../../data/presets/users.json");
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
/**
|
const dbFullName = database;
|
||||||
* Fetch user
|
|
||||||
*
|
const userPreset = grabNewUsersTableSchema({ payload });
|
||||||
* @description Fetch user from db
|
if (!userPreset) throw new Error("Couldn't Get User Preset!");
|
||||||
*/
|
|
||||||
const userSchemaData = grabUserSchemaData({ userId });
|
const userSchemaData = grabUserSchemaData({ userId });
|
||||||
if (!userSchemaData) throw new Error("User schema data not found!");
|
if (!userSchemaData) throw new Error("User schema data not found!");
|
||||||
|
|
||||||
let targetDatabase = userSchemaData.filter(
|
let targetDatabase = userSchemaData.find(
|
||||||
(db) => db.dbSlug === database
|
(db) => db.dbFullName === database
|
||||||
)[0];
|
);
|
||||||
|
|
||||||
let existingTableIndex;
|
if (!targetDatabase) {
|
||||||
// @ts-ignore
|
throw new Error("Couldn't Find Target Database!");
|
||||||
let existingTable = targetDatabase.tables.filter((table, index) => {
|
|
||||||
if (table.tableName === "users") {
|
|
||||||
existingTableIndex = index;
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
});
|
|
||||||
|
|
||||||
if (existingTable && existingTable[0] && existingTableIndex) {
|
let existingTableIndex = targetDatabase?.tables.findIndex(
|
||||||
|
(table) => table.tableName === "users"
|
||||||
|
);
|
||||||
|
|
||||||
|
if (typeof existingTableIndex == "number" && existingTableIndex > 0) {
|
||||||
targetDatabase.tables[existingTableIndex] = userPreset;
|
targetDatabase.tables[existingTableIndex] = userPreset;
|
||||||
} else {
|
} else {
|
||||||
targetDatabase.tables.push(userPreset);
|
targetDatabase.tables.push(userPreset);
|
||||||
@ -65,6 +58,7 @@ module.exports = async function addUsersTableToDb({
|
|||||||
|
|
||||||
setUserSchemaData({ schemaData: userSchemaData, userId });
|
setUserSchemaData({ schemaData: userSchemaData, userId });
|
||||||
|
|
||||||
|
/** @type {any[] | null} */
|
||||||
const targetDb = useLocal
|
const targetDb = useLocal
|
||||||
? await LOCAL_DB_HANDLER(
|
? await LOCAL_DB_HANDLER(
|
||||||
`SELECT id FROM user_databases WHERE user_id=? AND db_slug=?`,
|
`SELECT id FROM user_databases WHERE user_id=? AND db_slug=?`,
|
||||||
@ -75,14 +69,14 @@ module.exports = async function addUsersTableToDb({
|
|||||||
[userId, database]
|
[userId, database]
|
||||||
);
|
);
|
||||||
|
|
||||||
if (targetDb && targetDb[0]) {
|
if (targetDb?.[0]) {
|
||||||
const newTableEntry = await addDbEntry({
|
const newTableEntry = await addDbEntry({
|
||||||
dbFullName: "datasquirel",
|
dbFullName: "datasquirel",
|
||||||
tableName: "user_database_tables",
|
tableName: "user_database_tables",
|
||||||
data: {
|
data: {
|
||||||
user_id: userId,
|
user_id: userId,
|
||||||
db_id: targetDb[0].id,
|
db_id: targetDb[0].id,
|
||||||
db_slug: database,
|
db_slug: targetDatabase.dbSlug,
|
||||||
table_name: "Users",
|
table_name: "Users",
|
||||||
table_slug: "users",
|
table_slug: "users",
|
||||||
},
|
},
|
||||||
@ -97,6 +91,8 @@ module.exports = async function addUsersTableToDb({
|
|||||||
|
|
||||||
return `Done!`;
|
return `Done!`;
|
||||||
} catch (/** @type {any} */ error) {
|
} catch (/** @type {any} */ error) {
|
||||||
|
console.log(`addUsersTableToDb.js ERROR: ${error.message}`);
|
||||||
|
|
||||||
serverError({
|
serverError({
|
||||||
component: "addUsersTableToDb",
|
component: "addUsersTableToDb",
|
||||||
message: error.message,
|
message: error.message,
|
||||||
|
26
package-shared/functions/backend/auth/write-auth-files.d.ts
vendored
Normal file
26
package-shared/functions/backend/auth/write-auth-files.d.ts
vendored
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
export function grabAuthDirs(): {
|
||||||
|
root: string;
|
||||||
|
auth: string;
|
||||||
|
};
|
||||||
|
export function initAuthFiles(): boolean;
|
||||||
|
/**
|
||||||
|
* # Write Auth Files
|
||||||
|
* @param {string} name
|
||||||
|
* @param {string} data
|
||||||
|
*/
|
||||||
|
export function writeAuthFile(name: string, data: string): boolean;
|
||||||
|
/**
|
||||||
|
* # Get Auth Files
|
||||||
|
* @param {string} name
|
||||||
|
*/
|
||||||
|
export function getAuthFile(name: string): string;
|
||||||
|
/**
|
||||||
|
* # Delete Auth Files
|
||||||
|
* @param {string} name
|
||||||
|
*/
|
||||||
|
export function deleteAuthFile(name: string): void;
|
||||||
|
/**
|
||||||
|
* # Delete Auth Files
|
||||||
|
* @param {string} name
|
||||||
|
*/
|
||||||
|
export function checkAuthFile(name: string): boolean;
|
90
package-shared/functions/backend/auth/write-auth-files.js
Normal file
90
package-shared/functions/backend/auth/write-auth-files.js
Normal file
@ -0,0 +1,90 @@
|
|||||||
|
// @ts-check
|
||||||
|
|
||||||
|
const fs = require("fs");
|
||||||
|
const path = require("path");
|
||||||
|
|
||||||
|
const grabAuthDirs = () => {
|
||||||
|
const ROOT_DIR = path.resolve(process.cwd(), "./.tmp");
|
||||||
|
const AUTH_DIR = path.join(ROOT_DIR, "logins");
|
||||||
|
|
||||||
|
return { root: ROOT_DIR, auth: AUTH_DIR };
|
||||||
|
};
|
||||||
|
|
||||||
|
const initAuthFiles = () => {
|
||||||
|
try {
|
||||||
|
const authDirs = grabAuthDirs();
|
||||||
|
|
||||||
|
if (!fs.existsSync(authDirs.root))
|
||||||
|
fs.mkdirSync(authDirs.root, { recursive: true });
|
||||||
|
if (!fs.existsSync(authDirs.auth))
|
||||||
|
fs.mkdirSync(authDirs.auth, { recursive: true });
|
||||||
|
return true;
|
||||||
|
} catch (/** @type {any} */ error) {
|
||||||
|
console.log(`Error initializing Auth Files: ${error.message}`);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* # Write Auth Files
|
||||||
|
* @param {string} name
|
||||||
|
* @param {string} data
|
||||||
|
*/
|
||||||
|
const writeAuthFile = (name, data) => {
|
||||||
|
initAuthFiles();
|
||||||
|
try {
|
||||||
|
fs.writeFileSync(path.join(grabAuthDirs().auth, name), data);
|
||||||
|
return true;
|
||||||
|
} catch (/** @type {any} */ error) {
|
||||||
|
console.log(`Error writing Auth File: ${error.message}`);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* # Get Auth Files
|
||||||
|
* @param {string} name
|
||||||
|
*/
|
||||||
|
const getAuthFile = (name) => {
|
||||||
|
try {
|
||||||
|
const authFilePath = path.join(grabAuthDirs().auth, name);
|
||||||
|
return fs.readFileSync(authFilePath, "utf-8");
|
||||||
|
} catch (/** @type {any} */ error) {
|
||||||
|
console.log(`Error getting Auth File: ${error.message}`);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* # Delete Auth Files
|
||||||
|
* @param {string} name
|
||||||
|
*/
|
||||||
|
const deleteAuthFile = (name) => {
|
||||||
|
try {
|
||||||
|
return fs.rmSync(path.join(grabAuthDirs().auth, name));
|
||||||
|
} catch (/** @type {any} */ error) {
|
||||||
|
console.log(`Error deleting Auth File: ${error.message}`);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* # Delete Auth Files
|
||||||
|
* @param {string} name
|
||||||
|
*/
|
||||||
|
const checkAuthFile = (name) => {
|
||||||
|
try {
|
||||||
|
return fs.existsSync(path.join(grabAuthDirs().auth, name));
|
||||||
|
return true;
|
||||||
|
} catch (/** @type {any} */ error) {
|
||||||
|
console.log(`Error checking Auth File: ${error.message}`);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
exports.grabAuthDirs = grabAuthDirs;
|
||||||
|
exports.initAuthFiles = initAuthFiles;
|
||||||
|
exports.writeAuthFile = writeAuthFile;
|
||||||
|
exports.getAuthFile = getAuthFile;
|
||||||
|
exports.deleteAuthFile = deleteAuthFile;
|
||||||
|
exports.checkAuthFile = checkAuthFile;
|
@ -1,4 +1,7 @@
|
|||||||
declare function _exports(): {
|
declare function _exports(params?: {
|
||||||
|
database?: string;
|
||||||
|
userId?: string | number;
|
||||||
|
}): {
|
||||||
keyCookieName: string;
|
keyCookieName: string;
|
||||||
csrfCookieName: string;
|
csrfCookieName: string;
|
||||||
};
|
};
|
||||||
|
@ -1,10 +1,28 @@
|
|||||||
module.exports = function getAuthCookieNames() {
|
// @ts-check
|
||||||
|
|
||||||
|
/**
|
||||||
|
* # Grab Auth Cookie Names
|
||||||
|
*
|
||||||
|
* @param {object} [params]
|
||||||
|
* @param {string} [params.database]
|
||||||
|
* @param {string | number} [params.userId]
|
||||||
|
*
|
||||||
|
* @returns {{ keyCookieName: string, csrfCookieName: string }}
|
||||||
|
*/
|
||||||
|
module.exports = function getAuthCookieNames(params) {
|
||||||
const cookiesPrefix = process.env.DSQL_COOKIES_PREFIX || "dsql_";
|
const cookiesPrefix = process.env.DSQL_COOKIES_PREFIX || "dsql_";
|
||||||
const cookiesKeyName = process.env.DSQL_COOKIES_KEY_NAME || "key";
|
const cookiesKeyName = process.env.DSQL_COOKIES_KEY_NAME || "key";
|
||||||
const cookiesCSRFName = process.env.DSQL_COOKIES_CSRF_NAME || "csrf";
|
const cookiesCSRFName = process.env.DSQL_COOKIES_CSRF_NAME || "csrf";
|
||||||
|
|
||||||
const keyCookieName = cookiesPrefix + cookiesKeyName;
|
let keyCookieName = cookiesPrefix;
|
||||||
const csrfCookieName = cookiesPrefix + cookiesCSRFName;
|
if (params?.userId) keyCookieName += `user_${params.userId}_`;
|
||||||
|
if (params?.database) keyCookieName += `${params.database}_`;
|
||||||
|
keyCookieName += cookiesKeyName;
|
||||||
|
|
||||||
|
let csrfCookieName = cookiesPrefix;
|
||||||
|
if (params?.userId) csrfCookieName += `user_${params.userId}_`;
|
||||||
|
if (params?.database) csrfCookieName += `${params.database}_`;
|
||||||
|
csrfCookieName += cookiesCSRFName;
|
||||||
|
|
||||||
return {
|
return {
|
||||||
keyCookieName,
|
keyCookieName,
|
||||||
|
6
package-shared/functions/backend/grabNewUsersTableSchema.d.ts
vendored
Normal file
6
package-shared/functions/backend/grabNewUsersTableSchema.d.ts
vendored
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
declare function _exports(params?: {
|
||||||
|
payload?: {
|
||||||
|
[x: string]: any;
|
||||||
|
};
|
||||||
|
}): import("../../types").DSQL_TableSchemaType | null;
|
||||||
|
export = _exports;
|
54
package-shared/functions/backend/grabNewUsersTableSchema.js
Executable file
54
package-shared/functions/backend/grabNewUsersTableSchema.js
Executable file
@ -0,0 +1,54 @@
|
|||||||
|
// @ts-check
|
||||||
|
|
||||||
|
const grabSchemaFieldsFromData = require("./grabSchemaFieldsFromData");
|
||||||
|
const serverError = require("./serverError");
|
||||||
|
|
||||||
|
/**
|
||||||
|
* # Add User Table to Database
|
||||||
|
*
|
||||||
|
* @param {object} [params]
|
||||||
|
* @param {Object<string,any>} [params.payload] - fields to add to the table
|
||||||
|
*
|
||||||
|
* @returns {import("../../types").DSQL_TableSchemaType | null} new user auth object payload
|
||||||
|
*/
|
||||||
|
module.exports = function grabNewUsersTableSchema(params) {
|
||||||
|
try {
|
||||||
|
/** @type {import("../../types").DSQL_TableSchemaType} */
|
||||||
|
const userPreset = require("../../data/presets/users.json");
|
||||||
|
/** @type {import("../../types").DSQL_FieldSchemaType[]} */
|
||||||
|
const defaultFields = require("../../data/defaultFields.json");
|
||||||
|
|
||||||
|
const supplementalFields = params?.payload
|
||||||
|
? grabSchemaFieldsFromData({
|
||||||
|
data: params?.payload,
|
||||||
|
excludeData: defaultFields,
|
||||||
|
excludeFields: userPreset.fields,
|
||||||
|
})
|
||||||
|
: [];
|
||||||
|
|
||||||
|
console.log("supplementalFields", supplementalFields);
|
||||||
|
|
||||||
|
const allFields = [...userPreset.fields, ...supplementalFields];
|
||||||
|
|
||||||
|
console.log("allFields", allFields);
|
||||||
|
|
||||||
|
const finalFields = [
|
||||||
|
...defaultFields.slice(0, 2),
|
||||||
|
...allFields,
|
||||||
|
...defaultFields.slice(2),
|
||||||
|
];
|
||||||
|
|
||||||
|
userPreset.fields = [...finalFields];
|
||||||
|
|
||||||
|
return userPreset;
|
||||||
|
} catch (/** @type {any} */ error) {
|
||||||
|
console.log(`grabNewUsersTableSchema.js ERROR: ${error.message}`);
|
||||||
|
|
||||||
|
serverError({
|
||||||
|
component: "grabNewUsersTableSchema",
|
||||||
|
message: error.message,
|
||||||
|
});
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
};
|
11
package-shared/functions/backend/grabSchemaFieldsFromData.d.ts
vendored
Normal file
11
package-shared/functions/backend/grabSchemaFieldsFromData.d.ts
vendored
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
declare function _exports({ data, fields, excludeData, excludeFields, }: {
|
||||||
|
data?: {
|
||||||
|
[x: string]: any;
|
||||||
|
};
|
||||||
|
fields?: string[];
|
||||||
|
excludeData?: {
|
||||||
|
[x: string]: any;
|
||||||
|
};
|
||||||
|
excludeFields?: import("../../types").DSQL_FieldSchemaType[];
|
||||||
|
}): import("../../types").DSQL_FieldSchemaType[];
|
||||||
|
export = _exports;
|
94
package-shared/functions/backend/grabSchemaFieldsFromData.js
Executable file
94
package-shared/functions/backend/grabSchemaFieldsFromData.js
Executable file
@ -0,0 +1,94 @@
|
|||||||
|
// @ts-check
|
||||||
|
|
||||||
|
const serverError = require("./serverError");
|
||||||
|
|
||||||
|
/**
|
||||||
|
* # Add User Table to Database
|
||||||
|
*
|
||||||
|
* @param {object} params
|
||||||
|
* @param {Object<string,any>} [params.data]
|
||||||
|
* @param {string[]} [params.fields]
|
||||||
|
* @param {Object<string,any>} [params.excludeData]
|
||||||
|
* @param {import("../../types").DSQL_FieldSchemaType[]} [params.excludeFields]
|
||||||
|
*
|
||||||
|
* @returns {import("../../types").DSQL_FieldSchemaType[]} new user auth object payload
|
||||||
|
*/
|
||||||
|
module.exports = function grabSchemaFieldsFromData({
|
||||||
|
data,
|
||||||
|
fields,
|
||||||
|
excludeData,
|
||||||
|
excludeFields,
|
||||||
|
}) {
|
||||||
|
try {
|
||||||
|
const possibleFields = require("../../data/possibleFields.json");
|
||||||
|
const dataTypes = require("../../data/dataTypes.json");
|
||||||
|
|
||||||
|
/** @type {import("../../types").DSQL_FieldSchemaType[]} */
|
||||||
|
const finalFields = [];
|
||||||
|
|
||||||
|
/** @type {string[]} */
|
||||||
|
let filteredFields = [];
|
||||||
|
|
||||||
|
if (data && Object.keys(data)?.[0]) {
|
||||||
|
filteredFields = Object.keys(data);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (fields) {
|
||||||
|
filteredFields = [...filteredFields, ...fields];
|
||||||
|
filteredFields = [...new Set(filteredFields)];
|
||||||
|
}
|
||||||
|
|
||||||
|
filteredFields = filteredFields
|
||||||
|
.filter(
|
||||||
|
(fld) => !excludeData || !Object.keys(excludeData).includes(fld)
|
||||||
|
)
|
||||||
|
.filter(
|
||||||
|
(fld) =>
|
||||||
|
!excludeFields ||
|
||||||
|
!excludeFields.find((exlFld) => exlFld.fieldName == fld)
|
||||||
|
);
|
||||||
|
|
||||||
|
filteredFields.forEach((fld) => {
|
||||||
|
const value = data ? data[fld] : null;
|
||||||
|
|
||||||
|
if (typeof value == "string") {
|
||||||
|
const newField =
|
||||||
|
/** @type {import("../../types").DSQL_FieldSchemaType} */ ({
|
||||||
|
fieldName: fld,
|
||||||
|
dataType: value.length > 255 ? "TEXT" : "VARCHAR(255)",
|
||||||
|
});
|
||||||
|
|
||||||
|
if (Boolean(value.match(/<[^>]+>/g))) {
|
||||||
|
newField.richText = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
finalFields.push(newField);
|
||||||
|
} else if (typeof value == "number") {
|
||||||
|
finalFields.push(
|
||||||
|
/** @type {import("../../types").DSQL_FieldSchemaType} */ ({
|
||||||
|
fieldName: fld,
|
||||||
|
dataType: "INT",
|
||||||
|
})
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
finalFields.push(
|
||||||
|
/** @type {import("../../types").DSQL_FieldSchemaType} */ ({
|
||||||
|
fieldName: fld,
|
||||||
|
dataType: "VARCHAR(255)",
|
||||||
|
})
|
||||||
|
);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
return finalFields;
|
||||||
|
} catch (/** @type {any} */ error) {
|
||||||
|
console.log(`grabSchemaFieldsFromData.js ERROR: ${error.message}`);
|
||||||
|
|
||||||
|
serverError({
|
||||||
|
component: "grabSchemaFieldsFromData.js",
|
||||||
|
message: error.message,
|
||||||
|
});
|
||||||
|
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
};
|
@ -1,31 +0,0 @@
|
|||||||
// @ts-check
|
|
||||||
|
|
||||||
const { createHmac } = require("crypto");
|
|
||||||
//
|
|
||||||
|
|
||||||
/**
|
|
||||||
* # Password Hash function
|
|
||||||
* @param {string} password
|
|
||||||
* @returns
|
|
||||||
*/
|
|
||||||
function hashPassword(password) {
|
|
||||||
const hmac = createHmac(
|
|
||||||
"sha512",
|
|
||||||
process.env.DSQL_ENCRYPTION_PASSWORD || ""
|
|
||||||
);
|
|
||||||
hmac.update(password);
|
|
||||||
let hashed = hmac.digest("base64");
|
|
||||||
return hashed;
|
|
||||||
}
|
|
||||||
|
|
||||||
exports.hashPassword = hashPassword;
|
|
||||||
|
|
||||||
// export const comparePasswords = async (password) => {
|
|
||||||
// const hmac = createHmac("sha512", process.env.DSQL_ENCRYPTION_PASSWORD);
|
|
||||||
// hmac.update(password);
|
|
||||||
// let hashed = hmac.digest("base64");
|
|
||||||
|
|
||||||
// let dbPass = await global.DB_HANDLER(`SELECT * FROM users WHERE password = '${hashed}'`);
|
|
||||||
// console.log(dbPass);
|
|
||||||
// return dbPass;
|
|
||||||
// };
|
|
@ -1,24 +1,11 @@
|
|||||||
// @ts-check
|
// @ts-check
|
||||||
|
|
||||||
/**
|
|
||||||
* ==============================================================================
|
|
||||||
* Imports
|
|
||||||
* ==============================================================================
|
|
||||||
*/
|
|
||||||
const fs = require("fs");
|
const fs = require("fs");
|
||||||
const { IncomingMessage } = require("http");
|
const { IncomingMessage } = require("http");
|
||||||
|
|
||||||
/** ****************************************************************************** */
|
|
||||||
/** ****************************************************************************** */
|
|
||||||
/** ****************************************************************************** */
|
|
||||||
/** ****************************************************************************** */
|
|
||||||
/** ****************************************************************************** */
|
|
||||||
/** ****************************************************************************** */
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* ==============================================================================
|
* # Server Error
|
||||||
* Main Function
|
*
|
||||||
* ==============================================================================
|
|
||||||
* @param {{
|
* @param {{
|
||||||
* user?: { id?: number | string, first_name?: string, last_name?: string, email?: string } & *,
|
* user?: { id?: number | string, first_name?: string, last_name?: string, email?: string } & *,
|
||||||
* message: string,
|
* message: string,
|
||||||
|
9
package-shared/functions/backend/updateUsersTableSchema.d.ts
vendored
Normal file
9
package-shared/functions/backend/updateUsersTableSchema.d.ts
vendored
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
declare function _exports({ userId, database, newFields, newPayload, }: {
|
||||||
|
userId: number | string;
|
||||||
|
database: string;
|
||||||
|
newFields?: string[];
|
||||||
|
newPayload?: {
|
||||||
|
[x: string]: any;
|
||||||
|
};
|
||||||
|
}): Promise<any>;
|
||||||
|
export = _exports;
|
80
package-shared/functions/backend/updateUsersTableSchema.js
Executable file
80
package-shared/functions/backend/updateUsersTableSchema.js
Executable file
@ -0,0 +1,80 @@
|
|||||||
|
// @ts-check
|
||||||
|
|
||||||
|
const serverError = require("./serverError");
|
||||||
|
const { default: grabUserSchemaData } = require("./grabUserSchemaData");
|
||||||
|
const { default: setUserSchemaData } = require("./setUserSchemaData");
|
||||||
|
const createDbFromSchema = require("../../shell/createDbFromSchema");
|
||||||
|
const grabSchemaFieldsFromData = require("./grabSchemaFieldsFromData");
|
||||||
|
|
||||||
|
/**
|
||||||
|
* # Add User Table to Database
|
||||||
|
*
|
||||||
|
* @param {object} params
|
||||||
|
* @param {number | string} params.userId - user id
|
||||||
|
* @param {string} params.database
|
||||||
|
* @param {string[]} [params.newFields] - new fields to add to the users table
|
||||||
|
* @param {Object<string, any>} [params.newPayload]
|
||||||
|
*
|
||||||
|
* @returns {Promise<any>} new user auth object payload
|
||||||
|
*/
|
||||||
|
module.exports = async function updateUsersTableSchema({
|
||||||
|
userId,
|
||||||
|
database,
|
||||||
|
newFields,
|
||||||
|
newPayload,
|
||||||
|
}) {
|
||||||
|
try {
|
||||||
|
const dbFullName = database;
|
||||||
|
|
||||||
|
const userSchemaData = grabUserSchemaData({ userId });
|
||||||
|
if (!userSchemaData) throw new Error("User schema data not found!");
|
||||||
|
|
||||||
|
let targetDatabaseIndex = userSchemaData.findIndex(
|
||||||
|
(db) => db.dbFullName === database
|
||||||
|
);
|
||||||
|
|
||||||
|
if (targetDatabaseIndex < 0) {
|
||||||
|
throw new Error("Couldn't Find Target Database!");
|
||||||
|
}
|
||||||
|
|
||||||
|
let existingTableIndex = userSchemaData[
|
||||||
|
targetDatabaseIndex
|
||||||
|
]?.tables.findIndex((table) => table.tableName === "users");
|
||||||
|
|
||||||
|
const usersTable =
|
||||||
|
userSchemaData[targetDatabaseIndex].tables[existingTableIndex];
|
||||||
|
|
||||||
|
if (!usersTable?.fields?.[0]) throw new Error("Users Table Not Found!");
|
||||||
|
|
||||||
|
const additionalFields = grabSchemaFieldsFromData({
|
||||||
|
fields: newFields,
|
||||||
|
data: newPayload,
|
||||||
|
});
|
||||||
|
|
||||||
|
const spliceStartIndex = usersTable.fields.findIndex(
|
||||||
|
(field) => field.fieldName === "date_created"
|
||||||
|
);
|
||||||
|
const finalSpliceStartIndex =
|
||||||
|
spliceStartIndex >= 0 ? spliceStartIndex : 0;
|
||||||
|
|
||||||
|
usersTable.fields.splice(finalSpliceStartIndex, 0, ...additionalFields);
|
||||||
|
|
||||||
|
setUserSchemaData({ schemaData: userSchemaData, userId });
|
||||||
|
|
||||||
|
const dbShellUpdate = await createDbFromSchema({
|
||||||
|
userId,
|
||||||
|
targetDatabase: dbFullName,
|
||||||
|
});
|
||||||
|
|
||||||
|
return `Done!`;
|
||||||
|
} catch (/** @type {any} */ error) {
|
||||||
|
console.log(`addUsersTableToDb.js ERROR: ${error.message}`);
|
||||||
|
|
||||||
|
serverError({
|
||||||
|
component: "addUsersTableToDb",
|
||||||
|
message: error.message,
|
||||||
|
user: { id: userId },
|
||||||
|
});
|
||||||
|
return error.message;
|
||||||
|
}
|
||||||
|
};
|
@ -1,7 +1,8 @@
|
|||||||
declare function _exports({ queryString, queryValuesArray, database, tableSchema, }: {
|
declare function _exports({ queryString, queryValuesArray, database, tableSchema, useLocal, }: {
|
||||||
queryString: string;
|
queryString: string;
|
||||||
queryValuesArray?: any[];
|
queryValuesArray?: any[];
|
||||||
database?: string;
|
database?: string;
|
||||||
tableSchema?: import("../../types").DSQL_TableSchemaType;
|
tableSchema?: import("../../types").DSQL_TableSchemaType;
|
||||||
|
useLocal?: boolean;
|
||||||
}): Promise<any>;
|
}): Promise<any>;
|
||||||
export = _exports;
|
export = _exports;
|
||||||
|
@ -5,6 +5,7 @@ const parseDbResults = require("./parseDbResults");
|
|||||||
const serverError = require("./serverError");
|
const serverError = require("./serverError");
|
||||||
const DB_HANDLER = require("../../utils/backend/global-db/DB_HANDLER");
|
const DB_HANDLER = require("../../utils/backend/global-db/DB_HANDLER");
|
||||||
const DSQL_USER_DB_HANDLER = require("../../utils/backend/global-db/DSQL_USER_DB_HANDLER");
|
const DSQL_USER_DB_HANDLER = require("../../utils/backend/global-db/DSQL_USER_DB_HANDLER");
|
||||||
|
const LOCAL_DB_HANDLER = require("../../utils/backend/global-db/LOCAL_DB_HANDLER");
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* DB handler for specific database
|
* DB handler for specific database
|
||||||
@ -15,6 +16,7 @@ const DSQL_USER_DB_HANDLER = require("../../utils/backend/global-db/DSQL_USER_DB
|
|||||||
* @param {*[]} [params.queryValuesArray] - Values Array
|
* @param {*[]} [params.queryValuesArray] - Values Array
|
||||||
* @param {string} [params.database] - Database name
|
* @param {string} [params.database] - Database name
|
||||||
* @param {import("../../types").DSQL_TableSchemaType} [params.tableSchema] - Table schema
|
* @param {import("../../types").DSQL_TableSchemaType} [params.tableSchema] - Table schema
|
||||||
|
* @param {boolean} [params.useLocal]
|
||||||
* @returns {Promise<any>}
|
* @returns {Promise<any>}
|
||||||
*/
|
*/
|
||||||
module.exports = async function varDatabaseDbHandler({
|
module.exports = async function varDatabaseDbHandler({
|
||||||
@ -22,6 +24,7 @@ module.exports = async function varDatabaseDbHandler({
|
|||||||
queryValuesArray,
|
queryValuesArray,
|
||||||
database,
|
database,
|
||||||
tableSchema,
|
tableSchema,
|
||||||
|
useLocal,
|
||||||
}) {
|
}) {
|
||||||
/**
|
/**
|
||||||
* Declare variables
|
* Declare variables
|
||||||
@ -31,7 +34,11 @@ module.exports = async function varDatabaseDbHandler({
|
|||||||
const isMaster = database?.match(/^datasquirel$/) ? true : false;
|
const isMaster = database?.match(/^datasquirel$/) ? true : false;
|
||||||
|
|
||||||
/** @type {any} */
|
/** @type {any} */
|
||||||
const FINAL_DB_HANDLER = isMaster ? DB_HANDLER : DSQL_USER_DB_HANDLER;
|
const FINAL_DB_HANDLER = useLocal
|
||||||
|
? LOCAL_DB_HANDLER
|
||||||
|
: isMaster
|
||||||
|
? DB_HANDLER
|
||||||
|
: DSQL_USER_DB_HANDLER;
|
||||||
|
|
||||||
let results;
|
let results;
|
||||||
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
declare function _exports({ password, encryptionKey }: {
|
declare function _exports({ password, encryptionKey }: {
|
||||||
password: string;
|
password: string;
|
||||||
encryptionKey: string;
|
encryptionKey?: string;
|
||||||
}): string;
|
}): string;
|
||||||
export = _exports;
|
export = _exports;
|
||||||
|
@ -1,13 +1,3 @@
|
|||||||
/** # MODULE TRACE
|
|
||||||
======================================================================
|
|
||||||
* Detected 4 files that call this module. The files are listed below:
|
|
||||||
======================================================================
|
|
||||||
* `require` Statement Found in [add-user.js] => file:///d:\GitHub\dsql\engine\user\add-user.js
|
|
||||||
* `require` Statement Found in [login-user.js] => file:///d:\GitHub\dsql\engine\user\login-user.js
|
|
||||||
* `require` Statement Found in [googleLogin.js] => file:///d:\GitHub\dsql\engine\user\social\utils\googleLogin.js
|
|
||||||
* `require` Statement Found in [update-user.js] => file:///d:\GitHub\dsql\engine\user\update-user.js
|
|
||||||
==== MODULE TRACE END ==== */
|
|
||||||
|
|
||||||
// @ts-check
|
// @ts-check
|
||||||
|
|
||||||
const { createHmac } = require("crypto");
|
const { createHmac } = require("crypto");
|
||||||
@ -16,11 +6,18 @@ const { createHmac } = require("crypto");
|
|||||||
* # Hash password Function
|
* # Hash password Function
|
||||||
* @param {object} param0
|
* @param {object} param0
|
||||||
* @param {string} param0.password - Password to hash
|
* @param {string} param0.password - Password to hash
|
||||||
* @param {string} param0.encryptionKey - Encryption key
|
* @param {string} [param0.encryptionKey] - Encryption key
|
||||||
* @returns {string}
|
* @returns {string}
|
||||||
*/
|
*/
|
||||||
module.exports = function hashPassword({ password, encryptionKey }) {
|
module.exports = function hashPassword({ password, encryptionKey }) {
|
||||||
const hmac = createHmac("sha512", encryptionKey);
|
const finalEncryptionKey =
|
||||||
|
encryptionKey || process.env.DSQL_ENCRYPTION_PASSWORD;
|
||||||
|
|
||||||
|
if (!finalEncryptionKey?.match(/.{8,}/)) {
|
||||||
|
throw new Error("Encryption key is invalid");
|
||||||
|
}
|
||||||
|
|
||||||
|
const hmac = createHmac("sha512", finalEncryptionKey);
|
||||||
hmac.update(password);
|
hmac.update(password);
|
||||||
let hashed = hmac.digest("base64");
|
let hashed = hmac.digest("base64");
|
||||||
return hashed;
|
return hashed;
|
||||||
|
2
package-shared/shell/createDbFromSchema.d.ts
vendored
2
package-shared/shell/createDbFromSchema.d.ts
vendored
@ -1,7 +1,7 @@
|
|||||||
export = createDbFromSchema;
|
export = createDbFromSchema;
|
||||||
/**
|
/**
|
||||||
* Create database from Schema Function
|
* Create database from Schema Function
|
||||||
* ==============================================================================
|
* =============================================
|
||||||
* @param {object} params - Single object params
|
* @param {object} params - Single object params
|
||||||
* @param {number|string|null} [params.userId] - User ID or null
|
* @param {number|string|null} [params.userId] - User ID or null
|
||||||
* @param {string} [params.targetDatabase] - User Database full name
|
* @param {string} [params.targetDatabase] - User Database full name
|
||||||
|
@ -16,7 +16,7 @@ const execFlag = process.argv.find((arg) => arg === "--exec");
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Create database from Schema Function
|
* Create database from Schema Function
|
||||||
* ==============================================================================
|
* =============================================
|
||||||
* @param {object} params - Single object params
|
* @param {object} params - Single object params
|
||||||
* @param {number|string|null} [params.userId] - User ID or null
|
* @param {number|string|null} [params.userId] - User ID or null
|
||||||
* @param {string} [params.targetDatabase] - User Database full name
|
* @param {string} [params.targetDatabase] - User Database full name
|
||||||
|
@ -96,6 +96,8 @@ module.exports = async function createTable({
|
|||||||
////////////////////////////////////////
|
////////////////////////////////////////
|
||||||
|
|
||||||
let primaryKeySet = false;
|
let primaryKeySet = false;
|
||||||
|
|
||||||
|
/** @type {import("../../types").DSQL_FieldSchemaType[]} */
|
||||||
let foreignKeys = [];
|
let foreignKeys = [];
|
||||||
|
|
||||||
////////////////////////////////////////
|
////////////////////////////////////////
|
||||||
@ -130,8 +132,7 @@ module.exports = async function createTable({
|
|||||||
|
|
||||||
if (foreignKey) {
|
if (foreignKey) {
|
||||||
foreignKeys.push({
|
foreignKeys.push({
|
||||||
fieldName: fieldName,
|
...column,
|
||||||
...foreignKey,
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -161,14 +162,14 @@ module.exports = async function createTable({
|
|||||||
|
|
||||||
if (foreignKeys[0]) {
|
if (foreignKeys[0]) {
|
||||||
foreignKeys.forEach((foreighKey, index, array) => {
|
foreignKeys.forEach((foreighKey, index, array) => {
|
||||||
const {
|
const fieldName = foreighKey.fieldName;
|
||||||
fieldName,
|
const destinationTableName =
|
||||||
destinationTableName,
|
foreighKey.foreignKey?.destinationTableName;
|
||||||
destinationTableColumnName,
|
const destinationTableColumnName =
|
||||||
cascadeDelete,
|
foreighKey.foreignKey?.destinationTableColumnName;
|
||||||
cascadeUpdate,
|
const cascadeDelete = foreighKey.foreignKey?.cascadeDelete;
|
||||||
foreignKeyName,
|
const cascadeUpdate = foreighKey.foreignKey?.cascadeUpdate;
|
||||||
} = foreighKey;
|
const foreignKeyName = foreighKey.foreignKey?.foreignKeyName;
|
||||||
|
|
||||||
const comma = (() => {
|
const comma = (() => {
|
||||||
if (index === foreignKeys.length - 1) return "";
|
if (index === foreignKeys.length - 1) return "";
|
||||||
|
@ -60,6 +60,9 @@ module.exports = async function updateTable({
|
|||||||
* @description Initial setup
|
* @description Initial setup
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
/** @type {any[]} */
|
||||||
|
let errorLogs = [];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @description Initialize table info array. This value will be
|
* @description Initialize table info array. This value will be
|
||||||
* changing depending on if a field is renamed or not.
|
* changing depending on if a field is renamed or not.
|
||||||
@ -530,7 +533,7 @@ module.exports = async function updateTable({
|
|||||||
foreignKeyName,
|
foreignKeyName,
|
||||||
} = foreignKey;
|
} = foreignKey;
|
||||||
|
|
||||||
const foreinKeyText = `ADD CONSTRAINT \`${foreignKeyName}\` FOREIGN KEY (${fieldName}) REFERENCES ${destinationTableName}(${destinationTableColumnName})${
|
const foreinKeyText = `ADD CONSTRAINT \`${foreignKeyName}\` FOREIGN KEY (\`${fieldName}\`) REFERENCES \`${destinationTableName}\`(\`${destinationTableColumnName}\`)${
|
||||||
cascadeDelete ? " ON DELETE CASCADE" : ""
|
cascadeDelete ? " ON DELETE CASCADE" : ""
|
||||||
}${cascadeUpdate ? " ON UPDATE CASCADE" : ""}`;
|
}${cascadeUpdate ? " ON UPDATE CASCADE" : ""}`;
|
||||||
// const foreinKeyText = `ADD CONSTRAINT \`${foreignKeyName}\` FOREIGN KEY (${fieldName}) REFERENCES ${destinationTableName}(${destinationTableColumnName})${cascadeDelete ? " ON DELETE CASCADE" : ""}${cascadeUpdate ? " ON UPDATE CASCADE" : ""}` + ",";
|
// const foreinKeyText = `ADD CONSTRAINT \`${foreignKeyName}\` FOREIGN KEY (${fieldName}) REFERENCES ${destinationTableName}(${destinationTableColumnName})${cascadeDelete ? " ON DELETE CASCADE" : ""}${cascadeUpdate ? " ON UPDATE CASCADE" : ""}` + ",";
|
||||||
@ -541,6 +544,10 @@ module.exports = async function updateTable({
|
|||||||
database: dbFullName,
|
database: dbFullName,
|
||||||
queryString: finalQueryString,
|
queryString: finalQueryString,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
if (!addForeignKey?.serverStatus) {
|
||||||
|
errorLogs.push(addForeignKey);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
////////////////////////////////////////
|
////////////////////////////////////////
|
||||||
|
155
package-shared/types/index.d.ts
vendored
155
package-shared/types/index.d.ts
vendored
@ -1,4 +1,3 @@
|
|||||||
import type { ServerResponse } from "http";
|
|
||||||
import { Editor } from "tinymce";
|
import { Editor } from "tinymce";
|
||||||
export type DSQL_DatabaseFullName = string;
|
export type DSQL_DatabaseFullName = string;
|
||||||
export interface DSQL_DatabaseSchemaType {
|
export interface DSQL_DatabaseSchemaType {
|
||||||
@ -165,7 +164,8 @@ export interface SerializeQueryParams {
|
|||||||
query: any;
|
query: any;
|
||||||
}
|
}
|
||||||
export type DATASQUIREL_LoggedInUser = {
|
export type DATASQUIREL_LoggedInUser = {
|
||||||
id?: number;
|
id: number;
|
||||||
|
uuid?: string;
|
||||||
first_name: string;
|
first_name: string;
|
||||||
last_name: string;
|
last_name: string;
|
||||||
email: string;
|
email: string;
|
||||||
@ -174,32 +174,13 @@ export type DATASQUIREL_LoggedInUser = {
|
|||||||
username?: string;
|
username?: string;
|
||||||
image?: string;
|
image?: string;
|
||||||
image_thumbnail?: string;
|
image_thumbnail?: string;
|
||||||
address?: string;
|
|
||||||
city?: string;
|
|
||||||
state?: string;
|
|
||||||
country?: string;
|
|
||||||
zip_code?: string;
|
|
||||||
social_login?: number;
|
social_login?: number;
|
||||||
social_platform?: string;
|
social_platform?: string;
|
||||||
social_id?: string;
|
social_id?: string;
|
||||||
more_user_data?: string;
|
|
||||||
verification_status?: number;
|
verification_status?: number;
|
||||||
loan_officer_id?: number;
|
csrf_k: string;
|
||||||
is_admin?: number;
|
logged_in_status: boolean;
|
||||||
admin_level?: number;
|
date: number;
|
||||||
admin_permissions?: string;
|
|
||||||
uuid?: string;
|
|
||||||
temp_login_code?: string;
|
|
||||||
date_created?: string;
|
|
||||||
date_created_code?: number;
|
|
||||||
date_created_timestamp?: string;
|
|
||||||
date_updated?: string;
|
|
||||||
date_updated_code?: number;
|
|
||||||
date_updated_timestamp?: string;
|
|
||||||
csrf_k?: string;
|
|
||||||
logged_in_status?: boolean;
|
|
||||||
date?: number;
|
|
||||||
more_data?: any;
|
|
||||||
} & {
|
} & {
|
||||||
[key: string]: any;
|
[key: string]: any;
|
||||||
};
|
};
|
||||||
@ -208,6 +189,7 @@ export interface AuthenticatedUser {
|
|||||||
payload: DATASQUIREL_LoggedInUser | null;
|
payload: DATASQUIREL_LoggedInUser | null;
|
||||||
msg?: string;
|
msg?: string;
|
||||||
userId?: number;
|
userId?: number;
|
||||||
|
cookieNames?: any;
|
||||||
}
|
}
|
||||||
export interface SuccessUserObject {
|
export interface SuccessUserObject {
|
||||||
id: number;
|
id: number;
|
||||||
@ -322,25 +304,7 @@ export interface PostInsertReturn {
|
|||||||
protocol41: boolean;
|
protocol41: boolean;
|
||||||
changedRows: number;
|
changedRows: number;
|
||||||
}
|
}
|
||||||
export interface UserType {
|
export type UserType = DATASQUIREL_LoggedInUser;
|
||||||
id: number;
|
|
||||||
stripe_id?: string;
|
|
||||||
first_name: string;
|
|
||||||
last_name: string;
|
|
||||||
email: string;
|
|
||||||
bio?: string;
|
|
||||||
username?: string;
|
|
||||||
image: string;
|
|
||||||
image_thumbnail: string;
|
|
||||||
social_id?: string;
|
|
||||||
verification_status?: number;
|
|
||||||
social_platform?: string;
|
|
||||||
social_login?: number;
|
|
||||||
date?: number;
|
|
||||||
phone?: number | string;
|
|
||||||
csrf_k: string;
|
|
||||||
logged_in_status: boolean;
|
|
||||||
}
|
|
||||||
export interface ApiKeyDef {
|
export interface ApiKeyDef {
|
||||||
name: string;
|
name: string;
|
||||||
scope: string;
|
scope: string;
|
||||||
@ -1061,6 +1025,10 @@ export type APILoginFunctionReturn = {
|
|||||||
msg?: string;
|
msg?: string;
|
||||||
payload?: DATASQUIREL_LoggedInUser | null;
|
payload?: DATASQUIREL_LoggedInUser | null;
|
||||||
userId?: number | string;
|
userId?: number | string;
|
||||||
|
key?: string;
|
||||||
|
token?: string;
|
||||||
|
csrf?: string;
|
||||||
|
cookieNames?: any;
|
||||||
};
|
};
|
||||||
export type APILoginFunction = (params: APILoginFunctionParams) => Promise<APILoginFunctionReturn>;
|
export type APILoginFunction = (params: APILoginFunctionParams) => Promise<APILoginFunctionReturn>;
|
||||||
export type APICreateUserFunctionParams = {
|
export type APICreateUserFunctionParams = {
|
||||||
@ -1085,14 +1053,9 @@ export type APIGetUserFunction = (params: APIGetUserFunctionParams) => Promise<G
|
|||||||
* API Google Login Function
|
* API Google Login Function
|
||||||
*/
|
*/
|
||||||
export type APIGoogleLoginFunctionParams = {
|
export type APIGoogleLoginFunctionParams = {
|
||||||
clientId: string;
|
|
||||||
token: string;
|
token: string;
|
||||||
database: string;
|
database: string;
|
||||||
userId: string | number;
|
additionalFields?: string[];
|
||||||
additionalFields?: {
|
|
||||||
[key: string]: any;
|
|
||||||
};
|
|
||||||
res: any;
|
|
||||||
};
|
};
|
||||||
export type APIGoogleLoginFunctionReturn = {
|
export type APIGoogleLoginFunctionReturn = {
|
||||||
dsqlUserId?: number | string;
|
dsqlUserId?: number | string;
|
||||||
@ -1107,15 +1070,14 @@ export type HandleSocialDbFunctionParams = {
|
|||||||
email: string;
|
email: string;
|
||||||
social_platform: string;
|
social_platform: string;
|
||||||
payload: any;
|
payload: any;
|
||||||
res?: ServerResponse;
|
|
||||||
invitation?: any;
|
invitation?: any;
|
||||||
supEmail?: string;
|
supEmail?: string;
|
||||||
additionalFields?: object;
|
additionalFields?: string[];
|
||||||
useLocal?: boolean;
|
useLocal?: boolean;
|
||||||
};
|
};
|
||||||
export type HandleSocialDbFunctionReturn = {
|
export type HandleSocialDbFunctionReturn = {
|
||||||
success: boolean;
|
success: boolean;
|
||||||
user?: null;
|
user?: DATASQUIREL_LoggedInUser | null;
|
||||||
msg?: string;
|
msg?: string;
|
||||||
social_id?: string | number;
|
social_id?: string | number;
|
||||||
social_platform?: string;
|
social_platform?: string;
|
||||||
@ -1137,7 +1099,7 @@ export type HandleSocialDbFunctionReturn = {
|
|||||||
*
|
*
|
||||||
* @returns {Promise<HandleSocialDbFunctionReturn>} - Response object
|
* @returns {Promise<HandleSocialDbFunctionReturn>} - Response object
|
||||||
*/
|
*/
|
||||||
export type HandleSocialDbFunction = (params: HandleSocialDbFunctionParams) => Promise<HandleSocialDbFunctionReturn>;
|
export type HandleSocialDbFunction = (params: HandleSocialDbFunctionParams) => Promise<APILoginFunctionReturn>;
|
||||||
export type ApiReauthUserReturn = {
|
export type ApiReauthUserReturn = {
|
||||||
success: boolean;
|
success: boolean;
|
||||||
payload?: {
|
payload?: {
|
||||||
@ -1146,4 +1108,91 @@ export type ApiReauthUserReturn = {
|
|||||||
msg?: string;
|
msg?: string;
|
||||||
userId?: string | number;
|
userId?: string | number;
|
||||||
};
|
};
|
||||||
|
export type GoogleAccessTokenObject = {
|
||||||
|
access_token: string;
|
||||||
|
token_type: "Bearer";
|
||||||
|
expires_in: number;
|
||||||
|
scope: string;
|
||||||
|
authuser: string;
|
||||||
|
prompt: string;
|
||||||
|
};
|
||||||
|
export type GoogleOauth2User = {
|
||||||
|
sub: string;
|
||||||
|
name: string;
|
||||||
|
given_name: string;
|
||||||
|
family_name: string;
|
||||||
|
picture: string;
|
||||||
|
email: string;
|
||||||
|
email_verified: boolean;
|
||||||
|
};
|
||||||
|
export interface AceEditorOptions {
|
||||||
|
animatedScroll?: boolean;
|
||||||
|
autoScrollEditorIntoView?: boolean;
|
||||||
|
behavioursEnabled?: boolean;
|
||||||
|
copyWithEmptySelection?: boolean;
|
||||||
|
cursorStyle?: "ace" | "slim" | "smooth" | "wide";
|
||||||
|
customScrollbar?: boolean;
|
||||||
|
displayIndentGuides?: boolean;
|
||||||
|
dragDelay?: number;
|
||||||
|
dragEnabled?: boolean;
|
||||||
|
enableAutoIndent?: boolean;
|
||||||
|
enableBasicAutocompletion?: boolean | any[];
|
||||||
|
enableKeyboardAccessibility?: boolean;
|
||||||
|
enableLiveAutocompletion?: boolean | any[];
|
||||||
|
enableMobileMenu?: boolean;
|
||||||
|
enableMultiselect?: boolean;
|
||||||
|
enableSnippets?: boolean;
|
||||||
|
fadeFoldWidgets?: boolean;
|
||||||
|
firstLineNumber?: number;
|
||||||
|
fixedWidthGutter?: boolean;
|
||||||
|
focusTimeout?: number;
|
||||||
|
foldStyle?: "markbegin" | "markbeginend" | "manual";
|
||||||
|
fontFamily?: string;
|
||||||
|
fontSize?: number;
|
||||||
|
hScrollBarAlwaysVisible?: boolean;
|
||||||
|
hasCssTransforms?: boolean;
|
||||||
|
highlightActiveLine?: boolean;
|
||||||
|
highlightGutterLine?: boolean;
|
||||||
|
highlightIndentGuides?: boolean;
|
||||||
|
highlightSelectedWord?: boolean;
|
||||||
|
indentedSoftWrap?: boolean;
|
||||||
|
keyboardHandler?: string;
|
||||||
|
liveAutocompletionDelay?: number;
|
||||||
|
liveAutocompletionThreshold?: number;
|
||||||
|
maxLines?: number;
|
||||||
|
maxPixelHeight?: number;
|
||||||
|
mergeUndoDeltas?: boolean | "always";
|
||||||
|
minLines?: number;
|
||||||
|
mode?: string;
|
||||||
|
navigateWithinSoftTabs?: boolean;
|
||||||
|
newLineMode?: AceAjax.NewLineMode;
|
||||||
|
overwrite?: boolean;
|
||||||
|
placeholder?: string;
|
||||||
|
printMargin?: number | boolean;
|
||||||
|
printMarginColumn?: number;
|
||||||
|
readOnly?: boolean;
|
||||||
|
relativeLineNumbers?: boolean;
|
||||||
|
scrollPastEnd?: number;
|
||||||
|
scrollSpeed?: number;
|
||||||
|
selectionStyle?: string;
|
||||||
|
session?: any;
|
||||||
|
showFoldWidgets?: boolean;
|
||||||
|
showFoldedAnnotations?: boolean;
|
||||||
|
showGutter?: boolean;
|
||||||
|
showInvisibles?: boolean;
|
||||||
|
showLineNumbers?: boolean;
|
||||||
|
showPrintMargin?: boolean;
|
||||||
|
tabSize?: number;
|
||||||
|
textInputAriaLabel?: string;
|
||||||
|
theme?: string;
|
||||||
|
tooltipFollowsMouse?: boolean;
|
||||||
|
useSoftTabs?: boolean;
|
||||||
|
useSvgGutterIcons?: boolean;
|
||||||
|
useWorker?: boolean;
|
||||||
|
vScrollBarAlwaysVisible?: boolean;
|
||||||
|
value?: string;
|
||||||
|
wrap?: number | boolean | "off" | "free" | "printmargin";
|
||||||
|
wrapBehavioursEnabled?: boolean;
|
||||||
|
wrapMethod?: "code" | "text" | "auto";
|
||||||
|
}
|
||||||
export {};
|
export {};
|
||||||
|
@ -3,12 +3,6 @@ import type { IncomingMessage, ServerResponse } from "http";
|
|||||||
import { Editor } from "tinymce";
|
import { Editor } from "tinymce";
|
||||||
export type DSQL_DatabaseFullName = string;
|
export type DSQL_DatabaseFullName = string;
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////////
|
|
||||||
////////////////////////////////////////////////////////////////////////////////
|
|
||||||
////////////////////////////////////////////////////////////////////////////////
|
|
||||||
////////////////////////////////////////////////////////////////////////////////
|
|
||||||
////////////////////////////////////////////////////////////////////////////////
|
|
||||||
|
|
||||||
export interface DSQL_DatabaseSchemaType {
|
export interface DSQL_DatabaseSchemaType {
|
||||||
dbName: string;
|
dbName: string;
|
||||||
dbSlug: string;
|
dbSlug: string;
|
||||||
@ -26,8 +20,6 @@ export interface DSQL_ChildrenDatabaseObject {
|
|||||||
dbFullName: string;
|
dbFullName: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
////////////////////////////////////////
|
|
||||||
|
|
||||||
export interface DSQL_TableSchemaType {
|
export interface DSQL_TableSchemaType {
|
||||||
tableName: string;
|
tableName: string;
|
||||||
tableFullName: string;
|
tableFullName: string;
|
||||||
@ -48,8 +40,6 @@ export interface DSQL_ChildrenTablesType {
|
|||||||
tableNameFull?: string;
|
tableNameFull?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
////////////////////////////////////////
|
|
||||||
|
|
||||||
export interface DSQL_FieldSchemaType {
|
export interface DSQL_FieldSchemaType {
|
||||||
fieldName?: string;
|
fieldName?: string;
|
||||||
originName?: string;
|
originName?: string;
|
||||||
@ -92,8 +82,6 @@ export interface DSQL_ForeignKeyType {
|
|||||||
cascadeUpdate?: boolean;
|
cascadeUpdate?: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
////////////////////////////////////////
|
|
||||||
|
|
||||||
export interface DSQL_IndexSchemaType {
|
export interface DSQL_IndexSchemaType {
|
||||||
indexName?: string;
|
indexName?: string;
|
||||||
indexType?: string;
|
indexType?: string;
|
||||||
@ -118,8 +106,6 @@ export interface DSQL_MYSQL_SHOW_INDEXES_Type {
|
|||||||
Comment: string;
|
Comment: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
////////////////////////////////////////
|
|
||||||
|
|
||||||
export interface DSQL_MYSQL_SHOW_COLUMNS_Type {
|
export interface DSQL_MYSQL_SHOW_COLUMNS_Type {
|
||||||
Field: string;
|
Field: string;
|
||||||
Type: string;
|
Type: string;
|
||||||
@ -129,16 +115,12 @@ export interface DSQL_MYSQL_SHOW_COLUMNS_Type {
|
|||||||
Extra: string;
|
Extra: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
////////////////////////////////////////
|
|
||||||
|
|
||||||
export interface DSQL_MYSQL_FOREIGN_KEYS_Type {
|
export interface DSQL_MYSQL_FOREIGN_KEYS_Type {
|
||||||
CONSTRAINT_NAME: string;
|
CONSTRAINT_NAME: string;
|
||||||
CONSTRAINT_SCHEMA: string;
|
CONSTRAINT_SCHEMA: string;
|
||||||
TABLE_NAME: string;
|
TABLE_NAME: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
////////////////////////////////////////
|
|
||||||
|
|
||||||
export interface DSQL_MYSQL_user_databases_Type {
|
export interface DSQL_MYSQL_user_databases_Type {
|
||||||
id: number;
|
id: number;
|
||||||
user_id: number;
|
user_id: number;
|
||||||
@ -215,7 +197,8 @@ export interface SerializeQueryParams {
|
|||||||
// @ts-check
|
// @ts-check
|
||||||
|
|
||||||
export type DATASQUIREL_LoggedInUser = {
|
export type DATASQUIREL_LoggedInUser = {
|
||||||
id?: number;
|
id: number;
|
||||||
|
uuid?: string;
|
||||||
first_name: string;
|
first_name: string;
|
||||||
last_name: string;
|
last_name: string;
|
||||||
email: string;
|
email: string;
|
||||||
@ -224,32 +207,13 @@ export type DATASQUIREL_LoggedInUser = {
|
|||||||
username?: string;
|
username?: string;
|
||||||
image?: string;
|
image?: string;
|
||||||
image_thumbnail?: string;
|
image_thumbnail?: string;
|
||||||
address?: string;
|
|
||||||
city?: string;
|
|
||||||
state?: string;
|
|
||||||
country?: string;
|
|
||||||
zip_code?: string;
|
|
||||||
social_login?: number;
|
social_login?: number;
|
||||||
social_platform?: string;
|
social_platform?: string;
|
||||||
social_id?: string;
|
social_id?: string;
|
||||||
more_user_data?: string;
|
|
||||||
verification_status?: number;
|
verification_status?: number;
|
||||||
loan_officer_id?: number;
|
csrf_k: string;
|
||||||
is_admin?: number;
|
logged_in_status: boolean;
|
||||||
admin_level?: number;
|
date: number;
|
||||||
admin_permissions?: string;
|
|
||||||
uuid?: string;
|
|
||||||
temp_login_code?: string;
|
|
||||||
date_created?: string;
|
|
||||||
date_created_code?: number;
|
|
||||||
date_created_timestamp?: string;
|
|
||||||
date_updated?: string;
|
|
||||||
date_updated_code?: number;
|
|
||||||
date_updated_timestamp?: string;
|
|
||||||
csrf_k?: string;
|
|
||||||
logged_in_status?: boolean;
|
|
||||||
date?: number;
|
|
||||||
more_data?: any;
|
|
||||||
} & {
|
} & {
|
||||||
[key: string]: any;
|
[key: string]: any;
|
||||||
};
|
};
|
||||||
@ -259,6 +223,7 @@ export interface AuthenticatedUser {
|
|||||||
payload: DATASQUIREL_LoggedInUser | null;
|
payload: DATASQUIREL_LoggedInUser | null;
|
||||||
msg?: string;
|
msg?: string;
|
||||||
userId?: number;
|
userId?: number;
|
||||||
|
cookieNames?: any;
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface SuccessUserObject {
|
export interface SuccessUserObject {
|
||||||
@ -391,25 +356,7 @@ export interface PostInsertReturn {
|
|||||||
changedRows: number;
|
changedRows: number;
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface UserType {
|
export type UserType = DATASQUIREL_LoggedInUser;
|
||||||
id: number;
|
|
||||||
stripe_id?: string;
|
|
||||||
first_name: string;
|
|
||||||
last_name: string;
|
|
||||||
email: string;
|
|
||||||
bio?: string;
|
|
||||||
username?: string;
|
|
||||||
image: string;
|
|
||||||
image_thumbnail: string;
|
|
||||||
social_id?: string;
|
|
||||||
verification_status?: number;
|
|
||||||
social_platform?: string;
|
|
||||||
social_login?: number;
|
|
||||||
date?: number;
|
|
||||||
phone?: number | string;
|
|
||||||
csrf_k: string;
|
|
||||||
logged_in_status: boolean;
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface ApiKeyDef {
|
export interface ApiKeyDef {
|
||||||
name: string;
|
name: string;
|
||||||
@ -1278,6 +1225,10 @@ export type APILoginFunctionReturn = {
|
|||||||
msg?: string;
|
msg?: string;
|
||||||
payload?: DATASQUIREL_LoggedInUser | null;
|
payload?: DATASQUIREL_LoggedInUser | null;
|
||||||
userId?: number | string;
|
userId?: number | string;
|
||||||
|
key?: string;
|
||||||
|
token?: string;
|
||||||
|
csrf?: string;
|
||||||
|
cookieNames?: any;
|
||||||
};
|
};
|
||||||
export type APILoginFunction = (
|
export type APILoginFunction = (
|
||||||
params: APILoginFunctionParams
|
params: APILoginFunctionParams
|
||||||
@ -1313,12 +1264,9 @@ export type APIGetUserFunction = (
|
|||||||
* API Google Login Function
|
* API Google Login Function
|
||||||
*/
|
*/
|
||||||
export type APIGoogleLoginFunctionParams = {
|
export type APIGoogleLoginFunctionParams = {
|
||||||
clientId: string;
|
|
||||||
token: string;
|
token: string;
|
||||||
database: string;
|
database: string;
|
||||||
userId: string | number;
|
additionalFields?: string[];
|
||||||
additionalFields?: { [key: string]: any };
|
|
||||||
res: any;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
export type APIGoogleLoginFunctionReturn = {
|
export type APIGoogleLoginFunctionReturn = {
|
||||||
@ -1338,16 +1286,15 @@ export type HandleSocialDbFunctionParams = {
|
|||||||
email: string;
|
email: string;
|
||||||
social_platform: string;
|
social_platform: string;
|
||||||
payload: any;
|
payload: any;
|
||||||
res?: ServerResponse;
|
|
||||||
invitation?: any;
|
invitation?: any;
|
||||||
supEmail?: string;
|
supEmail?: string;
|
||||||
additionalFields?: object;
|
additionalFields?: string[];
|
||||||
useLocal?: boolean;
|
useLocal?: boolean;
|
||||||
};
|
};
|
||||||
|
|
||||||
export type HandleSocialDbFunctionReturn = {
|
export type HandleSocialDbFunctionReturn = {
|
||||||
success: boolean;
|
success: boolean;
|
||||||
user?: null;
|
user?: DATASQUIREL_LoggedInUser | null;
|
||||||
msg?: string;
|
msg?: string;
|
||||||
social_id?: string | number;
|
social_id?: string | number;
|
||||||
social_platform?: string;
|
social_platform?: string;
|
||||||
@ -1372,7 +1319,7 @@ export type HandleSocialDbFunctionReturn = {
|
|||||||
*/
|
*/
|
||||||
export type HandleSocialDbFunction = (
|
export type HandleSocialDbFunction = (
|
||||||
params: HandleSocialDbFunctionParams
|
params: HandleSocialDbFunctionParams
|
||||||
) => Promise<HandleSocialDbFunctionReturn>;
|
) => Promise<APILoginFunctionReturn>;
|
||||||
|
|
||||||
export type ApiReauthUserReturn = {
|
export type ApiReauthUserReturn = {
|
||||||
success: boolean;
|
success: boolean;
|
||||||
@ -1380,3 +1327,93 @@ export type ApiReauthUserReturn = {
|
|||||||
msg?: string;
|
msg?: string;
|
||||||
userId?: string | number;
|
userId?: string | number;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export type GoogleAccessTokenObject = {
|
||||||
|
access_token: string;
|
||||||
|
token_type: "Bearer";
|
||||||
|
expires_in: number;
|
||||||
|
scope: string;
|
||||||
|
authuser: string;
|
||||||
|
prompt: string;
|
||||||
|
};
|
||||||
|
|
||||||
|
export type GoogleOauth2User = {
|
||||||
|
sub: string;
|
||||||
|
name: string;
|
||||||
|
given_name: string;
|
||||||
|
family_name: string;
|
||||||
|
picture: string;
|
||||||
|
email: string;
|
||||||
|
email_verified: boolean;
|
||||||
|
};
|
||||||
|
|
||||||
|
export interface AceEditorOptions {
|
||||||
|
animatedScroll?: boolean;
|
||||||
|
autoScrollEditorIntoView?: boolean;
|
||||||
|
behavioursEnabled?: boolean;
|
||||||
|
copyWithEmptySelection?: boolean;
|
||||||
|
cursorStyle?: "ace" | "slim" | "smooth" | "wide";
|
||||||
|
customScrollbar?: boolean;
|
||||||
|
displayIndentGuides?: boolean;
|
||||||
|
dragDelay?: number;
|
||||||
|
dragEnabled?: boolean;
|
||||||
|
enableAutoIndent?: boolean;
|
||||||
|
enableBasicAutocompletion?: boolean | any[];
|
||||||
|
enableKeyboardAccessibility?: boolean;
|
||||||
|
enableLiveAutocompletion?: boolean | any[];
|
||||||
|
enableMobileMenu?: boolean;
|
||||||
|
enableMultiselect?: boolean;
|
||||||
|
enableSnippets?: boolean;
|
||||||
|
fadeFoldWidgets?: boolean;
|
||||||
|
firstLineNumber?: number;
|
||||||
|
fixedWidthGutter?: boolean;
|
||||||
|
focusTimeout?: number;
|
||||||
|
foldStyle?: "markbegin" | "markbeginend" | "manual";
|
||||||
|
fontFamily?: string;
|
||||||
|
fontSize?: number;
|
||||||
|
hScrollBarAlwaysVisible?: boolean;
|
||||||
|
hasCssTransforms?: boolean;
|
||||||
|
highlightActiveLine?: boolean;
|
||||||
|
highlightGutterLine?: boolean;
|
||||||
|
highlightIndentGuides?: boolean;
|
||||||
|
highlightSelectedWord?: boolean;
|
||||||
|
indentedSoftWrap?: boolean;
|
||||||
|
keyboardHandler?: string;
|
||||||
|
liveAutocompletionDelay?: number;
|
||||||
|
liveAutocompletionThreshold?: number;
|
||||||
|
maxLines?: number;
|
||||||
|
maxPixelHeight?: number;
|
||||||
|
mergeUndoDeltas?: boolean | "always";
|
||||||
|
minLines?: number;
|
||||||
|
mode?: string;
|
||||||
|
navigateWithinSoftTabs?: boolean;
|
||||||
|
newLineMode?: AceAjax.NewLineMode;
|
||||||
|
overwrite?: boolean;
|
||||||
|
placeholder?: string;
|
||||||
|
printMargin?: number | boolean;
|
||||||
|
printMarginColumn?: number;
|
||||||
|
readOnly?: boolean;
|
||||||
|
relativeLineNumbers?: boolean;
|
||||||
|
scrollPastEnd?: number;
|
||||||
|
scrollSpeed?: number;
|
||||||
|
selectionStyle?: string;
|
||||||
|
session?: any;
|
||||||
|
showFoldWidgets?: boolean;
|
||||||
|
showFoldedAnnotations?: boolean;
|
||||||
|
showGutter?: boolean;
|
||||||
|
showInvisibles?: boolean;
|
||||||
|
showLineNumbers?: boolean;
|
||||||
|
showPrintMargin?: boolean;
|
||||||
|
tabSize?: number;
|
||||||
|
textInputAriaLabel?: string;
|
||||||
|
theme?: string;
|
||||||
|
tooltipFollowsMouse?: boolean;
|
||||||
|
useSoftTabs?: boolean;
|
||||||
|
useSvgGutterIcons?: boolean;
|
||||||
|
useWorker?: boolean;
|
||||||
|
vScrollBarAlwaysVisible?: boolean;
|
||||||
|
value?: string;
|
||||||
|
wrap?: number | boolean | "off" | "free" | "printmargin";
|
||||||
|
wrapBehavioursEnabled?: boolean;
|
||||||
|
wrapMethod?: "code" | "text" | "auto";
|
||||||
|
}
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@moduletrace/datasquirel",
|
"name": "@moduletrace/datasquirel",
|
||||||
"version": "2.7.7",
|
"version": "2.7.8",
|
||||||
"description": "Cloud-based SQL data management tool",
|
"description": "Cloud-based SQL data management tool",
|
||||||
"main": "index.js",
|
"main": "index.js",
|
||||||
"bin": {
|
"bin": {
|
||||||
|
4
users/add-user.d.ts
vendored
4
users/add-user.d.ts
vendored
@ -5,7 +5,7 @@ export = addUser;
|
|||||||
* @async
|
* @async
|
||||||
*
|
*
|
||||||
* @param {object} param - Single object passed
|
* @param {object} param - Single object passed
|
||||||
* @param {string} param.key - FULL ACCESS API Key
|
* @param {string} [param.key] - FULL ACCESS API Key
|
||||||
* @param {string} param.database - Database Name
|
* @param {string} param.database - Database Name
|
||||||
* @param {import("../package-shared/types").UserDataPayload} param.payload - User Data Payload
|
* @param {import("../package-shared/types").UserDataPayload} param.payload - User Data Payload
|
||||||
* @param {string} [param.encryptionKey]
|
* @param {string} [param.encryptionKey]
|
||||||
@ -17,7 +17,7 @@ export = addUser;
|
|||||||
* @returns { Promise<import("../package-shared/types").AddUserFunctionReturn> }
|
* @returns { Promise<import("../package-shared/types").AddUserFunctionReturn> }
|
||||||
*/
|
*/
|
||||||
declare function addUser({ key, payload, database, encryptionKey, user_id, useLocal, apiUserId, }: {
|
declare function addUser({ key, payload, database, encryptionKey, user_id, useLocal, apiUserId, }: {
|
||||||
key: string;
|
key?: string;
|
||||||
database: string;
|
database: string;
|
||||||
payload: import("../package-shared/types").UserDataPayload;
|
payload: import("../package-shared/types").UserDataPayload;
|
||||||
encryptionKey?: string;
|
encryptionKey?: string;
|
||||||
|
@ -11,7 +11,7 @@ const apiCreateUser = require("../package-shared/functions/api/users/api-create-
|
|||||||
* @async
|
* @async
|
||||||
*
|
*
|
||||||
* @param {object} param - Single object passed
|
* @param {object} param - Single object passed
|
||||||
* @param {string} param.key - FULL ACCESS API Key
|
* @param {string} [param.key] - FULL ACCESS API Key
|
||||||
* @param {string} param.database - Database Name
|
* @param {string} param.database - Database Name
|
||||||
* @param {import("../package-shared/types").UserDataPayload} param.payload - User Data Payload
|
* @param {import("../package-shared/types").UserDataPayload} param.payload - User Data Payload
|
||||||
* @param {string} [param.encryptionKey]
|
* @param {string} [param.encryptionKey]
|
||||||
|
21
users/delete-user.d.ts
vendored
Normal file
21
users/delete-user.d.ts
vendored
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
export = deleteUser;
|
||||||
|
/**
|
||||||
|
* # Update User
|
||||||
|
* @async
|
||||||
|
*
|
||||||
|
* @param {object} params - API Key
|
||||||
|
* @param {String} [params.key] - API Key
|
||||||
|
* @param {String} params.database - Target Database
|
||||||
|
* @param {String | number} params.deletedUserId - Target Database
|
||||||
|
* @param {boolean} [params.user_id] - User ID
|
||||||
|
* @param {boolean} [params.useLocal]
|
||||||
|
*
|
||||||
|
* @returns { Promise<import("../package-shared/types").UpdateUserFunctionReturn>}
|
||||||
|
*/
|
||||||
|
declare function deleteUser({ key, database, user_id, useLocal, deletedUserId }: {
|
||||||
|
key?: string;
|
||||||
|
database: string;
|
||||||
|
deletedUserId: string | number;
|
||||||
|
user_id?: boolean;
|
||||||
|
useLocal?: boolean;
|
||||||
|
}): Promise<import("../package-shared/types").UpdateUserFunctionReturn>;
|
127
users/delete-user.js
Normal file
127
users/delete-user.js
Normal file
@ -0,0 +1,127 @@
|
|||||||
|
// @ts-check
|
||||||
|
|
||||||
|
const http = require("http");
|
||||||
|
const https = require("https");
|
||||||
|
const path = require("path");
|
||||||
|
const fs = require("fs");
|
||||||
|
const grabHostNames = require("../package-shared/utils/grab-host-names");
|
||||||
|
const apiUpdateUser = require("../package-shared/functions/api/users/api-update-user");
|
||||||
|
const apiDeleteUser = require("../package-shared/functions/api/users/api-delete-user");
|
||||||
|
|
||||||
|
/**
|
||||||
|
* # Update User
|
||||||
|
* @async
|
||||||
|
*
|
||||||
|
* @param {object} params - API Key
|
||||||
|
* @param {String} [params.key] - API Key
|
||||||
|
* @param {String} params.database - Target Database
|
||||||
|
* @param {String | number} params.deletedUserId - Target Database
|
||||||
|
* @param {boolean} [params.user_id] - User ID
|
||||||
|
* @param {boolean} [params.useLocal]
|
||||||
|
*
|
||||||
|
* @returns { Promise<import("../package-shared/types").UpdateUserFunctionReturn>}
|
||||||
|
*/
|
||||||
|
async function deleteUser({ key, database, user_id, useLocal, deletedUserId }) {
|
||||||
|
/**
|
||||||
|
* Check for local DB settings
|
||||||
|
*
|
||||||
|
* @description Look for local db settings in `.env` file and by pass the http request if available
|
||||||
|
*/
|
||||||
|
const { DSQL_HOST, DSQL_USER, DSQL_PASS, DSQL_DB_NAME } = process.env;
|
||||||
|
|
||||||
|
const grabedHostNames = grabHostNames();
|
||||||
|
const { host, port, scheme } = grabedHostNames;
|
||||||
|
|
||||||
|
if (
|
||||||
|
DSQL_HOST?.match(/./) &&
|
||||||
|
DSQL_USER?.match(/./) &&
|
||||||
|
DSQL_PASS?.match(/./) &&
|
||||||
|
DSQL_DB_NAME?.match(/./) &&
|
||||||
|
useLocal
|
||||||
|
) {
|
||||||
|
/** @type {import("../package-shared/types").DSQL_DatabaseSchemaType | undefined} */
|
||||||
|
let dbSchema;
|
||||||
|
|
||||||
|
try {
|
||||||
|
const localDbSchemaPath = path.resolve(
|
||||||
|
process.cwd(),
|
||||||
|
"dsql.schema.json"
|
||||||
|
);
|
||||||
|
dbSchema = JSON.parse(fs.readFileSync(localDbSchemaPath, "utf8"));
|
||||||
|
} catch (error) {}
|
||||||
|
|
||||||
|
if (dbSchema) {
|
||||||
|
return await apiDeleteUser({
|
||||||
|
dbFullName: DSQL_DB_NAME,
|
||||||
|
useLocal,
|
||||||
|
deletedUserId,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Make https request
|
||||||
|
*
|
||||||
|
* @description make a request to datasquirel.com
|
||||||
|
*/
|
||||||
|
const httpResponse = await new Promise((resolve, reject) => {
|
||||||
|
const reqPayload = JSON.stringify({
|
||||||
|
database,
|
||||||
|
deletedUserId,
|
||||||
|
});
|
||||||
|
|
||||||
|
const httpsRequest = scheme.request(
|
||||||
|
{
|
||||||
|
method: "POST",
|
||||||
|
headers: {
|
||||||
|
"Content-Type": "application/json",
|
||||||
|
"Content-Length": Buffer.from(reqPayload).length,
|
||||||
|
Authorization:
|
||||||
|
process.env.DSQL_FULL_ACCESS_API_KEY ||
|
||||||
|
process.env.DSQL_API_KEY ||
|
||||||
|
key,
|
||||||
|
},
|
||||||
|
port,
|
||||||
|
hostname: host,
|
||||||
|
path: `/api/user/${
|
||||||
|
user_id || grabedHostNames.user_id
|
||||||
|
}/delete-user`,
|
||||||
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Callback Function
|
||||||
|
*
|
||||||
|
* @description https request callback
|
||||||
|
*/
|
||||||
|
(response) => {
|
||||||
|
var str = "";
|
||||||
|
|
||||||
|
response.on("data", function (chunk) {
|
||||||
|
str += chunk;
|
||||||
|
});
|
||||||
|
|
||||||
|
response.on("end", function () {
|
||||||
|
resolve(JSON.parse(str));
|
||||||
|
});
|
||||||
|
|
||||||
|
response.on("error", (err) => {
|
||||||
|
reject(err);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
);
|
||||||
|
httpsRequest.write(reqPayload);
|
||||||
|
httpsRequest.end();
|
||||||
|
});
|
||||||
|
|
||||||
|
/** ********************************************** */
|
||||||
|
/** ********************************************** */
|
||||||
|
/** ********************************************** */
|
||||||
|
|
||||||
|
return httpResponse;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** ********************************************** */
|
||||||
|
/** ********************************************** */
|
||||||
|
/** ********************************************** */
|
||||||
|
|
||||||
|
module.exports = deleteUser;
|
26
users/login-user.d.ts
vendored
26
users/login-user.d.ts
vendored
@ -5,7 +5,7 @@ export = loginUser;
|
|||||||
* @async
|
* @async
|
||||||
*
|
*
|
||||||
* @param {object} params - Single Param object containing params
|
* @param {object} params - Single Param object containing params
|
||||||
* @param {String} params.key - FULL ACCESS API Key
|
* @param {String} [params.key] - FULL ACCESS API Key
|
||||||
* @param {String} params.database - Target Database
|
* @param {String} params.database - Target Database
|
||||||
* @param {{
|
* @param {{
|
||||||
* email?: string,
|
* email?: string,
|
||||||
@ -13,9 +13,9 @@ export = loginUser;
|
|||||||
* password: string,
|
* password: string,
|
||||||
* }} params.payload Login Email/Username and Password
|
* }} params.payload Login Email/Username and Password
|
||||||
* @param {string[]} [params.additionalFields] - Additional Fields to be added to the user object
|
* @param {string[]} [params.additionalFields] - Additional Fields to be added to the user object
|
||||||
* @param {http.ServerResponse} params.response - Http response object
|
* @param {http.ServerResponse & Object<string, any>} [params.response] - Http response object
|
||||||
* @param {String} params.encryptionKey - Encryption Key
|
* @param {String} [params.encryptionKey] - Encryption Key
|
||||||
* @param {String} params.encryptionSalt - Encryption Salt
|
* @param {String} [params.encryptionSalt] - Encryption Salt
|
||||||
* @param {boolean} [params.email_login] - Email only Login
|
* @param {boolean} [params.email_login] - Email only Login
|
||||||
* @param {string} [params.email_login_code] - Email login code
|
* @param {string} [params.email_login_code] - Email login code
|
||||||
* @param {string} [params.temp_code_field] - Database table field name for temporary code
|
* @param {string} [params.temp_code_field] - Database table field name for temporary code
|
||||||
@ -23,11 +23,12 @@ export = loginUser;
|
|||||||
* @param {boolean} [params.user_id] - User ID
|
* @param {boolean} [params.user_id] - User ID
|
||||||
* @param {boolean} [params.skipPassword]
|
* @param {boolean} [params.skipPassword]
|
||||||
* @param {boolean} [params.useLocal]
|
* @param {boolean} [params.useLocal]
|
||||||
|
* @param {string | number} [params.apiUserID] - Required for setting of cookies
|
||||||
*
|
*
|
||||||
* @returns { Promise<import("../package-shared/types").AuthenticatedUser>}
|
* @returns { Promise<import("../package-shared/types").APILoginFunctionReturn>}
|
||||||
*/
|
*/
|
||||||
declare function loginUser({ key, payload, database, additionalFields, response, encryptionKey, encryptionSalt, email_login, email_login_code, temp_code_field, token, user_id, skipPassword, useLocal, }: {
|
declare function loginUser({ key, payload, database, additionalFields, response, encryptionKey, encryptionSalt, email_login, email_login_code, temp_code_field, token, user_id, skipPassword, useLocal, apiUserID, }: {
|
||||||
key: string;
|
key?: string;
|
||||||
database: string;
|
database: string;
|
||||||
payload: {
|
payload: {
|
||||||
email?: string;
|
email?: string;
|
||||||
@ -35,9 +36,11 @@ declare function loginUser({ key, payload, database, additionalFields, response,
|
|||||||
password: string;
|
password: string;
|
||||||
};
|
};
|
||||||
additionalFields?: string[];
|
additionalFields?: string[];
|
||||||
response: http.ServerResponse;
|
response?: http.ServerResponse & {
|
||||||
encryptionKey: string;
|
[x: string]: any;
|
||||||
encryptionSalt: string;
|
};
|
||||||
|
encryptionKey?: string;
|
||||||
|
encryptionSalt?: string;
|
||||||
email_login?: boolean;
|
email_login?: boolean;
|
||||||
email_login_code?: string;
|
email_login_code?: string;
|
||||||
temp_code_field?: string;
|
temp_code_field?: string;
|
||||||
@ -45,5 +48,6 @@ declare function loginUser({ key, payload, database, additionalFields, response,
|
|||||||
user_id?: boolean;
|
user_id?: boolean;
|
||||||
skipPassword?: boolean;
|
skipPassword?: boolean;
|
||||||
useLocal?: boolean;
|
useLocal?: boolean;
|
||||||
}): Promise<import("../package-shared/types").AuthenticatedUser>;
|
apiUserID?: string | number;
|
||||||
|
}): Promise<import("../package-shared/types").APILoginFunctionReturn>;
|
||||||
import http = require("http");
|
import http = require("http");
|
||||||
|
@ -13,6 +13,9 @@ const encrypt = require("../package-shared/functions/dsql/encrypt");
|
|||||||
const grabHostNames = require("../package-shared/utils/grab-host-names");
|
const grabHostNames = require("../package-shared/utils/grab-host-names");
|
||||||
const apiLoginUser = require("../package-shared/functions/api/users/api-login");
|
const apiLoginUser = require("../package-shared/functions/api/users/api-login");
|
||||||
const getAuthCookieNames = require("../package-shared/functions/backend/cookies/get-auth-cookie-names");
|
const getAuthCookieNames = require("../package-shared/functions/backend/cookies/get-auth-cookie-names");
|
||||||
|
const {
|
||||||
|
writeAuthFile,
|
||||||
|
} = require("../package-shared/functions/backend/auth/write-auth-files");
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Login A user
|
* Login A user
|
||||||
@ -20,7 +23,7 @@ const getAuthCookieNames = require("../package-shared/functions/backend/cookies/
|
|||||||
* @async
|
* @async
|
||||||
*
|
*
|
||||||
* @param {object} params - Single Param object containing params
|
* @param {object} params - Single Param object containing params
|
||||||
* @param {String} params.key - FULL ACCESS API Key
|
* @param {String} [params.key] - FULL ACCESS API Key
|
||||||
* @param {String} params.database - Target Database
|
* @param {String} params.database - Target Database
|
||||||
* @param {{
|
* @param {{
|
||||||
* email?: string,
|
* email?: string,
|
||||||
@ -28,9 +31,9 @@ const getAuthCookieNames = require("../package-shared/functions/backend/cookies/
|
|||||||
* password: string,
|
* password: string,
|
||||||
* }} params.payload Login Email/Username and Password
|
* }} params.payload Login Email/Username and Password
|
||||||
* @param {string[]} [params.additionalFields] - Additional Fields to be added to the user object
|
* @param {string[]} [params.additionalFields] - Additional Fields to be added to the user object
|
||||||
* @param {http.ServerResponse} params.response - Http response object
|
* @param {http.ServerResponse & Object<string, any>} [params.response] - Http response object
|
||||||
* @param {String} params.encryptionKey - Encryption Key
|
* @param {String} [params.encryptionKey] - Encryption Key
|
||||||
* @param {String} params.encryptionSalt - Encryption Salt
|
* @param {String} [params.encryptionSalt] - Encryption Salt
|
||||||
* @param {boolean} [params.email_login] - Email only Login
|
* @param {boolean} [params.email_login] - Email only Login
|
||||||
* @param {string} [params.email_login_code] - Email login code
|
* @param {string} [params.email_login_code] - Email login code
|
||||||
* @param {string} [params.temp_code_field] - Database table field name for temporary code
|
* @param {string} [params.temp_code_field] - Database table field name for temporary code
|
||||||
@ -38,8 +41,9 @@ const getAuthCookieNames = require("../package-shared/functions/backend/cookies/
|
|||||||
* @param {boolean} [params.user_id] - User ID
|
* @param {boolean} [params.user_id] - User ID
|
||||||
* @param {boolean} [params.skipPassword]
|
* @param {boolean} [params.skipPassword]
|
||||||
* @param {boolean} [params.useLocal]
|
* @param {boolean} [params.useLocal]
|
||||||
|
* @param {string | number} [params.apiUserID] - Required for setting of cookies
|
||||||
*
|
*
|
||||||
* @returns { Promise<import("../package-shared/types").AuthenticatedUser>}
|
* @returns { Promise<import("../package-shared/types").APILoginFunctionReturn>}
|
||||||
*/
|
*/
|
||||||
async function loginUser({
|
async function loginUser({
|
||||||
key,
|
key,
|
||||||
@ -56,6 +60,7 @@ async function loginUser({
|
|||||||
user_id,
|
user_id,
|
||||||
skipPassword,
|
skipPassword,
|
||||||
useLocal,
|
useLocal,
|
||||||
|
apiUserID,
|
||||||
}) {
|
}) {
|
||||||
const grabedHostNames = grabHostNames();
|
const grabedHostNames = grabHostNames();
|
||||||
const { host, port, scheme } = grabedHostNames;
|
const { host, port, scheme } = grabedHostNames;
|
||||||
@ -67,6 +72,28 @@ async function loginUser({
|
|||||||
: defaultTempLoginFieldName
|
: defaultTempLoginFieldName
|
||||||
: undefined;
|
: undefined;
|
||||||
|
|
||||||
|
const finalEncryptionKey =
|
||||||
|
encryptionKey || process.env.DSQL_ENCRYPTION_PASSWORD;
|
||||||
|
const finalEncryptionSalt =
|
||||||
|
encryptionSalt || process.env.DSQL_ENCRYPTION_SALT;
|
||||||
|
|
||||||
|
if (!finalEncryptionKey?.match(/.{8,}/)) {
|
||||||
|
console.log("Encryption key is invalid");
|
||||||
|
return {
|
||||||
|
success: false,
|
||||||
|
payload: null,
|
||||||
|
msg: "Encryption key is invalid",
|
||||||
|
};
|
||||||
|
}
|
||||||
|
if (!finalEncryptionSalt?.match(/.{8,}/)) {
|
||||||
|
console.log("Encryption salt is invalid");
|
||||||
|
return {
|
||||||
|
success: false,
|
||||||
|
payload: null,
|
||||||
|
msg: "Encryption salt is invalid",
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Check required fields
|
* Check required fields
|
||||||
*
|
*
|
||||||
@ -80,43 +107,14 @@ async function loginUser({
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Check Encryption Keys
|
|
||||||
*
|
|
||||||
* @description Check Encryption Keys
|
|
||||||
*/
|
|
||||||
if (!encryptionKey?.match(/./))
|
|
||||||
return {
|
|
||||||
success: false,
|
|
||||||
payload: null,
|
|
||||||
msg: "Encryption Key Required",
|
|
||||||
};
|
|
||||||
|
|
||||||
if (!encryptionSalt?.match(/./))
|
|
||||||
return {
|
|
||||||
success: false,
|
|
||||||
payload: null,
|
|
||||||
msg: "Encryption Salt Required",
|
|
||||||
};
|
|
||||||
|
|
||||||
if (encryptionKey.length < 24)
|
|
||||||
return {
|
|
||||||
success: false,
|
|
||||||
payload: null,
|
|
||||||
msg: "Encryption Key must be at least 24 characters",
|
|
||||||
};
|
|
||||||
|
|
||||||
if (encryptionSalt.length < 8)
|
|
||||||
return {
|
|
||||||
success: false,
|
|
||||||
payload: null,
|
|
||||||
msg: "Encryption Salt must be at least 8 characters",
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Initialize HTTP response variable
|
* Initialize HTTP response variable
|
||||||
*/
|
*/
|
||||||
let httpResponse;
|
|
||||||
|
/** @type {import("../package-shared/types").APILoginFunctionReturn} */
|
||||||
|
let httpResponse = {
|
||||||
|
success: false,
|
||||||
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Check for local DB settings
|
* Check for local DB settings
|
||||||
@ -150,7 +148,7 @@ async function loginUser({
|
|||||||
username: payload.username,
|
username: payload.username,
|
||||||
password: payload.password,
|
password: payload.password,
|
||||||
skipPassword,
|
skipPassword,
|
||||||
encryptionKey,
|
encryptionKey: finalEncryptionKey,
|
||||||
additionalFields,
|
additionalFields,
|
||||||
email_login,
|
email_login,
|
||||||
email_login_code,
|
email_login_code,
|
||||||
@ -170,7 +168,7 @@ async function loginUser({
|
|||||||
httpResponse = await new Promise((resolve, reject) => {
|
httpResponse = await new Promise((resolve, reject) => {
|
||||||
/** @type {import("../package-shared/types").PackageUserLoginRequestBody} */
|
/** @type {import("../package-shared/types").PackageUserLoginRequestBody} */
|
||||||
const reqPayload = {
|
const reqPayload = {
|
||||||
encryptionKey,
|
encryptionKey: finalEncryptionKey,
|
||||||
payload,
|
payload,
|
||||||
database,
|
database,
|
||||||
additionalFields,
|
additionalFields,
|
||||||
@ -236,22 +234,34 @@ async function loginUser({
|
|||||||
if (httpResponse?.success) {
|
if (httpResponse?.success) {
|
||||||
let encryptedPayload = encrypt({
|
let encryptedPayload = encrypt({
|
||||||
data: JSON.stringify(httpResponse.payload),
|
data: JSON.stringify(httpResponse.payload),
|
||||||
encryptionKey,
|
encryptionKey: finalEncryptionKey,
|
||||||
encryptionSalt,
|
encryptionSalt: finalEncryptionSalt,
|
||||||
});
|
});
|
||||||
|
|
||||||
try {
|
try {
|
||||||
if (token) httpResponse["token"] = encryptedPayload;
|
if (token && encryptedPayload)
|
||||||
|
httpResponse["token"] = encryptedPayload;
|
||||||
} catch (error) {}
|
} catch (error) {}
|
||||||
|
|
||||||
const { userId } = httpResponse;
|
const cookieNames = getAuthCookieNames({
|
||||||
|
database,
|
||||||
|
userId: apiUserID || process.env.DSQL_API_USER_ID,
|
||||||
|
});
|
||||||
|
|
||||||
const cookieNames = getAuthCookieNames();
|
if (httpResponse.csrf) {
|
||||||
|
writeAuthFile(
|
||||||
|
httpResponse.csrf,
|
||||||
|
JSON.stringify(httpResponse.payload)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
httpResponse["cookieNames"] = cookieNames;
|
||||||
|
httpResponse["key"] = String(encryptedPayload);
|
||||||
|
|
||||||
const authKeyName = cookieNames.keyCookieName;
|
const authKeyName = cookieNames.keyCookieName;
|
||||||
const csrfName = cookieNames.csrfCookieName;
|
const csrfName = cookieNames.csrfCookieName;
|
||||||
|
|
||||||
response.setHeader("Set-Cookie", [
|
response?.setHeader("Set-Cookie", [
|
||||||
`${authKeyName}=${encryptedPayload};samesite=strict;path=/;HttpOnly=true;Secure=true`,
|
`${authKeyName}=${encryptedPayload};samesite=strict;path=/;HttpOnly=true;Secure=true`,
|
||||||
`${csrfName}=${httpResponse.payload?.csrf_k};samesite=strict;path=/;HttpOnly=true`,
|
`${csrfName}=${httpResponse.payload?.csrf_k};samesite=strict;path=/;HttpOnly=true`,
|
||||||
]);
|
]);
|
||||||
|
21
users/logout-user.d.ts
vendored
21
users/logout-user.d.ts
vendored
@ -3,20 +3,23 @@ export = logoutUser;
|
|||||||
* Logout user
|
* Logout user
|
||||||
* ==============================================================================
|
* ==============================================================================
|
||||||
* @param {object} params - Single Param object containing params
|
* @param {object} params - Single Param object containing params
|
||||||
* @param {http.IncomingMessage} params.request - Http request object
|
* @param {string} params.encryptedUserString - Encrypted User String
|
||||||
* @param {http.ServerResponse} params.response - Http response object
|
* @param {http.ServerResponse & Object<string, any>} [params.response] - Http response object
|
||||||
* @param {string} [params.database] - Target database name(slug): optional => If you don't
|
* @param {string} [params.database] - Target database name(slug): optional
|
||||||
* include this you will be logged out of all datasquirel websites instead of just the target
|
* @param {string | number} [params.dsqlUserId]
|
||||||
* database
|
|
||||||
*
|
*
|
||||||
* @returns {{success: boolean, payload: string}}
|
* @returns {{success: boolean, payload: string, cookieNames?: any}}
|
||||||
*/
|
*/
|
||||||
declare function logoutUser({ request, response, database }: {
|
declare function logoutUser({ response, database, dsqlUserId, encryptedUserString }: {
|
||||||
request: http.IncomingMessage;
|
encryptedUserString: string;
|
||||||
response: http.ServerResponse;
|
response?: http.ServerResponse & {
|
||||||
|
[x: string]: any;
|
||||||
|
};
|
||||||
database?: string;
|
database?: string;
|
||||||
|
dsqlUserId?: string | number;
|
||||||
}): {
|
}): {
|
||||||
success: boolean;
|
success: boolean;
|
||||||
payload: string;
|
payload: string;
|
||||||
|
cookieNames?: any;
|
||||||
};
|
};
|
||||||
import http = require("http");
|
import http = require("http");
|
||||||
|
@ -1,72 +1,61 @@
|
|||||||
// @ts-check
|
// @ts-check
|
||||||
|
|
||||||
const http = require("http");
|
const http = require("http");
|
||||||
const parseCookies = require("../utils/functions/parseCookies");
|
|
||||||
const getAuthCookieNames = require("../package-shared/functions/backend/cookies/get-auth-cookie-names");
|
const getAuthCookieNames = require("../package-shared/functions/backend/cookies/get-auth-cookie-names");
|
||||||
|
const decrypt = require("../package-shared/functions/dsql/decrypt");
|
||||||
|
const EJSON = require("../package-shared/utils/ejson");
|
||||||
|
const {
|
||||||
|
deleteAuthFile,
|
||||||
|
} = require("../package-shared/functions/backend/auth/write-auth-files");
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Logout user
|
* Logout user
|
||||||
* ==============================================================================
|
* ==============================================================================
|
||||||
* @param {object} params - Single Param object containing params
|
* @param {object} params - Single Param object containing params
|
||||||
* @param {http.IncomingMessage} params.request - Http request object
|
* @param {string} params.encryptedUserString - Encrypted User String
|
||||||
* @param {http.ServerResponse} params.response - Http response object
|
* @param {http.ServerResponse & Object<string, any>} [params.response] - Http response object
|
||||||
* @param {string} [params.database] - Target database name(slug): optional => If you don't
|
* @param {string} [params.database] - Target database name(slug): optional
|
||||||
* include this you will be logged out of all datasquirel websites instead of just the target
|
* @param {string | number} [params.dsqlUserId]
|
||||||
* database
|
|
||||||
*
|
*
|
||||||
* @returns {{success: boolean, payload: string}}
|
* @returns {{success: boolean, payload: string, cookieNames?: any}}
|
||||||
*/
|
*/
|
||||||
function logoutUser({ request, response, database }) {
|
function logoutUser({ response, database, dsqlUserId, encryptedUserString }) {
|
||||||
/**
|
/**
|
||||||
* Check Encryption Keys
|
* Check Encryption Keys
|
||||||
*
|
*
|
||||||
* @description Check Encryption Keys
|
* @description Check Encryption Keys
|
||||||
*/
|
*/
|
||||||
try {
|
try {
|
||||||
const cookies = parseCookies({ request });
|
const decryptedUserJSON = decrypt({
|
||||||
const cookiesKeys = Object.keys(cookies);
|
encryptedString: encryptedUserString,
|
||||||
|
});
|
||||||
|
const userObject =
|
||||||
|
/** @type {import("../package-shared/types").DATASQUIREL_LoggedInUser | undefined} */ (
|
||||||
|
EJSON.parse(decryptedUserJSON)
|
||||||
|
);
|
||||||
|
|
||||||
const keyNames = getAuthCookieNames();
|
if (!userObject?.csrf_k)
|
||||||
|
throw new Error("Invalid User. Please check key");
|
||||||
|
|
||||||
const keyRegexp = new RegExp(keyNames.keyCookieName);
|
const cookieNames = getAuthCookieNames({
|
||||||
const csrfRegexp = new RegExp(keyNames.csrfCookieName);
|
database,
|
||||||
|
userId: dsqlUserId || process.env.DSQL_API_USER_ID,
|
||||||
|
});
|
||||||
|
const authKeyName = cookieNames.keyCookieName;
|
||||||
|
const csrfName = cookieNames.csrfCookieName;
|
||||||
|
|
||||||
const authKeyName = cookiesKeys.filter((cookieKey) =>
|
response?.setHeader("Set-Cookie", [
|
||||||
cookieKey.match(keyRegexp)
|
|
||||||
)[0];
|
|
||||||
const csrfName = cookiesKeys.filter((cookieKey) =>
|
|
||||||
cookieKey.match(csrfRegexp)
|
|
||||||
)[0];
|
|
||||||
|
|
||||||
if (authKeyName && csrfName) {
|
|
||||||
response.setHeader("Set-Cookie", [
|
|
||||||
`${authKeyName}=null;max-age=0`,
|
`${authKeyName}=null;max-age=0`,
|
||||||
`${csrfName}=null;max-age=0`,
|
`${csrfName}=null;max-age=0`,
|
||||||
]);
|
]);
|
||||||
} else {
|
|
||||||
const allKeys = cookiesKeys.filter((cookieKey) =>
|
|
||||||
cookieKey.match(/datasquirel_.*_auth_key/)
|
|
||||||
);
|
|
||||||
const allCsrfs = cookiesKeys.filter((cookieKey) =>
|
|
||||||
cookieKey.match(/datasquirel_.*_csrf/)
|
|
||||||
);
|
|
||||||
|
|
||||||
response.setHeader("Set-Cookie", [
|
const csrf = userObject.csrf_k;
|
||||||
...allKeys.map(
|
deleteAuthFile(csrf);
|
||||||
(key) =>
|
|
||||||
`${key}=null;samesite=strict;path=/;HttpOnly=true;Secure=true`
|
|
||||||
),
|
|
||||||
...allCsrfs.map(
|
|
||||||
(csrf) =>
|
|
||||||
`${csrf}=null;samesite=strict;path=/;HttpOnly=true`
|
|
||||||
),
|
|
||||||
`dsqluid=null;samesite=strict;path=/;HttpOnly=true`,
|
|
||||||
]);
|
|
||||||
}
|
|
||||||
|
|
||||||
return {
|
return {
|
||||||
success: true,
|
success: true,
|
||||||
payload: "User Logged Out",
|
payload: "User Logged Out",
|
||||||
|
cookieNames,
|
||||||
};
|
};
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.log(error);
|
console.log(error);
|
||||||
|
30
users/reauth-user.d.ts
vendored
30
users/reauth-user.d.ts
vendored
@ -12,31 +12,31 @@ export = reauthUser;
|
|||||||
* @async
|
* @async
|
||||||
*
|
*
|
||||||
* @param {object} params - Single Param object containing params
|
* @param {object} params - Single Param object containing params
|
||||||
* @param {String} params.key - API Key
|
* @param {String} [params.key] - API Key
|
||||||
* @param {String} params.database - Target Database
|
* @param {String} params.database - Target Database
|
||||||
* @param {http.ServerResponse} params.response - Http response object
|
* @param {http.ServerResponse} [params.response] - Http response object
|
||||||
* @param {http.IncomingMessage} params.request - Http request object
|
* @param {http.IncomingMessage} [params.request] - Http request object
|
||||||
* @param {("deep" | "normal")} [params.level] - Authentication level
|
* @param {("deep" | "normal")} [params.level] - Authentication level
|
||||||
* @param {String} params.encryptionKey - Encryption Key
|
* @param {String} [params.encryptionKey] - Encryption Key
|
||||||
* @param {String} params.encryptionSalt - Encryption Salt
|
* @param {String} [params.encryptionSalt] - Encryption Salt
|
||||||
* @param {string[]} [params.additionalFields] - Additional Fields to be added to the user object
|
* @param {string[]} [params.additionalFields] - Additional Fields to be added to the user object
|
||||||
* @param {string} [params.token] - access token to use instead of getting from cookie header
|
* @param {string} [params.encryptedUserString] - encrypted user string to use instead of getting from cookie header
|
||||||
* @param {boolean} [params.user_id] - User ID
|
* @param {boolean} [params.user_id] - User ID
|
||||||
* @param {boolean} [params.useLocal]
|
* @param {boolean} [params.useLocal]
|
||||||
*
|
*
|
||||||
* @returns { Promise<import("../package-shared/types").ReauthUserFunctionReturn> }
|
* @returns { Promise<import("../package-shared/types").APILoginFunctionReturn> }
|
||||||
*/
|
*/
|
||||||
declare function reauthUser({ key, database, response, request, level, encryptionKey, encryptionSalt, additionalFields, token, user_id, useLocal, }: {
|
declare function reauthUser({ key, database, response, request, level, encryptionKey, encryptionSalt, additionalFields, encryptedUserString, user_id, useLocal, }: {
|
||||||
key: string;
|
key?: string;
|
||||||
database: string;
|
database: string;
|
||||||
response: http.ServerResponse;
|
response?: http.ServerResponse;
|
||||||
request: http.IncomingMessage;
|
request?: http.IncomingMessage;
|
||||||
level?: ("deep" | "normal");
|
level?: ("deep" | "normal");
|
||||||
encryptionKey: string;
|
encryptionKey?: string;
|
||||||
encryptionSalt: string;
|
encryptionSalt?: string;
|
||||||
additionalFields?: string[];
|
additionalFields?: string[];
|
||||||
token?: string;
|
encryptedUserString?: string;
|
||||||
user_id?: boolean;
|
user_id?: boolean;
|
||||||
useLocal?: boolean;
|
useLocal?: boolean;
|
||||||
}): Promise<import("../package-shared/types").ReauthUserFunctionReturn>;
|
}): Promise<import("../package-shared/types").APILoginFunctionReturn>;
|
||||||
import http = require("http");
|
import http = require("http");
|
||||||
|
@ -14,6 +14,11 @@ const encrypt = require("../package-shared/functions/dsql/encrypt");
|
|||||||
const userAuth = require("./user-auth");
|
const userAuth = require("./user-auth");
|
||||||
const grabHostNames = require("../package-shared/utils/grab-host-names");
|
const grabHostNames = require("../package-shared/utils/grab-host-names");
|
||||||
const apiReauthUser = require("../package-shared/functions/api/users/api-reauth-user");
|
const apiReauthUser = require("../package-shared/functions/api/users/api-reauth-user");
|
||||||
|
const {
|
||||||
|
writeAuthFile,
|
||||||
|
deleteAuthFile,
|
||||||
|
} = require("../package-shared/functions/backend/auth/write-auth-files");
|
||||||
|
const getAuthCookieNames = require("../package-shared/functions/backend/cookies/get-auth-cookie-names");
|
||||||
|
|
||||||
/** ****************************************************************************** */
|
/** ****************************************************************************** */
|
||||||
/** ****************************************************************************** */
|
/** ****************************************************************************** */
|
||||||
@ -29,19 +34,19 @@ const apiReauthUser = require("../package-shared/functions/api/users/api-reauth-
|
|||||||
* @async
|
* @async
|
||||||
*
|
*
|
||||||
* @param {object} params - Single Param object containing params
|
* @param {object} params - Single Param object containing params
|
||||||
* @param {String} params.key - API Key
|
* @param {String} [params.key] - API Key
|
||||||
* @param {String} params.database - Target Database
|
* @param {String} params.database - Target Database
|
||||||
* @param {http.ServerResponse} params.response - Http response object
|
* @param {http.ServerResponse} [params.response] - Http response object
|
||||||
* @param {http.IncomingMessage} params.request - Http request object
|
* @param {http.IncomingMessage} [params.request] - Http request object
|
||||||
* @param {("deep" | "normal")} [params.level] - Authentication level
|
* @param {("deep" | "normal")} [params.level] - Authentication level
|
||||||
* @param {String} params.encryptionKey - Encryption Key
|
* @param {String} [params.encryptionKey] - Encryption Key
|
||||||
* @param {String} params.encryptionSalt - Encryption Salt
|
* @param {String} [params.encryptionSalt] - Encryption Salt
|
||||||
* @param {string[]} [params.additionalFields] - Additional Fields to be added to the user object
|
* @param {string[]} [params.additionalFields] - Additional Fields to be added to the user object
|
||||||
* @param {string} [params.token] - access token to use instead of getting from cookie header
|
* @param {string} [params.encryptedUserString] - encrypted user string to use instead of getting from cookie header
|
||||||
* @param {boolean} [params.user_id] - User ID
|
* @param {boolean} [params.user_id] - User ID
|
||||||
* @param {boolean} [params.useLocal]
|
* @param {boolean} [params.useLocal]
|
||||||
*
|
*
|
||||||
* @returns { Promise<import("../package-shared/types").ReauthUserFunctionReturn> }
|
* @returns { Promise<import("../package-shared/types").APILoginFunctionReturn> }
|
||||||
*/
|
*/
|
||||||
async function reauthUser({
|
async function reauthUser({
|
||||||
key,
|
key,
|
||||||
@ -52,7 +57,7 @@ async function reauthUser({
|
|||||||
encryptionKey,
|
encryptionKey,
|
||||||
encryptionSalt,
|
encryptionSalt,
|
||||||
additionalFields,
|
additionalFields,
|
||||||
token,
|
encryptedUserString,
|
||||||
user_id,
|
user_id,
|
||||||
useLocal,
|
useLocal,
|
||||||
}) {
|
}) {
|
||||||
@ -64,13 +69,18 @@ async function reauthUser({
|
|||||||
const grabedHostNames = grabHostNames();
|
const grabedHostNames = grabHostNames();
|
||||||
const { host, port, scheme } = grabedHostNames;
|
const { host, port, scheme } = grabedHostNames;
|
||||||
|
|
||||||
|
const finalEncryptionKey =
|
||||||
|
encryptionKey || process.env.DSQL_ENCRYPTION_PASSWORD;
|
||||||
|
const finalEncryptionSalt =
|
||||||
|
encryptionSalt || process.env.DSQL_ENCRYPTION_SALT;
|
||||||
|
|
||||||
const existingUser = userAuth({
|
const existingUser = userAuth({
|
||||||
database,
|
database,
|
||||||
encryptionKey,
|
encryptionKey: finalEncryptionKey,
|
||||||
encryptionSalt,
|
encryptionSalt: finalEncryptionSalt,
|
||||||
level,
|
level,
|
||||||
request,
|
request,
|
||||||
token,
|
encryptedUserString,
|
||||||
});
|
});
|
||||||
|
|
||||||
if (!existingUser?.payload?.id) {
|
if (!existingUser?.payload?.id) {
|
||||||
@ -189,23 +199,30 @@ async function reauthUser({
|
|||||||
if (httpResponse?.success) {
|
if (httpResponse?.success) {
|
||||||
let encryptedPayload = encrypt({
|
let encryptedPayload = encrypt({
|
||||||
data: JSON.stringify(httpResponse.payload),
|
data: JSON.stringify(httpResponse.payload),
|
||||||
encryptionKey,
|
encryptionKey: finalEncryptionKey,
|
||||||
encryptionSalt,
|
encryptionSalt: finalEncryptionSalt,
|
||||||
});
|
});
|
||||||
|
|
||||||
const { userId } = httpResponse;
|
const { userId } = httpResponse;
|
||||||
|
const cookieNames = getAuthCookieNames({ database, userId });
|
||||||
|
|
||||||
const authKeyName = `datasquirel_${userId}_${database}_auth_key`;
|
httpResponse["cookieNames"] = cookieNames;
|
||||||
const csrfName = `datasquirel_${userId}_${database}_csrf`;
|
httpResponse["key"] = String(encryptedPayload);
|
||||||
|
|
||||||
response.setHeader("Set-Cookie", [
|
const authKeyName = cookieNames.keyCookieName;
|
||||||
|
const csrfName = cookieNames.csrfCookieName;
|
||||||
|
|
||||||
|
response?.setHeader("Set-Cookie", [
|
||||||
`${authKeyName}=${encryptedPayload};samesite=strict;path=/;HttpOnly=true;Secure=true`,
|
`${authKeyName}=${encryptedPayload};samesite=strict;path=/;HttpOnly=true;Secure=true`,
|
||||||
`${csrfName}=${httpResponse.payload.csrf_k};samesite=strict;path=/;HttpOnly=true`,
|
`${csrfName}=${httpResponse.payload?.csrf_k};samesite=strict;path=/;HttpOnly=true`,
|
||||||
`dsqluid=${userId};samesite=strict;path=/;HttpOnly=true`,
|
|
||||||
]);
|
]);
|
||||||
|
|
||||||
if (token) {
|
if (httpResponse.csrf) {
|
||||||
httpResponse.token = encryptedPayload;
|
deleteAuthFile(String(existingUser.payload.csrf_k));
|
||||||
|
writeAuthFile(
|
||||||
|
httpResponse.csrf,
|
||||||
|
JSON.stringify(httpResponse.payload)
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
4
users/social/github-auth.d.ts
vendored
4
users/social/github-auth.d.ts
vendored
@ -28,7 +28,7 @@ export = githubAuth;
|
|||||||
* @param {http.ServerResponse} params.response - HTTPS response object
|
* @param {http.ServerResponse} params.response - HTTPS response object
|
||||||
* @param {string} params.encryptionKey - Encryption key
|
* @param {string} params.encryptionKey - Encryption key
|
||||||
* @param {string} params.encryptionSalt - Encryption salt
|
* @param {string} params.encryptionSalt - Encryption salt
|
||||||
* @param {object} [params.additionalFields] - Additional Fields to be added to the user object
|
* @param {string[]} [params.additionalFields] - Additional Fields to be added to the user object
|
||||||
* @param {boolean} [params.user_id] - User ID
|
* @param {boolean} [params.user_id] - User ID
|
||||||
*
|
*
|
||||||
* @returns { Promise<FunctionReturn | undefined> }
|
* @returns { Promise<FunctionReturn | undefined> }
|
||||||
@ -43,7 +43,7 @@ declare function githubAuth({ key, code, email, database, clientId, clientSecret
|
|||||||
response: http.ServerResponse;
|
response: http.ServerResponse;
|
||||||
encryptionKey: string;
|
encryptionKey: string;
|
||||||
encryptionSalt: string;
|
encryptionSalt: string;
|
||||||
additionalFields?: object;
|
additionalFields?: string[];
|
||||||
user_id?: boolean;
|
user_id?: boolean;
|
||||||
}): Promise<FunctionReturn | undefined>;
|
}): Promise<FunctionReturn | undefined>;
|
||||||
declare namespace githubAuth {
|
declare namespace githubAuth {
|
||||||
|
@ -44,7 +44,7 @@ const apiGithubLogin = require("../../package-shared/functions/api/users/social/
|
|||||||
* @param {http.ServerResponse} params.response - HTTPS response object
|
* @param {http.ServerResponse} params.response - HTTPS response object
|
||||||
* @param {string} params.encryptionKey - Encryption key
|
* @param {string} params.encryptionKey - Encryption key
|
||||||
* @param {string} params.encryptionSalt - Encryption salt
|
* @param {string} params.encryptionSalt - Encryption salt
|
||||||
* @param {object} [params.additionalFields] - Additional Fields to be added to the user object
|
* @param {string[]} [params.additionalFields] - Additional Fields to be added to the user object
|
||||||
* @param {boolean} [params.user_id] - User ID
|
* @param {boolean} [params.user_id] - User ID
|
||||||
*
|
*
|
||||||
* @returns { Promise<FunctionReturn | undefined> }
|
* @returns { Promise<FunctionReturn | undefined> }
|
||||||
|
26
users/social/google-auth.d.ts
vendored
26
users/social/google-auth.d.ts
vendored
@ -19,29 +19,27 @@ export = googleAuth;
|
|||||||
* @async
|
* @async
|
||||||
*
|
*
|
||||||
* @param {object} params - main params object
|
* @param {object} params - main params object
|
||||||
* @param {string} params.key - API full access key
|
* @param {string} [params.key] - API full access key
|
||||||
* @param {string} params.token - Google access token gotten from the client side
|
* @param {string} params.token - Google access token gotten from the client side
|
||||||
* @param {string} params.database - Target database name(slug)
|
* @param {string} params.database - Target database name(slug)
|
||||||
* @param {string} params.clientId - Google client id
|
* @param {http.ServerResponse} [params.response] - HTTPS response object
|
||||||
* @param {http.ServerResponse} params.response - HTTPS response object
|
* @param {string} [params.encryptionKey] - Encryption key
|
||||||
* @param {string} params.encryptionKey - Encryption key
|
* @param {string} [params.encryptionSalt] - Encryption salt
|
||||||
* @param {string} params.encryptionSalt - Encryption salt
|
* @param {string[]} [params.additionalFields] - Additional Fields to be added to the user object
|
||||||
* @param {object} [params.additionalFields] - Additional Fields to be added to the user object
|
|
||||||
* @param {boolean} [params.user_id] - User ID
|
* @param {boolean} [params.user_id] - User ID
|
||||||
* @param {string | number} [params.apiUserID] - Required for Local
|
* @param {string | number} [params.apiUserID] - Required for setting of cookies
|
||||||
* @param {boolean} [params.useLocal] - Whether to use a remote database instead of API
|
* @param {boolean} [params.useLocal] - Whether to use a remote database instead of API
|
||||||
*
|
*
|
||||||
* @returns { Promise<FunctionReturn> }
|
* @returns { Promise<FunctionReturn> }
|
||||||
*/
|
*/
|
||||||
declare function googleAuth({ key, token, database, clientId, response, encryptionKey, encryptionSalt, additionalFields, user_id, apiUserID, useLocal, }: {
|
declare function googleAuth({ key, token, database, response, encryptionKey, encryptionSalt, additionalFields, user_id, apiUserID, useLocal, }: {
|
||||||
key: string;
|
key?: string;
|
||||||
token: string;
|
token: string;
|
||||||
database: string;
|
database: string;
|
||||||
clientId: string;
|
response?: http.ServerResponse;
|
||||||
response: http.ServerResponse;
|
encryptionKey?: string;
|
||||||
encryptionKey: string;
|
encryptionSalt?: string;
|
||||||
encryptionSalt: string;
|
additionalFields?: string[];
|
||||||
additionalFields?: object;
|
|
||||||
user_id?: boolean;
|
user_id?: boolean;
|
||||||
apiUserID?: string | number;
|
apiUserID?: string | number;
|
||||||
useLocal?: boolean;
|
useLocal?: boolean;
|
||||||
|
@ -6,12 +6,15 @@
|
|||||||
* ==============================================================================
|
* ==============================================================================
|
||||||
*/
|
*/
|
||||||
const http = require("http");
|
const http = require("http");
|
||||||
const https = require("https");
|
|
||||||
const fs = require("fs");
|
const fs = require("fs");
|
||||||
const path = require("path");
|
const path = require("path");
|
||||||
const encrypt = require("../../package-shared/functions/dsql/encrypt");
|
const encrypt = require("../../package-shared/functions/dsql/encrypt");
|
||||||
const grabHostNames = require("../../package-shared/utils/grab-host-names");
|
const grabHostNames = require("../../package-shared/utils/grab-host-names");
|
||||||
const apiGoogleLogin = require("../../package-shared/functions/api/users/social/api-google-login");
|
const apiGoogleLogin = require("../../package-shared/functions/api/users/social/api-google-login");
|
||||||
|
const getAuthCookieNames = require("../../package-shared/functions/backend/cookies/get-auth-cookie-names");
|
||||||
|
const {
|
||||||
|
writeAuthFile,
|
||||||
|
} = require("../../package-shared/functions/backend/auth/write-auth-files");
|
||||||
|
|
||||||
/** ****************************************************************************** */
|
/** ****************************************************************************** */
|
||||||
/** ****************************************************************************** */
|
/** ****************************************************************************** */
|
||||||
@ -35,16 +38,15 @@ const apiGoogleLogin = require("../../package-shared/functions/api/users/social/
|
|||||||
* @async
|
* @async
|
||||||
*
|
*
|
||||||
* @param {object} params - main params object
|
* @param {object} params - main params object
|
||||||
* @param {string} params.key - API full access key
|
* @param {string} [params.key] - API full access key
|
||||||
* @param {string} params.token - Google access token gotten from the client side
|
* @param {string} params.token - Google access token gotten from the client side
|
||||||
* @param {string} params.database - Target database name(slug)
|
* @param {string} params.database - Target database name(slug)
|
||||||
* @param {string} params.clientId - Google client id
|
* @param {http.ServerResponse} [params.response] - HTTPS response object
|
||||||
* @param {http.ServerResponse} params.response - HTTPS response object
|
* @param {string} [params.encryptionKey] - Encryption key
|
||||||
* @param {string} params.encryptionKey - Encryption key
|
* @param {string} [params.encryptionSalt] - Encryption salt
|
||||||
* @param {string} params.encryptionSalt - Encryption salt
|
* @param {string[]} [params.additionalFields] - Additional Fields to be added to the user object
|
||||||
* @param {object} [params.additionalFields] - Additional Fields to be added to the user object
|
|
||||||
* @param {boolean} [params.user_id] - User ID
|
* @param {boolean} [params.user_id] - User ID
|
||||||
* @param {string | number} [params.apiUserID] - Required for Local
|
* @param {string | number} [params.apiUserID] - Required for setting of cookies
|
||||||
* @param {boolean} [params.useLocal] - Whether to use a remote database instead of API
|
* @param {boolean} [params.useLocal] - Whether to use a remote database instead of API
|
||||||
*
|
*
|
||||||
* @returns { Promise<FunctionReturn> }
|
* @returns { Promise<FunctionReturn> }
|
||||||
@ -53,7 +55,6 @@ async function googleAuth({
|
|||||||
key,
|
key,
|
||||||
token,
|
token,
|
||||||
database,
|
database,
|
||||||
clientId,
|
|
||||||
response,
|
response,
|
||||||
encryptionKey,
|
encryptionKey,
|
||||||
encryptionSalt,
|
encryptionSalt,
|
||||||
@ -65,18 +66,33 @@ async function googleAuth({
|
|||||||
const grabedHostNames = grabHostNames();
|
const grabedHostNames = grabHostNames();
|
||||||
const { host, port, scheme } = grabedHostNames;
|
const { host, port, scheme } = grabedHostNames;
|
||||||
|
|
||||||
|
const finalEncryptionKey =
|
||||||
|
encryptionKey || process.env.DSQL_ENCRYPTION_PASSWORD;
|
||||||
|
const finalEncryptionSalt =
|
||||||
|
encryptionSalt || process.env.DSQL_ENCRYPTION_SALT;
|
||||||
|
|
||||||
|
if (!finalEncryptionKey?.match(/.{8,}/)) {
|
||||||
|
console.log("Encryption key is invalid");
|
||||||
|
return {
|
||||||
|
success: false,
|
||||||
|
payload: null,
|
||||||
|
msg: "Encryption key is invalid",
|
||||||
|
};
|
||||||
|
}
|
||||||
|
if (!finalEncryptionSalt?.match(/.{8,}/)) {
|
||||||
|
console.log("Encryption salt is invalid");
|
||||||
|
return {
|
||||||
|
success: false,
|
||||||
|
payload: null,
|
||||||
|
msg: "Encryption salt is invalid",
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Check inputs
|
* Check inputs
|
||||||
*
|
*
|
||||||
* @description Check inputs
|
* @description Check inputs
|
||||||
*/
|
*/
|
||||||
if (!key || key?.match(/ /)) {
|
|
||||||
return {
|
|
||||||
success: false,
|
|
||||||
user: null,
|
|
||||||
msg: "Please enter API full access Key",
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!token || token?.match(/ /)) {
|
if (!token || token?.match(/ /)) {
|
||||||
return {
|
return {
|
||||||
@ -94,46 +110,14 @@ async function googleAuth({
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!clientId || clientId?.match(/ /)) {
|
|
||||||
return {
|
|
||||||
success: false,
|
|
||||||
user: null,
|
|
||||||
msg: "Please enter Google OAUTH client ID",
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!response || !response?.setHeader) {
|
|
||||||
return {
|
|
||||||
success: false,
|
|
||||||
user: null,
|
|
||||||
msg: "Please provide a valid HTTPS response object",
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!encryptionKey || encryptionKey?.match(/ /)) {
|
|
||||||
return {
|
|
||||||
success: false,
|
|
||||||
user: null,
|
|
||||||
msg: "Please provide a valid encryption key",
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!encryptionSalt || encryptionSalt?.match(/ /)) {
|
|
||||||
return {
|
|
||||||
success: false,
|
|
||||||
user: null,
|
|
||||||
msg: "Please provide a valid encryption salt",
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
////////////////////////////////////////
|
|
||||||
////////////////////////////////////////
|
|
||||||
////////////////////////////////////////
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Initialize HTTP response variable
|
* Initialize HTTP response variable
|
||||||
*/
|
*/
|
||||||
let httpResponse;
|
|
||||||
|
/** @type {import("../../package-shared/types").APILoginFunctionReturn} */
|
||||||
|
let httpResponse = {
|
||||||
|
success: false,
|
||||||
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Check for local DB settings
|
* Check for local DB settings
|
||||||
@ -163,18 +147,11 @@ async function googleAuth({
|
|||||||
if (dbSchema && apiUserID) {
|
if (dbSchema && apiUserID) {
|
||||||
httpResponse = await apiGoogleLogin({
|
httpResponse = await apiGoogleLogin({
|
||||||
token,
|
token,
|
||||||
clientId,
|
|
||||||
additionalFields,
|
additionalFields,
|
||||||
res: response,
|
|
||||||
database: DSQL_DB_NAME,
|
database: DSQL_DB_NAME,
|
||||||
userId: apiUserID,
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
////////////////////////////////////////
|
|
||||||
////////////////////////////////////////
|
|
||||||
////////////////////////////////////////
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Make https request
|
* Make https request
|
||||||
*
|
*
|
||||||
@ -184,7 +161,6 @@ async function googleAuth({
|
|||||||
httpResponse = await new Promise((resolve, reject) => {
|
httpResponse = await new Promise((resolve, reject) => {
|
||||||
const reqPayload = JSON.stringify({
|
const reqPayload = JSON.stringify({
|
||||||
token,
|
token,
|
||||||
clientId,
|
|
||||||
database,
|
database,
|
||||||
additionalFields,
|
additionalFields,
|
||||||
});
|
});
|
||||||
@ -233,44 +209,45 @@ async function googleAuth({
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
////////////////////////////////////////
|
|
||||||
////////////////////////////////////////
|
|
||||||
////////////////////////////////////////
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Make https request
|
* Make https request
|
||||||
*
|
*
|
||||||
* @description make a request to datasquirel.com
|
* @description make a request to datasquirel.com
|
||||||
*/
|
*/
|
||||||
if (httpResponse?.success && httpResponse?.user) {
|
if (httpResponse?.success && httpResponse?.payload) {
|
||||||
let encryptedPayload = encrypt({
|
let encryptedPayload = encrypt({
|
||||||
data: JSON.stringify(httpResponse.user),
|
data: JSON.stringify(httpResponse.payload),
|
||||||
encryptionKey,
|
encryptionKey: finalEncryptionKey,
|
||||||
encryptionSalt,
|
encryptionSalt: finalEncryptionSalt,
|
||||||
});
|
});
|
||||||
|
|
||||||
const { user, dsqlUserId } = httpResponse;
|
const cookieNames = getAuthCookieNames({
|
||||||
|
database,
|
||||||
|
userId: apiUserID || process.env.DSQL_API_USER_ID,
|
||||||
|
});
|
||||||
|
|
||||||
const authKeyName = `datasquirel_${dsqlUserId}_${database}_auth_key`;
|
console.log("apiUserID", apiUserID);
|
||||||
const csrfName = `datasquirel_${dsqlUserId}_${database}_csrf`;
|
|
||||||
|
|
||||||
response.setHeader("Set-Cookie", [
|
if (httpResponse.csrf) {
|
||||||
`${authKeyName}=${encryptedPayload};samesite=strict;path=/;HttpOnly=true;Secure=true`,
|
writeAuthFile(
|
||||||
`${csrfName}=${user.csrf_k};samesite=strict;path=/;HttpOnly=true`,
|
httpResponse.csrf,
|
||||||
`dsqluid=${dsqlUserId};samesite=strict;path=/;HttpOnly=true`,
|
JSON.stringify(httpResponse.payload)
|
||||||
`datasquirel_social_id=${user.social_id};samesite=strict;path=/`,
|
);
|
||||||
]);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
////////////////////////////////////////
|
httpResponse["cookieNames"] = cookieNames;
|
||||||
////////////////////////////////////////
|
httpResponse["key"] = String(encryptedPayload);
|
||||||
////////////////////////////////////////
|
|
||||||
|
const authKeyName = cookieNames.keyCookieName;
|
||||||
|
const csrfName = cookieNames.csrfCookieName;
|
||||||
|
|
||||||
|
response?.setHeader("Set-Cookie", [
|
||||||
|
`${authKeyName}=${encryptedPayload};samesite=strict;path=/;HttpOnly=true;Secure=true`,
|
||||||
|
`${csrfName}=${httpResponse.payload?.csrf_k};samesite=strict;path=/;HttpOnly=true`,
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
return httpResponse;
|
return httpResponse;
|
||||||
}
|
}
|
||||||
|
|
||||||
////////////////////////////////////////
|
|
||||||
////////////////////////////////////////
|
|
||||||
////////////////////////////////////////
|
|
||||||
|
|
||||||
module.exports = googleAuth;
|
module.exports = googleAuth;
|
||||||
|
12
users/update-user.d.ts
vendored
12
users/update-user.d.ts
vendored
@ -4,20 +4,20 @@ export = updateUser;
|
|||||||
* @async
|
* @async
|
||||||
*
|
*
|
||||||
* @param {object} params - API Key
|
* @param {object} params - API Key
|
||||||
* @param {String} params.key - API Key
|
* @param {String} [params.key] - API Key
|
||||||
* @param {String} params.database - Target Database
|
* @param {String} params.database - Target Database
|
||||||
* @param {{ id: number } & Object.<string, any>} params.payload - User Object: ID is required
|
* @param {String | number} params.updatedUserId - Target Database
|
||||||
|
* @param {Object.<string, any>} params.payload - User Object: ID is required
|
||||||
* @param {boolean} [params.user_id] - User ID
|
* @param {boolean} [params.user_id] - User ID
|
||||||
* @param {boolean} [params.useLocal]
|
* @param {boolean} [params.useLocal]
|
||||||
*
|
*
|
||||||
* @returns { Promise<import("../package-shared/types").UpdateUserFunctionReturn>}
|
* @returns { Promise<import("../package-shared/types").UpdateUserFunctionReturn>}
|
||||||
*/
|
*/
|
||||||
declare function updateUser({ key, payload, database, user_id, useLocal }: {
|
declare function updateUser({ key, payload, database, user_id, useLocal, updatedUserId, }: {
|
||||||
key: string;
|
key?: string;
|
||||||
database: string;
|
database: string;
|
||||||
|
updatedUserId: string | number;
|
||||||
payload: {
|
payload: {
|
||||||
id: number;
|
|
||||||
} & {
|
|
||||||
[x: string]: any;
|
[x: string]: any;
|
||||||
};
|
};
|
||||||
user_id?: boolean;
|
user_id?: boolean;
|
||||||
|
@ -12,15 +12,23 @@ const apiUpdateUser = require("../package-shared/functions/api/users/api-update-
|
|||||||
* @async
|
* @async
|
||||||
*
|
*
|
||||||
* @param {object} params - API Key
|
* @param {object} params - API Key
|
||||||
* @param {String} params.key - API Key
|
* @param {String} [params.key] - API Key
|
||||||
* @param {String} params.database - Target Database
|
* @param {String} params.database - Target Database
|
||||||
* @param {{ id: number } & Object.<string, any>} params.payload - User Object: ID is required
|
* @param {String | number} params.updatedUserId - Target Database
|
||||||
|
* @param {Object.<string, any>} params.payload - User Object: ID is required
|
||||||
* @param {boolean} [params.user_id] - User ID
|
* @param {boolean} [params.user_id] - User ID
|
||||||
* @param {boolean} [params.useLocal]
|
* @param {boolean} [params.useLocal]
|
||||||
*
|
*
|
||||||
* @returns { Promise<import("../package-shared/types").UpdateUserFunctionReturn>}
|
* @returns { Promise<import("../package-shared/types").UpdateUserFunctionReturn>}
|
||||||
*/
|
*/
|
||||||
async function updateUser({ key, payload, database, user_id, useLocal }) {
|
async function updateUser({
|
||||||
|
key,
|
||||||
|
payload,
|
||||||
|
database,
|
||||||
|
user_id,
|
||||||
|
useLocal,
|
||||||
|
updatedUserId,
|
||||||
|
}) {
|
||||||
/**
|
/**
|
||||||
* Check for local DB settings
|
* Check for local DB settings
|
||||||
*
|
*
|
||||||
@ -54,6 +62,8 @@ async function updateUser({ key, payload, database, user_id, useLocal }) {
|
|||||||
payload: payload,
|
payload: payload,
|
||||||
dbFullName: DSQL_DB_NAME,
|
dbFullName: DSQL_DB_NAME,
|
||||||
useLocal,
|
useLocal,
|
||||||
|
updatedUserId,
|
||||||
|
dbSchema,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -67,6 +77,7 @@ async function updateUser({ key, payload, database, user_id, useLocal }) {
|
|||||||
const reqPayload = JSON.stringify({
|
const reqPayload = JSON.stringify({
|
||||||
payload,
|
payload,
|
||||||
database,
|
database,
|
||||||
|
updatedUserId,
|
||||||
});
|
});
|
||||||
|
|
||||||
const httpsRequest = scheme.request(
|
const httpsRequest = scheme.request(
|
||||||
|
32
users/user-auth.d.ts
vendored
32
users/user-auth.d.ts
vendored
@ -6,21 +6,31 @@ export = userAuth;
|
|||||||
* with the user's data
|
* with the user's data
|
||||||
*
|
*
|
||||||
* @param {Object} params - Arg
|
* @param {Object} params - Arg
|
||||||
* @param {http.IncomingMessage} params.request - Http request object
|
* @param {http.IncomingMessage & Object<string, any>} [params.request] - Http request object
|
||||||
* @param {string} params.encryptionKey - Encryption Key
|
* @param {http.IncomingMessage & Object<string, any>} [params.req] - Http request object
|
||||||
* @param {string} params.encryptionSalt - Encryption Salt
|
* @param {string} [params.encryptedUserString] - Encrypted user string to use instead of getting from cookie header
|
||||||
|
* @param {string} [params.encryptionKey] - Encryption Key: alt env: DSQL_ENCRYPTION_PASSWORD
|
||||||
|
* @param {string} [params.encryptionSalt] - Encryption Salt: alt env: DSQL_ENCRYPTION_SALT
|
||||||
* @param {("deep" | "normal")} [params.level] - Optional. "Deep" value indicates an extra layer of security
|
* @param {("deep" | "normal")} [params.level] - Optional. "Deep" value indicates an extra layer of security
|
||||||
* @param {string} params.database - Database Name
|
* @param {string} [params.database] - Database Name (slug)
|
||||||
* @param {string} [params.token] - access token to use instead of getting from cookie header
|
* @param {string | number} [params.dsqlUserId] - alt env: DSQL_API_USER_ID
|
||||||
|
* @param {number} [params.expiry] - Expiry time in milliseconds
|
||||||
*
|
*
|
||||||
* @returns { import("../package-shared/types").AuthenticatedUser }
|
* @returns { import("../package-shared/types").AuthenticatedUser }
|
||||||
*/
|
*/
|
||||||
declare function userAuth({ request, encryptionKey, encryptionSalt, level, database, token, }: {
|
declare function userAuth({ request, req, encryptionKey, encryptionSalt, level, database, dsqlUserId, encryptedUserString, expiry, }: {
|
||||||
request: http.IncomingMessage;
|
request?: http.IncomingMessage & {
|
||||||
encryptionKey: string;
|
[x: string]: any;
|
||||||
encryptionSalt: string;
|
};
|
||||||
|
req?: http.IncomingMessage & {
|
||||||
|
[x: string]: any;
|
||||||
|
};
|
||||||
|
encryptedUserString?: string;
|
||||||
|
encryptionKey?: string;
|
||||||
|
encryptionSalt?: string;
|
||||||
level?: ("deep" | "normal");
|
level?: ("deep" | "normal");
|
||||||
database: string;
|
database?: string;
|
||||||
token?: string;
|
dsqlUserId?: string | number;
|
||||||
|
expiry?: number;
|
||||||
}): import("../package-shared/types").AuthenticatedUser;
|
}): import("../package-shared/types").AuthenticatedUser;
|
||||||
import http = require("http");
|
import http = require("http");
|
||||||
|
@ -4,6 +4,16 @@ const http = require("http");
|
|||||||
const decrypt = require("../package-shared/functions/dsql/decrypt");
|
const decrypt = require("../package-shared/functions/dsql/decrypt");
|
||||||
const parseCookies = require("../utils/functions/parseCookies");
|
const parseCookies = require("../utils/functions/parseCookies");
|
||||||
const getAuthCookieNames = require("../package-shared/functions/backend/cookies/get-auth-cookie-names");
|
const getAuthCookieNames = require("../package-shared/functions/backend/cookies/get-auth-cookie-names");
|
||||||
|
const {
|
||||||
|
checkAuthFile,
|
||||||
|
} = require("../package-shared/functions/backend/auth/write-auth-files");
|
||||||
|
|
||||||
|
const minuteInMilliseconds = 60000;
|
||||||
|
const hourInMilliseconds = minuteInMilliseconds * 60;
|
||||||
|
const dayInMilliseconds = hourInMilliseconds * 24;
|
||||||
|
const weekInMilliseconds = dayInMilliseconds * 7;
|
||||||
|
const monthInMilliseconds = dayInMilliseconds * 30;
|
||||||
|
const yearInMilliseconds = dayInMilliseconds * 365;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Authenticate User from request
|
* Authenticate User from request
|
||||||
@ -12,37 +22,48 @@ const getAuthCookieNames = require("../package-shared/functions/backend/cookies/
|
|||||||
* with the user's data
|
* with the user's data
|
||||||
*
|
*
|
||||||
* @param {Object} params - Arg
|
* @param {Object} params - Arg
|
||||||
* @param {http.IncomingMessage} params.request - Http request object
|
* @param {http.IncomingMessage & Object<string, any>} [params.request] - Http request object
|
||||||
* @param {string} params.encryptionKey - Encryption Key
|
* @param {http.IncomingMessage & Object<string, any>} [params.req] - Http request object
|
||||||
* @param {string} params.encryptionSalt - Encryption Salt
|
* @param {string} [params.encryptedUserString] - Encrypted user string to use instead of getting from cookie header
|
||||||
|
* @param {string} [params.encryptionKey] - Encryption Key: alt env: DSQL_ENCRYPTION_PASSWORD
|
||||||
|
* @param {string} [params.encryptionSalt] - Encryption Salt: alt env: DSQL_ENCRYPTION_SALT
|
||||||
* @param {("deep" | "normal")} [params.level] - Optional. "Deep" value indicates an extra layer of security
|
* @param {("deep" | "normal")} [params.level] - Optional. "Deep" value indicates an extra layer of security
|
||||||
* @param {string} params.database - Database Name
|
* @param {string} [params.database] - Database Name (slug)
|
||||||
* @param {string} [params.token] - access token to use instead of getting from cookie header
|
* @param {string | number} [params.dsqlUserId] - alt env: DSQL_API_USER_ID
|
||||||
|
* @param {number} [params.expiry] - Expiry time in milliseconds
|
||||||
*
|
*
|
||||||
* @returns { import("../package-shared/types").AuthenticatedUser }
|
* @returns { import("../package-shared/types").AuthenticatedUser }
|
||||||
*/
|
*/
|
||||||
function userAuth({
|
function userAuth({
|
||||||
request,
|
request,
|
||||||
|
req,
|
||||||
encryptionKey,
|
encryptionKey,
|
||||||
encryptionSalt,
|
encryptionSalt,
|
||||||
level,
|
level,
|
||||||
database,
|
database,
|
||||||
token,
|
dsqlUserId,
|
||||||
|
encryptedUserString,
|
||||||
|
expiry = weekInMilliseconds,
|
||||||
}) {
|
}) {
|
||||||
try {
|
try {
|
||||||
/**
|
const finalEncryptionKey =
|
||||||
* Grab the payload
|
encryptionKey || process.env.DSQL_ENCRYPTION_PASSWORD;
|
||||||
*
|
const finalEncryptionSalt =
|
||||||
* @description Grab the payload
|
encryptionSalt || process.env.DSQL_ENCRYPTION_SALT;
|
||||||
*/
|
|
||||||
const cookies = parseCookies({ request });
|
|
||||||
|
|
||||||
const keyNames = getAuthCookieNames();
|
const cookies = parseCookies({ request: request || req });
|
||||||
|
|
||||||
|
const keyNames = getAuthCookieNames({
|
||||||
|
userId: dsqlUserId || process.env.DSQL_API_USER_ID,
|
||||||
|
database: database || process.env.DSQL_DB_NAME,
|
||||||
|
});
|
||||||
|
|
||||||
const authKeyName = keyNames.keyCookieName;
|
const authKeyName = keyNames.keyCookieName;
|
||||||
const csrfName = keyNames.csrfCookieName;
|
const csrfName = keyNames.csrfCookieName;
|
||||||
|
|
||||||
const key = token ? token : cookies[authKeyName];
|
const key = encryptedUserString
|
||||||
|
? encryptedUserString
|
||||||
|
: cookies[authKeyName];
|
||||||
const csrf = cookies[csrfName];
|
const csrf = cookies[csrfName];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -50,10 +71,10 @@ function userAuth({
|
|||||||
*
|
*
|
||||||
* @description Grab the payload
|
* @description Grab the payload
|
||||||
*/
|
*/
|
||||||
let userPayload = decrypt({
|
let userPayloadJSON = decrypt({
|
||||||
encryptedString: key,
|
encryptedString: key,
|
||||||
encryptionKey,
|
encryptionKey: finalEncryptionKey,
|
||||||
encryptionSalt,
|
encryptionSalt: finalEncryptionSalt,
|
||||||
});
|
});
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -61,7 +82,7 @@ function userAuth({
|
|||||||
*
|
*
|
||||||
* @description Grab the payload
|
* @description Grab the payload
|
||||||
*/
|
*/
|
||||||
if (!userPayload) {
|
if (!userPayloadJSON) {
|
||||||
return {
|
return {
|
||||||
success: false,
|
success: false,
|
||||||
payload: null,
|
payload: null,
|
||||||
@ -74,7 +95,9 @@ function userAuth({
|
|||||||
*
|
*
|
||||||
* @description Grab the payload
|
* @description Grab the payload
|
||||||
*/
|
*/
|
||||||
let userObject = JSON.parse(userPayload);
|
|
||||||
|
/** @type {import("../package-shared/types").DATASQUIREL_LoggedInUser} */
|
||||||
|
let userObject = JSON.parse(userPayloadJSON);
|
||||||
|
|
||||||
if (!userObject.csrf_k) {
|
if (!userObject.csrf_k) {
|
||||||
return {
|
return {
|
||||||
@ -84,6 +107,14 @@ function userAuth({
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!checkAuthFile(userObject.csrf_k)) {
|
||||||
|
return {
|
||||||
|
success: false,
|
||||||
|
payload: null,
|
||||||
|
msg: "Auth file doesn't exist",
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Grab the payload
|
* Grab the payload
|
||||||
*
|
*
|
||||||
@ -100,6 +131,33 @@ function userAuth({
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const payloadCreationDate = Number(userObject.date);
|
||||||
|
|
||||||
|
if (
|
||||||
|
Number.isNaN(payloadCreationDate) ||
|
||||||
|
typeof payloadCreationDate !== "number"
|
||||||
|
) {
|
||||||
|
return {
|
||||||
|
success: false,
|
||||||
|
payload: null,
|
||||||
|
msg: "Payload Creation Date is not a number",
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
const timeElapsed = Date.now() - payloadCreationDate;
|
||||||
|
|
||||||
|
const finalExpiry = process.env.DSQL_SESSION_EXPIRY_TIME
|
||||||
|
? Number(process.env.DSQL_SESSION_EXPIRY_TIME)
|
||||||
|
: expiry;
|
||||||
|
|
||||||
|
if (timeElapsed > finalExpiry) {
|
||||||
|
return {
|
||||||
|
success: false,
|
||||||
|
payload: null,
|
||||||
|
msg: "Session has expired",
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Return User Object
|
* Return User Object
|
||||||
*
|
*
|
||||||
|
2
utils/functions/parseCookies.d.ts
vendored
2
utils/functions/parseCookies.d.ts
vendored
@ -1,5 +1,5 @@
|
|||||||
declare function _exports({ request }: {
|
declare function _exports({ request }: {
|
||||||
request: http.IncomingMessage;
|
request?: http.IncomingMessage;
|
||||||
}): any | null;
|
}): any | null;
|
||||||
export = _exports;
|
export = _exports;
|
||||||
import http = require("http");
|
import http = require("http");
|
||||||
|
@ -16,16 +16,12 @@ const http = require("http");
|
|||||||
* @async
|
* @async
|
||||||
*
|
*
|
||||||
* @param {object} params - main params object
|
* @param {object} params - main params object
|
||||||
* @param {http.IncomingMessage} params.request - HTTPS request object
|
* @param {http.IncomingMessage} [params.request] - HTTPS request object
|
||||||
*
|
*
|
||||||
* @returns {* | null}
|
* @returns {* | null}
|
||||||
*/
|
*/
|
||||||
module.exports = function ({ request }) {
|
module.exports = function ({ request }) {
|
||||||
/**
|
if (!request) return {};
|
||||||
* Check inputs
|
|
||||||
*
|
|
||||||
* @description Check inputs
|
|
||||||
*/
|
|
||||||
|
|
||||||
////////////////////////////////////////
|
////////////////////////////////////////
|
||||||
////////////////////////////////////////
|
////////////////////////////////////////
|
||||||
@ -47,7 +43,10 @@ module.exports = function ({ request }) {
|
|||||||
cookieSplitArray.forEach((keyValueString) => {
|
cookieSplitArray.forEach((keyValueString) => {
|
||||||
const [key, value] = keyValueString.split("=");
|
const [key, value] = keyValueString.split("=");
|
||||||
if (key && typeof key == "string") {
|
if (key && typeof key == "string") {
|
||||||
cookieObject[key.replace(/^ +| +$/, "")] = value && typeof value == "string" ? value.replace(/^ +| +$/, "") : null;
|
cookieObject[key.replace(/^ +| +$/, "")] =
|
||||||
|
value && typeof value == "string"
|
||||||
|
? value.replace(/^ +| +$/, "")
|
||||||
|
: null;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
4
utils/get.d.ts
vendored
4
utils/get.d.ts
vendored
@ -11,7 +11,7 @@ export = get;
|
|||||||
* @param {string[]} [params.queryValues] - An array of query values if using "?" placeholders
|
* @param {string[]} [params.queryValues] - An array of query values if using "?" placeholders
|
||||||
* @param {string} [params.tableName] - Name of the table to query
|
* @param {string} [params.tableName] - Name of the table to query
|
||||||
* @param {boolean} [params.useLocal] - Whether to use a remote database instead of API
|
* @param {boolean} [params.useLocal] - Whether to use a remote database instead of API
|
||||||
* @param {boolean} [params.user_id] - User ID
|
* @param {string | number} [params.user_id] - User ID
|
||||||
*
|
*
|
||||||
* @returns { Promise<import("../package-shared/types").GetReturn> } - Return Object
|
* @returns { Promise<import("../package-shared/types").GetReturn> } - Return Object
|
||||||
*/
|
*/
|
||||||
@ -22,5 +22,5 @@ declare function get({ key, db, query, queryValues, tableName, useLocal, user_id
|
|||||||
queryValues?: string[];
|
queryValues?: string[];
|
||||||
tableName?: string;
|
tableName?: string;
|
||||||
useLocal?: boolean;
|
useLocal?: boolean;
|
||||||
user_id?: boolean;
|
user_id?: string | number;
|
||||||
}): Promise<import("../package-shared/types").GetReturn>;
|
}): Promise<import("../package-shared/types").GetReturn>;
|
||||||
|
@ -19,7 +19,7 @@ const apiGet = require("../package-shared/functions/api/query/get");
|
|||||||
* @param {string[]} [params.queryValues] - An array of query values if using "?" placeholders
|
* @param {string[]} [params.queryValues] - An array of query values if using "?" placeholders
|
||||||
* @param {string} [params.tableName] - Name of the table to query
|
* @param {string} [params.tableName] - Name of the table to query
|
||||||
* @param {boolean} [params.useLocal] - Whether to use a remote database instead of API
|
* @param {boolean} [params.useLocal] - Whether to use a remote database instead of API
|
||||||
* @param {boolean} [params.user_id] - User ID
|
* @param {string | number} [params.user_id] - User ID
|
||||||
*
|
*
|
||||||
* @returns { Promise<import("../package-shared/types").GetReturn> } - Return Object
|
* @returns { Promise<import("../package-shared/types").GetReturn> } - Return Object
|
||||||
*/
|
*/
|
||||||
@ -112,6 +112,8 @@ async function get({
|
|||||||
path: encodeURI(path),
|
path: encodeURI(path),
|
||||||
};
|
};
|
||||||
|
|
||||||
|
console.log("requestObject", requestObject);
|
||||||
|
|
||||||
scheme
|
scheme
|
||||||
.request(
|
.request(
|
||||||
requestObject,
|
requestObject,
|
||||||
|
Loading…
Reference in New Issue
Block a user