Updates
This commit is contained in:
@@ -1,11 +1,12 @@
|
||||
declare function _exports({ code, clientId, clientSecret, database, additionalFields, res, email, userId, }: {
|
||||
declare function _exports({ code, clientId, clientSecret, database, additionalFields, email, additionalData, }: {
|
||||
code?: string;
|
||||
clientId?: string;
|
||||
clientSecret?: string;
|
||||
database?: string;
|
||||
additionalFields?: string[];
|
||||
res?: any;
|
||||
additionalData?: {
|
||||
[x: string]: string | number;
|
||||
};
|
||||
email?: string;
|
||||
userId?: string | number;
|
||||
}): Promise<import("../../../../types").APILoginFunctionReturn>;
|
||||
export = _exports;
|
||||
|
||||
@@ -12,9 +12,8 @@ const camelJoinedtoCamelSpace = require("../../../../utils/camelJoinedtoCamelSpa
|
||||
* @param {string} [param.clientSecret]
|
||||
* @param {string} [param.database]
|
||||
* @param {string[]} [param.additionalFields]
|
||||
* @param {any} [param.res]
|
||||
* @param {Object<string,string|number>} [param.additionalData]
|
||||
* @param {string} [param.email]
|
||||
* @param {string | number} [param.userId]
|
||||
*
|
||||
* @returns {Promise<import("../../../../types").APILoginFunctionReturn>}
|
||||
*/
|
||||
@@ -24,9 +23,8 @@ module.exports = async function apiGithubLogin({
|
||||
clientSecret,
|
||||
database,
|
||||
additionalFields,
|
||||
res,
|
||||
email,
|
||||
userId,
|
||||
additionalData,
|
||||
}) {
|
||||
if (!code || !clientId || !clientSecret || !database) {
|
||||
return {
|
||||
@@ -73,7 +71,7 @@ module.exports = async function apiGithubLogin({
|
||||
? targetName?.split("-")
|
||||
: [targetName];
|
||||
|
||||
const payload = {
|
||||
let payload = {
|
||||
email: gitHubUser.email,
|
||||
first_name: camelJoinedtoCamelSpace(nameArray[0]),
|
||||
last_name: camelJoinedtoCamelSpace(nameArray[1]),
|
||||
@@ -84,10 +82,14 @@ module.exports = async function apiGithubLogin({
|
||||
username: "github-user-" + socialId,
|
||||
};
|
||||
|
||||
if (additionalData) {
|
||||
payload = { ...payload, ...additionalData };
|
||||
}
|
||||
|
||||
const loggedInGithubUser = await handleSocialDb({
|
||||
database,
|
||||
email: gitHubUser.email,
|
||||
payload: payload,
|
||||
payload,
|
||||
social_platform: "github",
|
||||
social_id: socialId,
|
||||
supEmail: email,
|
||||
|
||||
@@ -9,6 +9,7 @@ module.exports = async function apiGoogleLogin({
|
||||
token,
|
||||
database,
|
||||
additionalFields,
|
||||
additionalData,
|
||||
}) {
|
||||
try {
|
||||
/** @type {import("../../../../types").GoogleOauth2User | undefined} */
|
||||
@@ -59,7 +60,7 @@ module.exports = async function apiGoogleLogin({
|
||||
const { given_name, family_name, email, sub, picture } = gUser;
|
||||
|
||||
/** @type {Object<string, any>} */
|
||||
const payloadObject = {
|
||||
let payloadObject = {
|
||||
email: email,
|
||||
first_name: given_name,
|
||||
last_name: family_name,
|
||||
@@ -70,6 +71,10 @@ module.exports = async function apiGoogleLogin({
|
||||
username: `google-user-${sub}`,
|
||||
};
|
||||
|
||||
if (additionalData) {
|
||||
payloadObject = { ...payloadObject, ...additionalData };
|
||||
}
|
||||
|
||||
const loggedInGoogleUser = await handleSocialDb({
|
||||
database,
|
||||
email: email || "",
|
||||
|
||||
Vendored
+3
@@ -1057,6 +1057,9 @@ export type APIGoogleLoginFunctionParams = {
|
||||
token: string;
|
||||
database: string;
|
||||
additionalFields?: string[];
|
||||
additionalData?: {
|
||||
[key: string]: string | number;
|
||||
};
|
||||
};
|
||||
export type APIGoogleLoginFunction = (params: APIGoogleLoginFunctionParams) => Promise<APILoginFunctionReturn>;
|
||||
/**
|
||||
|
||||
@@ -1265,6 +1265,7 @@ export type APIGoogleLoginFunctionParams = {
|
||||
token: string;
|
||||
database: string;
|
||||
additionalFields?: string[];
|
||||
additionalData?: { [key: string]: string | number };
|
||||
};
|
||||
|
||||
export type APIGoogleLoginFunction = (
|
||||
|
||||
Reference in New Issue
Block a user