From e4c6c995ef4ef7780d4becffe68b11688db47795 Mon Sep 17 00:00:00 2001 From: Benjamin Toby Date: Sun, 4 May 2025 17:52:51 +0100 Subject: [PATCH] Updates --- .../package-shared/actions/users/social/google-auth.d.ts | 3 ++- dist/package-shared/actions/users/social/google-auth.js | 2 +- .../functions/api/social-login/handleSocialDb.d.ts | 2 +- .../functions/api/social-login/handleSocialDb.js | 9 ++++++++- .../functions/api/users/social/api-google-login.d.ts | 2 +- .../functions/api/users/social/api-google-login.js | 3 ++- dist/package-shared/types/index.d.ts | 2 ++ package-shared/actions/users/social/google-auth.ts | 2 ++ .../functions/api/social-login/handleSocialDb.ts | 7 +++++++ .../functions/api/users/social/api-google-login.ts | 2 ++ package-shared/types/index.ts | 2 ++ package.json | 2 +- 12 files changed, 31 insertions(+), 7 deletions(-) diff --git a/dist/package-shared/actions/users/social/google-auth.d.ts b/dist/package-shared/actions/users/social/google-auth.d.ts index 470918d..752666b 100644 --- a/dist/package-shared/actions/users/social/google-auth.d.ts +++ b/dist/package-shared/actions/users/social/google-auth.d.ts @@ -14,9 +14,10 @@ type Param = { apiUserID?: string | number; debug?: boolean; secureCookie?: boolean; + loginOnly?: boolean; }; /** * # SERVER FUNCTION: Login with google Function */ -export default function googleAuth({ key, token, database, response, encryptionKey, encryptionSalt, additionalFields, additionalData, apiUserID, debug, secureCookie, }: Param): Promise; +export default function googleAuth({ key, token, database, response, encryptionKey, encryptionSalt, additionalFields, additionalData, apiUserID, debug, secureCookie, loginOnly, }: Param): Promise; export {}; diff --git a/dist/package-shared/actions/users/social/google-auth.js b/dist/package-shared/actions/users/social/google-auth.js index 8bd84b7..5e5371f 100644 --- a/dist/package-shared/actions/users/social/google-auth.js +++ b/dist/package-shared/actions/users/social/google-auth.js @@ -23,7 +23,7 @@ const grab_cookie_expirt_date_1 = __importDefault(require("../../../utils/grab-c * # SERVER FUNCTION: Login with google Function */ function googleAuth(_a) { - return __awaiter(this, arguments, void 0, function* ({ key, token, database, response, encryptionKey, encryptionSalt, additionalFields, additionalData, apiUserID, debug, secureCookie, }) { + return __awaiter(this, arguments, void 0, function* ({ key, token, database, response, encryptionKey, encryptionSalt, additionalFields, additionalData, apiUserID, debug, secureCookie, loginOnly, }) { var _b; const grabedHostNames = (0, grab_host_names_1.default)({ userId: apiUserID || process.env.DSQL_API_USER_ID, diff --git a/dist/package-shared/functions/api/social-login/handleSocialDb.d.ts b/dist/package-shared/functions/api/social-login/handleSocialDb.d.ts index 037499e..6827794 100644 --- a/dist/package-shared/functions/api/social-login/handleSocialDb.d.ts +++ b/dist/package-shared/functions/api/social-login/handleSocialDb.d.ts @@ -2,4 +2,4 @@ import { APILoginFunctionReturn, HandleSocialDbFunctionParams } from "../../../t /** * # Handle Social DB */ -export default function handleSocialDb({ database, social_id, email, social_platform, payload, invitation, supEmail, additionalFields, debug, }: HandleSocialDbFunctionParams): Promise; +export default function handleSocialDb({ database, social_id, email, social_platform, payload, invitation, supEmail, additionalFields, debug, loginOnly, }: HandleSocialDbFunctionParams): Promise; diff --git a/dist/package-shared/functions/api/social-login/handleSocialDb.js b/dist/package-shared/functions/api/social-login/handleSocialDb.js index a466291..94f5b63 100644 --- a/dist/package-shared/functions/api/social-login/handleSocialDb.js +++ b/dist/package-shared/functions/api/social-login/handleSocialDb.js @@ -25,7 +25,7 @@ const loginSocialUser_1 = __importDefault(require("./loginSocialUser")); * # Handle Social DB */ function handleSocialDb(_a) { - return __awaiter(this, arguments, void 0, function* ({ database, social_id, email, social_platform, payload, invitation, supEmail, additionalFields, debug, }) { + return __awaiter(this, arguments, void 0, function* ({ database, social_id, email, social_platform, payload, invitation, supEmail, additionalFields, debug, loginOnly, }) { var _b; try { const finalDbName = global.DSQL_USE_LOCAL @@ -62,6 +62,13 @@ function handleSocialDb(_a) { debug, }); } + else if (loginOnly) { + return { + success: false, + payload: null, + msg: "User Does not Exist", + }; + } const finalEmail = email ? email : supEmail ? supEmail : null; if (!finalEmail) { return { diff --git a/dist/package-shared/functions/api/users/social/api-google-login.d.ts b/dist/package-shared/functions/api/users/social/api-google-login.d.ts index 145fb07..b3bbbf7 100644 --- a/dist/package-shared/functions/api/users/social/api-google-login.d.ts +++ b/dist/package-shared/functions/api/users/social/api-google-login.d.ts @@ -2,4 +2,4 @@ import { APIGoogleLoginFunctionParams, APILoginFunctionReturn } from "../../../. /** * # API google login */ -export default function apiGoogleLogin({ token, database, additionalFields, additionalData, debug, }: APIGoogleLoginFunctionParams): Promise; +export default function apiGoogleLogin({ token, database, additionalFields, additionalData, debug, loginOnly, }: APIGoogleLoginFunctionParams): Promise; diff --git a/dist/package-shared/functions/api/users/social/api-google-login.js b/dist/package-shared/functions/api/users/social/api-google-login.js index 1c610f7..d5fa25e 100644 --- a/dist/package-shared/functions/api/users/social/api-google-login.js +++ b/dist/package-shared/functions/api/users/social/api-google-login.js @@ -20,7 +20,7 @@ const ejson_1 = __importDefault(require("../../../../utils/ejson")); * # API google login */ function apiGoogleLogin(_a) { - return __awaiter(this, arguments, void 0, function* ({ token, database, additionalFields, additionalData, debug, }) { + return __awaiter(this, arguments, void 0, function* ({ token, database, additionalFields, additionalData, debug, loginOnly, }) { try { const gUser = yield new Promise((resolve, reject) => { https_1.default @@ -71,6 +71,7 @@ function apiGoogleLogin(_a) { social_id: sub, additionalFields, debug, + loginOnly, }); //////////////////////////////////////// //////////////////////////////////////// diff --git a/dist/package-shared/types/index.d.ts b/dist/package-shared/types/index.d.ts index 903e99d..f0b7e91 100644 --- a/dist/package-shared/types/index.d.ts +++ b/dist/package-shared/types/index.d.ts @@ -1098,6 +1098,7 @@ export type APIGoogleLoginFunctionParams = { [key: string]: string | number; }; debug?: boolean; + loginOnly?: boolean; }; export type APIGoogleLoginFunction = (params: APIGoogleLoginFunctionParams) => Promise; /** @@ -1113,6 +1114,7 @@ export type HandleSocialDbFunctionParams = { supEmail?: string; additionalFields?: string[]; debug?: boolean; + loginOnly?: boolean; }; export type HandleSocialDbFunctionReturn = { success: boolean; diff --git a/package-shared/actions/users/social/google-auth.ts b/package-shared/actions/users/social/google-auth.ts index 82fda9b..8831858 100644 --- a/package-shared/actions/users/social/google-auth.ts +++ b/package-shared/actions/users/social/google-auth.ts @@ -19,6 +19,7 @@ type Param = { apiUserID?: string | number; debug?: boolean; secureCookie?: boolean; + loginOnly?: boolean; }; /** @@ -36,6 +37,7 @@ export default async function googleAuth({ apiUserID, debug, secureCookie, + loginOnly, }: Param): Promise { const grabedHostNames = grabHostNames({ userId: apiUserID || process.env.DSQL_API_USER_ID, diff --git a/package-shared/functions/api/social-login/handleSocialDb.ts b/package-shared/functions/api/social-login/handleSocialDb.ts index 4eb4016..bd68876 100644 --- a/package-shared/functions/api/social-login/handleSocialDb.ts +++ b/package-shared/functions/api/social-login/handleSocialDb.ts @@ -24,6 +24,7 @@ export default async function handleSocialDb({ supEmail, additionalFields, debug, + loginOnly, }: HandleSocialDbFunctionParams): Promise { try { const finalDbName = global.DSQL_USE_LOCAL @@ -73,6 +74,12 @@ export default async function handleSocialDb({ additionalFields, debug, }); + } else if (loginOnly) { + return { + success: false, + payload: null, + msg: "User Does not Exist", + }; } const finalEmail = email ? email : supEmail ? supEmail : null; diff --git a/package-shared/functions/api/users/social/api-google-login.ts b/package-shared/functions/api/users/social/api-google-login.ts index 2052e22..205cda4 100644 --- a/package-shared/functions/api/users/social/api-google-login.ts +++ b/package-shared/functions/api/users/social/api-google-login.ts @@ -16,6 +16,7 @@ export default async function apiGoogleLogin({ additionalFields, additionalData, debug, + loginOnly, }: APIGoogleLoginFunctionParams): Promise { try { const gUser: GoogleOauth2User | undefined = await new Promise( @@ -77,6 +78,7 @@ export default async function apiGoogleLogin({ social_id: sub, additionalFields, debug, + loginOnly, }); //////////////////////////////////////// diff --git a/package-shared/types/index.ts b/package-shared/types/index.ts index 20e524c..0e7a459 100644 --- a/package-shared/types/index.ts +++ b/package-shared/types/index.ts @@ -1266,6 +1266,7 @@ export type APIGoogleLoginFunctionParams = { additionalFields?: string[]; additionalData?: { [key: string]: string | number }; debug?: boolean; + loginOnly?: boolean; }; export type APIGoogleLoginFunction = ( @@ -1285,6 +1286,7 @@ export type HandleSocialDbFunctionParams = { supEmail?: string; additionalFields?: string[]; debug?: boolean; + loginOnly?: boolean; }; export type HandleSocialDbFunctionReturn = { diff --git a/package.json b/package.json index 8fec947..da38ac8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@moduletrace/datasquirel", - "version": "4.4.9", + "version": "4.5.0", "description": "Cloud-based SQL data management tool", "main": "dist/index.js", "bin": {