Updates

package-shared/functions/api/users/social/api-github-login.d.ts

@@ -3,9 +3,7 @@ declare function _exports({ code, clientId, clientSecret, database, additionalFi
     clientId?: string;
     clientSecret?: string;
     database?: string;
-    additionalFields?: {
-        [x: string]: any;
-    };
+    additionalFields?: string[];
     res?: any;
     email?: string;
     userId?: string | number;

package-shared/functions/api/users/social/api-github-login.js

@@ -11,7 +11,7 @@ const camelJoinedtoCamelSpace = require("../../../../utils/camelJoinedtoCamelSpa
  * @param {string} [param.clientId]
  * @param {string} [param.clientSecret]
  * @param {string} [param.database]
- * @param {Object<string, any>} [param.additionalFields]
+ * @param {string[]} [param.additionalFields]
  * @param {any} [param.res]
  * @param {string} [param.email]
  * @param {string | number} [param.userId]
@@ -84,19 +84,11 @@ module.exports = async function apiGithubLogin({
         username: "github-user-" + socialId,
     };
 
-    if (additionalFields && Object.keys(additionalFields).length > 0) {
-        Object.keys(additionalFields).forEach((key) => {
-            // @ts-ignore
-            payload[key] = additionalFields[key];
-        });
-    }
-
     const loggedInGithubUser = await handleSocialDb({
         database,
         email: gitHubUser.email,
         payload: payload,
         social_platform: "github",
-        res: res,
         social_id: socialId,
         supEmail: email,
         additionalFields,
@@ -106,5 +98,5 @@ module.exports = async function apiGithubLogin({
     ////////////////////////////////////////////////
     ////////////////////////////////////////////////
 
-    return { success: true, ...loggedInGithubUser, dsqlUserId: userId };
+    return { ...loggedInGithubUser };
 };

package-shared/functions/api/users/social/api-google-login.js

@@ -1,88 +1,96 @@
 // @ts-check
 
-const { OAuth2Client } = require("google-auth-library");
+const https = require("https");
 const handleSocialDb = require("../../social-login/handleSocialDb");
+const EJSON = require("../../../../utils/ejson");
 
 /** @type {import("../../../../types").APIGoogleLoginFunction} */
 module.exports = async function apiGoogleLogin({
-    clientId,
     token,
     database,
-    userId,
     additionalFields,
-    res,
 }) {
-    const client = new OAuth2Client(clientId);
+    try {
+        /** @type {import("../../../../types").GoogleOauth2User | undefined} */
+        const gUser = await new Promise((resolve, reject) => {
+            https
+                .request(
+                    {
+                        method: "GET",
+                        hostname: "www.googleapis.com",
+                        path: "/oauth2/v3/userinfo",
+                        headers: {
+                            Authorization: `Bearer ${token}`,
+                        },
+                    },
+                    (res) => {
+                        let data = "";
+                        res.on("data", (chunk) => {
+                            data += chunk;
+                        });
+                        res.on("end", () => {
+                            resolve(/** @type {any} */ (EJSON.parse(data)));
+                        });
+                    }
+                )
+                .end();
+        });
 
-    const ticket = await client.verifyIdToken({
-        idToken: token,
-        audience: clientId,
-    });
+        if (!gUser?.email_verified) throw new Error("No Google User.");
 
-    if (!ticket?.getPayload()?.email_verified) {
-        return {
-            success: false,
-            user: null,
+        ////////////////////////////////////////
+        ////////////////////////////////////////
+        ////////////////////////////////////////
+
+        if (!database || typeof database != "string" || database?.match(/ /)) {
+            return {
+                success: false,
+                user: undefined,
+                msg: "Please provide a database slug(database name in lowercase with no spaces)",
+            };
+        }
+
+        /**
+         * Create new user folder and file
+         *
+         * @description Create new user folder and file
+         */
+
+        const { given_name, family_name, email, sub, picture } = gUser;
+
+        /** @type {Object<string, any>} */
+        const payloadObject = {
+            email: email,
+            first_name: given_name,
+            last_name: family_name,
+            social_id: sub,
+            social_platform: "google",
+            image: picture,
+            image_thumbnail: picture,
+            username: `google-user-${sub}`,
         };
-    }
 
-    const payload = ticket.getPayload();
+        const loggedInGoogleUser = await handleSocialDb({
+            database,
+            email: email || "",
+            payload: payloadObject,
+            social_platform: "google",
+            social_id: sub,
+            additionalFields,
+        });
 
-    if (!payload) throw new Error("No Payload");
+        ////////////////////////////////////////
+        ////////////////////////////////////////
+        ////////////////////////////////////////
 
-    ////////////////////////////////////////
-    ////////////////////////////////////////
-    ////////////////////////////////////////
+        return { ...loggedInGoogleUser };
+    } catch (/** @type {any} */ error) {
+        console.log(`apo-google-login.js ERROR: ${error.message}`);
 
-    if (!database || typeof database != "string" || database?.match(/ /)) {
         return {
             success: false,
             user: undefined,
-            msg: "Please provide a database slug(database name in lowercase with no spaces)",
+            msg: error.message,
         };
     }
-
-    /**
-     * Create new user folder and file
-     *
-     * @description Create new user folder and file
-     */
-    const targetDbName = `datasquirel_user_${userId}_${database}`;
-
-    const { given_name, family_name, email, sub, picture, email_verified } =
-        payload;
-
-    /** @type {Object<string, any>} */
-    const payloadObject = {
-        email: email,
-        first_name: given_name,
-        last_name: family_name,
-        social_id: sub,
-        social_platform: "google",
-        image: picture,
-        image_thumbnail: picture,
-        username: `google-user-${sub}`,
-    };
-
-    if (additionalFields && Object.keys(additionalFields).length > 0) {
-        Object.keys(additionalFields).forEach((key) => {
-            payloadObject[key] = additionalFields[key];
-        });
-    }
-
-    const loggedInGoogleUser = await handleSocialDb({
-        res,
-        database: targetDbName,
-        email: email || "",
-        payload: payloadObject,
-        social_platform: "google",
-        social_id: sub,
-        additionalFields,
-    });
-
-    ////////////////////////////////////////
-    ////////////////////////////////////////
-    ////////////////////////////////////////
-
-    return { success: true, ...loggedInGoogleUser, dsqlUserId: userId };
 };