Update Types

This commit is contained in:
Tben 2023-08-13 15:25:06 +01:00
parent 7da50b1382
commit a9007c8c83
11 changed files with 13 additions and 11 deletions

View File

@ -1,6 +1,7 @@
// @ts-check // @ts-check
const decrypt = require("../../../functions/decrypt"); const decrypt = require("../../../functions/decrypt");
// @ts-ignore
const defaultFieldsRegexp = require("./defaultFieldsRegexp"); const defaultFieldsRegexp = require("./defaultFieldsRegexp");
/** /**

View File

@ -20,7 +20,7 @@ const dbHandler = require("../../engine/utils/dbHandler");
* "Read only" or "Full Access"? Defaults to "Read Only" * "Read only" or "Full Access"? Defaults to "Read Only"
* @param {string} params.dbFullName - Database full name * @param {string} params.dbFullName - Database full name
* @param {string} params.tableName - Table name * @param {string} params.tableName - Table name
* @param {object} params.data - Data to add * @param {*} params.data - Data to add
* @param {import("../../../types/database-schema.td").DSQL_TableSchemaType} [params.tableSchema] - Table schema * @param {import("../../../types/database-schema.td").DSQL_TableSchemaType} [params.tableSchema] - Table schema
* @param {string} params.identifierColumnName - Update row identifier column name * @param {string} params.identifierColumnName - Update row identifier column name
* @param {string | number} params.identifierValue - Update row identifier column value * @param {string | number} params.identifierValue - Update row identifier column value

View File

@ -117,6 +117,7 @@ async function loginLocalUser({ payload, additionalFields, dbSchema }) {
if (additionalFields && Array.isArray(additionalFields) && additionalFields.length > 0) { if (additionalFields && Array.isArray(additionalFields) && additionalFields.length > 0) {
additionalFields.forEach((key) => { additionalFields.forEach((key) => {
// @ts-ignore
userPayload[key] = foundUser?.[0][key]; userPayload[key] = foundUser?.[0][key];
}); });
} }

View File

@ -74,6 +74,7 @@ async function localReauthUser({ existingUser, additionalFields, dbSchema }) {
if (additionalFields && Array.isArray(additionalFields) && additionalFields.length > 0) { if (additionalFields && Array.isArray(additionalFields) && additionalFields.length > 0) {
additionalFields.forEach((key) => { additionalFields.forEach((key) => {
// @ts-ignore
userPayload[key] = foundUser?.[0][key]; userPayload[key] = foundUser?.[0][key];
}); });
} }

View File

@ -96,6 +96,7 @@ async function localGithubAuth({ res, code, email, clientId, clientSecret, addit
if (additionalFields && Object.keys(additionalFields).length > 0) { if (additionalFields && Object.keys(additionalFields).length > 0) {
Object.keys(additionalFields).forEach((key) => { Object.keys(additionalFields).forEach((key) => {
// @ts-ignore
payload[key] = additionalFields[key]; payload[key] = additionalFields[key];
}); });
} }

View File

@ -122,6 +122,7 @@ async function localGoogleAuth({ dbSchema, token, clientId, response, additional
if (additionalFields && Object.keys(additionalFields).length > 0) { if (additionalFields && Object.keys(additionalFields).length > 0) {
Object.keys(additionalFields).forEach((key) => { Object.keys(additionalFields).forEach((key) => {
// @ts-ignore
payloadObject[key] = additionalFields[key]; payloadObject[key] = additionalFields[key];
}); });
} }

View File

@ -71,7 +71,7 @@ const encryptionSalt = process.env.DSQL_ENCRYPTION_SALT || "";
* image_thumbnail: string, * image_thumbnail: string,
* username: string, * username: string,
* }, * },
* res: object|null, * res: http.ServerResponse,
* invitation?: object|null, * invitation?: object|null,
* supEmail?: string | null, * supEmail?: string | null,
* additionalFields?: object, * additionalFields?: object,
@ -99,7 +99,6 @@ async function handleSocialDb({ social_id, email, social_platform, payload, res,
user: existingSocialIdUser[0], user: existingSocialIdUser[0],
social_platform, social_platform,
res, res,
invitation,
database, database,
additionalFields, additionalFields,
}); });
@ -154,7 +153,6 @@ async function handleSocialDb({ social_id, email, social_platform, payload, res,
user: payload, user: payload,
social_platform, social_platform,
res, res,
invitation,
database, database,
additionalFields, additionalFields,
}); });
@ -177,6 +175,7 @@ async function handleSocialDb({ social_id, email, social_platform, payload, res,
}; };
Object.keys(payload).forEach((key) => { Object.keys(payload).forEach((key) => {
// @ts-ignore
data[key] = payload[key]; data[key] = payload[key];
}); });
@ -236,7 +235,6 @@ async function handleSocialDb({ social_id, email, social_platform, payload, res,
user: newUserQueried[0], user: newUserQueried[0],
social_platform, social_platform,
res, res,
invitation,
database, database,
additionalFields, additionalFields,
}); });
@ -303,7 +301,6 @@ async function handleSocialDb({ social_id, email, social_platform, payload, res,
* }} params.user - user object * }} params.user - user object
* @param {string} params.social_platform - Whether its "google" or "facebook" or "github" * @param {string} params.social_platform - Whether its "google" or "facebook" or "github"
* @param {http.ServerResponse} params.res - Https response object * @param {http.ServerResponse} params.res - Https response object
* @param {object} params.invitation - A query object if user was invited
* @param {string|null} params.database - Target Database * @param {string|null} params.database - Target Database
* @param {object} [params.additionalFields] - Additional fields to be added to the user payload * @param {object} [params.additionalFields] - Additional fields to be added to the user payload
* *
@ -313,7 +310,7 @@ async function handleSocialDb({ social_id, email, social_platform, payload, res,
* msg?: string * msg?: string
* }>} * }>}
*/ */
async function loginSocialUser({ user, social_platform, res, invitation, database, additionalFields }) { async function loginSocialUser({ user, social_platform, res, database, additionalFields }) {
const foundUser = await varDatabaseDbHandler({ const foundUser = await varDatabaseDbHandler({
database: database ? database : "datasquirel", database: database ? database : "datasquirel",
queryString: `SELECT * FROM users WHERE email='${user.email}' AND social_id='${user.social_id}' AND social_platform='${social_platform}'`, queryString: `SELECT * FROM users WHERE email='${user.email}' AND social_id='${user.social_id}' AND social_platform='${social_platform}'`,
@ -350,6 +347,7 @@ async function loginSocialUser({ user, social_platform, res, invitation, databas
if (additionalFields && Object.keys(additionalFields).length > 0) { if (additionalFields && Object.keys(additionalFields).length > 0) {
Object.keys(additionalFields).forEach((key) => { Object.keys(additionalFields).forEach((key) => {
// @ts-ignore
userPayload[key] = foundUser[0][key]; userPayload[key] = foundUser[0][key];
}); });
} }

View File

@ -1,5 +1,3 @@
// @ts-check
/** /**
* Imports * Imports
* ============================================================================== * ==============================================================================

View File

@ -47,6 +47,7 @@ async function localUpdateUser({ payload, dbSchema }) {
reqBodyKeys.forEach((key) => { reqBodyKeys.forEach((key) => {
if (key?.match(/^date_|^id$/)) return; if (key?.match(/^date_|^id$/)) return;
// @ts-ignore
finalData[key] = payload[key]; finalData[key] = payload[key];
}); });

View File

@ -1,6 +1,6 @@
{ {
"name": "datasquirel", "name": "datasquirel",
"version": "1.7.2", "version": "1.7.3",
"description": "Cloud-based SQL data management tool", "description": "Cloud-based SQL data management tool",
"main": "index.js", "main": "index.js",
"bin": { "bin": {

View File

@ -43,7 +43,7 @@ const localGithubAuth = require("../../engine/user/social/github-auth");
* @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
* *
* @returns { Promise<FunctionReturn | undefined> } * @returns { Promise<FunctionReturn | undefined> }
*/ */