This commit is contained in:
Benjamin Toby 2025-01-20 08:50:36 +01:00
parent c210e6ca46
commit 16191975f9
11 changed files with 17 additions and 5 deletions

View File

@ -9,9 +9,10 @@ type Param = {
[s: string]: string | number; [s: string]: string | number;
}; };
email?: string; email?: string;
useLocal?: boolean;
}; };
/** /**
* # API Login with Github * # API Login with Github
*/ */
export default function apiGithubLogin({ code, clientId, clientSecret, database, additionalFields, email, additionalData, }: Param): Promise<APILoginFunctionReturn>; export default function apiGithubLogin({ code, clientId, clientSecret, database, additionalFields, email, additionalData, useLocal, }: Param): Promise<APILoginFunctionReturn>;
export {}; export {};

View File

@ -20,7 +20,7 @@ const camelJoinedtoCamelSpace_1 = __importDefault(require("../../../../utils/cam
* # API Login with Github * # API Login with Github
*/ */
function apiGithubLogin(_a) { 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) { if (!code || !clientId || !clientSecret || !database) {
return { return {
success: false, success: false,
@ -80,6 +80,7 @@ function apiGithubLogin(_a) {
social_id: socialId, social_id: socialId,
supEmail: email, supEmail: email,
additionalFields, additionalFields,
useLocal,
}); });
//////////////////////////////////////////////// ////////////////////////////////////////////////
//////////////////////////////////////////////// ////////////////////////////////////////////////

View File

@ -2,4 +2,4 @@ import { APIGoogleLoginFunctionParams, APILoginFunctionReturn } from "../../../.
/** /**
* # API google login * # API google login
*/ */
export default function apiGoogleLogin({ token, database, additionalFields, additionalData, debug, }: APIGoogleLoginFunctionParams): Promise<APILoginFunctionReturn>; export default function apiGoogleLogin({ token, database, additionalFields, additionalData, debug, useLocal, }: APIGoogleLoginFunctionParams): Promise<APILoginFunctionReturn>;

View File

@ -20,7 +20,7 @@ const ejson_1 = __importDefault(require("../../../../utils/ejson"));
* # API google login * # API google login
*/ */
function apiGoogleLogin(_a) { 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 { try {
const gUser = yield new Promise((resolve, reject) => { const gUser = yield new Promise((resolve, reject) => {
https_1.default https_1.default
@ -71,6 +71,7 @@ function apiGoogleLogin(_a) {
social_id: sub, social_id: sub,
additionalFields, additionalFields,
debug, debug,
useLocal,
}); });
//////////////////////////////////////// ////////////////////////////////////////
//////////////////////////////////////// ////////////////////////////////////////

View File

@ -1074,6 +1074,7 @@ export type APIGoogleLoginFunctionParams = {
[key: string]: string | number; [key: string]: string | number;
}; };
debug?: boolean; debug?: boolean;
useLocal?: boolean;
}; };
export type APIGoogleLoginFunction = (params: APIGoogleLoginFunctionParams) => Promise<APILoginFunctionReturn>; export type APIGoogleLoginFunction = (params: APIGoogleLoginFunctionParams) => Promise<APILoginFunctionReturn>;
/** /**

View File

@ -81,6 +81,7 @@ function googleAuth(_a) {
additionalFields, additionalFields,
additionalData, additionalData,
debug, debug,
useLocal: true,
}); });
} }
else { else {

View File

@ -11,6 +11,7 @@ type Param = {
additionalFields?: string[]; additionalFields?: string[];
additionalData?: { [s: string]: string | number }; additionalData?: { [s: string]: string | number };
email?: string; email?: string;
useLocal?: boolean;
}; };
/** /**
@ -24,6 +25,7 @@ export default async function apiGithubLogin({
additionalFields, additionalFields,
email, email,
additionalData, additionalData,
useLocal,
}: Param): Promise<APILoginFunctionReturn> { }: Param): Promise<APILoginFunctionReturn> {
if (!code || !clientId || !clientSecret || !database) { if (!code || !clientId || !clientSecret || !database) {
return { return {
@ -93,6 +95,7 @@ export default async function apiGithubLogin({
social_id: socialId, social_id: socialId,
supEmail: email, supEmail: email,
additionalFields, additionalFields,
useLocal,
}); });
//////////////////////////////////////////////// ////////////////////////////////////////////////

View File

@ -16,6 +16,7 @@ export default async function apiGoogleLogin({
additionalFields, additionalFields,
additionalData, additionalData,
debug, debug,
useLocal,
}: APIGoogleLoginFunctionParams): Promise<APILoginFunctionReturn> { }: APIGoogleLoginFunctionParams): Promise<APILoginFunctionReturn> {
try { try {
const gUser: GoogleOauth2User | undefined = await new Promise( const gUser: GoogleOauth2User | undefined = await new Promise(
@ -77,6 +78,7 @@ export default async function apiGoogleLogin({
social_id: sub, social_id: sub,
additionalFields, additionalFields,
debug, debug,
useLocal,
}); });
//////////////////////////////////////// ////////////////////////////////////////

View File

@ -1258,6 +1258,7 @@ export type APIGoogleLoginFunctionParams = {
additionalFields?: string[]; additionalFields?: string[];
additionalData?: { [key: string]: string | number }; additionalData?: { [key: string]: string | number };
debug?: boolean; debug?: boolean;
useLocal?: boolean;
}; };
export type APIGoogleLoginFunction = ( export type APIGoogleLoginFunction = (

View File

@ -1,6 +1,6 @@
{ {
"name": "@moduletrace/datasquirel", "name": "@moduletrace/datasquirel",
"version": "3.7.7", "version": "3.7.8",
"description": "Cloud-based SQL data management tool", "description": "Cloud-based SQL data management tool",
"main": "dist/index.js", "main": "dist/index.js",
"bin": { "bin": {

View File

@ -107,6 +107,7 @@ export default async function googleAuth({
additionalFields, additionalFields,
additionalData, additionalData,
debug, debug,
useLocal: true,
}); });
} else { } else {
/** /**