Moduletrace/datasquirel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Major Bugfix and Refactoring

Browse Source
This commit is contained in:
Benjamin Toby
2024-11-13 14:13:10 +01:00
parent a1e7439958
commit d4e210abdb
19 changed files with 131 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files
users/social/github-auth.js
+5 -8
View File
@@ -11,6 +11,7 @@ const fs = require("fs");
const path = require("path");
const encrypt = require("../../functions/encrypt");
const localGithubAuth = require("../../engine/user/social/github-auth");
const grabHostNames = require("../../package-shared/utils/grab-host-names");
/** ****************************************************************************** */
/** ****************************************************************************** */
@@ -64,9 +65,7 @@ async function githubAuth({
*
* @description Check inputs
*/
const scheme = process.env.DSQL_HTTP_SCHEME;
const localHost = process.env.DSQL_LOCAL_HOST;
const localHostPort = process.env.DSQL_LOCAL_HOST_PORT;
const { host, port, scheme } = grabHostNames();
if (!key || key?.match(/ /)) {
return {
@@ -193,9 +192,7 @@ async function githubAuth({
additionalFields,
});
const httpsRequest = (
scheme?.match(/^http$/i) ? http : https
).request(
const httpsRequest = scheme.request(
{
method: "POST",
headers: {
@@ -203,8 +200,8 @@ async function githubAuth({
"Content-Length": Buffer.from(reqPayload).length,
Authorization: key,
},
port: localHostPort || 443,
hostname: localHost || "datasquirel.com",
port,
hostname: host,
path: `/api/user/github-login`,
},
users/social/google-auth.js
+5 -8
View File
@@ -11,6 +11,7 @@ const fs = require("fs");
const path = require("path");
const encrypt = require("../../functions/encrypt");
const localGoogleAuth = require("../../engine/user/social/google-auth");
const grabHostNames = require("../../package-shared/utils/grab-host-names");
/** ****************************************************************************** */
/** ****************************************************************************** */
@@ -55,9 +56,7 @@ async function googleAuth({
encryptionSalt,
additionalFields,
}) {
const scheme = process.env.DSQL_HTTP_SCHEME;
const localHost = process.env.DSQL_LOCAL_HOST;
const localHostPort = process.env.DSQL_LOCAL_HOST_PORT;
const { host, port, scheme } = grabHostNames();
/**
* Check inputs
@@ -189,9 +188,7 @@ async function googleAuth({
additionalFields,
});
const httpsRequest = (
scheme?.match(/^http$/i) ? http : https
).request(
const httpsRequest = scheme.request(
{
method: "POST",
headers: {
@@ -199,8 +196,8 @@ async function googleAuth({
"Content-Length": Buffer.from(reqPayload).length,
Authorization: key,
},
port: localHostPort || 443,
hostname: localHost || "datasquirel.com",
port,
hostname: host,
path: `/api/user/google-login`,
},