From 16191975f93cd1a0122f7f60a2682b2aa6b13d39 Mon Sep 17 00:00:00 2001 From: Benjamin Toby Date: Mon, 20 Jan 2025 08:50:36 +0100 Subject: [PATCH] Updates --- .../functions/api/users/social/api-github-login.d.ts | 3 ++- .../functions/api/users/social/api-github-login.js | 3 ++- .../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 | 1 + dist/users/social/google-auth.js | 1 + package-shared/functions/api/users/social/api-github-login.ts | 3 +++ package-shared/functions/api/users/social/api-google-login.ts | 2 ++ package-shared/types/index.ts | 1 + package.json | 2 +- users/social/google-auth.ts | 1 + 11 files changed, 17 insertions(+), 5 deletions(-) diff --git a/dist/package-shared/functions/api/users/social/api-github-login.d.ts b/dist/package-shared/functions/api/users/social/api-github-login.d.ts index 93e3442..599d8a1 100644 --- a/dist/package-shared/functions/api/users/social/api-github-login.d.ts +++ b/dist/package-shared/functions/api/users/social/api-github-login.d.ts @@ -9,9 +9,10 @@ type Param = { [s: string]: string | number; }; email?: string; + useLocal?: boolean; }; /** * # API Login with Github */ -export default function apiGithubLogin({ code, clientId, clientSecret, database, additionalFields, email, additionalData, }: Param): Promise; +export default function apiGithubLogin({ code, clientId, clientSecret, database, additionalFields, email, additionalData, useLocal, }: Param): Promise; export {}; diff --git a/dist/package-shared/functions/api/users/social/api-github-login.js b/dist/package-shared/functions/api/users/social/api-github-login.js index faf21f1..c22eb35 100644 --- a/dist/package-shared/functions/api/users/social/api-github-login.js +++ b/dist/package-shared/functions/api/users/social/api-github-login.js @@ -20,7 +20,7 @@ const camelJoinedtoCamelSpace_1 = __importDefault(require("../../../../utils/cam * # API Login with Github */ function apiGithubLogin(_a) { - return __awaiter(this, arguments, void 0, function* ({ code, clientId, clientSecret, database, additionalFields, email, additionalData, }) { + return __awaiter(this, arguments, void 0, function* ({ code, clientId, clientSecret, database, additionalFields, email, additionalData, useLocal, }) { if (!code || !clientId || !clientSecret || !database) { return { success: false, @@ -80,6 +80,7 @@ function apiGithubLogin(_a) { social_id: socialId, supEmail: email, additionalFields, + useLocal, }); //////////////////////////////////////////////// //////////////////////////////////////////////// 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..d2befcf 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, useLocal, }: 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..c810a87 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, useLocal, }) { try { const gUser = yield new Promise((resolve, reject) => { https_1.default @@ -71,6 +71,7 @@ function apiGoogleLogin(_a) { social_id: sub, additionalFields, debug, + useLocal, }); //////////////////////////////////////// //////////////////////////////////////// diff --git a/dist/package-shared/types/index.d.ts b/dist/package-shared/types/index.d.ts index dfb66c5..f25fe90 100644 --- a/dist/package-shared/types/index.d.ts +++ b/dist/package-shared/types/index.d.ts @@ -1074,6 +1074,7 @@ export type APIGoogleLoginFunctionParams = { [key: string]: string | number; }; debug?: boolean; + useLocal?: boolean; }; export type APIGoogleLoginFunction = (params: APIGoogleLoginFunctionParams) => Promise; /** diff --git a/dist/users/social/google-auth.js b/dist/users/social/google-auth.js index 1e93611..080e448 100644 --- a/dist/users/social/google-auth.js +++ b/dist/users/social/google-auth.js @@ -81,6 +81,7 @@ function googleAuth(_a) { additionalFields, additionalData, debug, + useLocal: true, }); } else { diff --git a/package-shared/functions/api/users/social/api-github-login.ts b/package-shared/functions/api/users/social/api-github-login.ts index 98ba564..63660fa 100644 --- a/package-shared/functions/api/users/social/api-github-login.ts +++ b/package-shared/functions/api/users/social/api-github-login.ts @@ -11,6 +11,7 @@ type Param = { additionalFields?: string[]; additionalData?: { [s: string]: string | number }; email?: string; + useLocal?: boolean; }; /** @@ -24,6 +25,7 @@ export default async function apiGithubLogin({ additionalFields, email, additionalData, + useLocal, }: Param): Promise { if (!code || !clientId || !clientSecret || !database) { return { @@ -93,6 +95,7 @@ export default async function apiGithubLogin({ social_id: socialId, supEmail: email, additionalFields, + useLocal, }); //////////////////////////////////////////////// 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..76850bf 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, + useLocal, }: APIGoogleLoginFunctionParams): Promise { try { const gUser: GoogleOauth2User | undefined = await new Promise( @@ -77,6 +78,7 @@ export default async function apiGoogleLogin({ social_id: sub, additionalFields, debug, + useLocal, }); //////////////////////////////////////// diff --git a/package-shared/types/index.ts b/package-shared/types/index.ts index c117600..093894a 100644 --- a/package-shared/types/index.ts +++ b/package-shared/types/index.ts @@ -1258,6 +1258,7 @@ export type APIGoogleLoginFunctionParams = { additionalFields?: string[]; additionalData?: { [key: string]: string | number }; debug?: boolean; + useLocal?: boolean; }; export type APIGoogleLoginFunction = ( diff --git a/package.json b/package.json index ea3bc85..ce35eb7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@moduletrace/datasquirel", - "version": "3.7.7", + "version": "3.7.8", "description": "Cloud-based SQL data management tool", "main": "dist/index.js", "bin": { diff --git a/users/social/google-auth.ts b/users/social/google-auth.ts index a78334a..37c7cea 100644 --- a/users/social/google-auth.ts +++ b/users/social/google-auth.ts @@ -107,6 +107,7 @@ export default async function googleAuth({ additionalFields, additionalData, debug, + useLocal: true, }); } else { /**