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

updates

Browse Source
This commit is contained in:
Benjamin Toby 2023-09-21 17:51:08 +01:00
parent 44b013147e
commit 069db84289
17 changed files with 414 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
engine/query/update-api-schema-from-local-db.js
View File

@ -4,6 +4,7 @@
* Imports
*/
const https = require("https");
const http = require("http");
const path = require("path");
const fs = require("fs");
@ -38,6 +39,10 @@ async function updateApiSchemaFromLocalDb() {
const dbSchema = JSON.parse(fs.readFileSync(dbSchemaPath, "utf8"));
const scheme = process.env.DSQL_HTTP_SCHEME;
const localHost = process.env.DSQL_LOCAL_HOST;
const localHostPort = process.env.DSQL_LOCAL_HOST_PORT;
/**
* Make https request
*
@ -63,7 +68,9 @@ async function updateApiSchemaFromLocalDb() {
const reqPayload = reqPayloadString;
const httpsRequest = https.request(
const httpsRequest = (
scheme?.match(/^http$/i) ? http : https
).request(
{
method: "POST",
headers: {
@ -71,8 +78,8 @@ async function updateApiSchemaFromLocalDb() {
"Content-Length": Buffer.from(reqPayload).length,
Authorization: key,
},
port: 443,
hostname: "datasquirel.com",
port: localHostPort || 443,
hostname: localHost || "datasquirel.com",
path: `/api/query/update-schema-from-single-database`,
},

17
engine/user/social/google-auth.js
View File

@ -48,12 +48,22 @@ const encryptionSalt = process.env.DSQL_ENCRYPTION_SALT || "";
*
* @returns { Promise<FunctionReturn> }
*/
async function localGoogleAuth({ dbSchema, token, clientId, response, additionalFields }) {
async function localGoogleAuth({
dbSchema,
token,
clientId,
response,
additionalFields,
}) {
/**
* Send Response
*
* @description Send a boolean response
*/
const scheme = process.env.DSQL_HTTP_SCHEME;
const localHost = process.env.DSQL_LOCAL_HOST;
const localHostPort = process.env.DSQL_LOCAL_HOST_PORT;
try {
/**
* Grab User data
@ -63,7 +73,7 @@ async function localGoogleAuth({ dbSchema, token, clientId, response, additional
*/
const payloadResponse = await httpsRequest({
method: "POST",
hostname: "datasquirel.com",
hostname: localHost || "datasquirel.com",
path: "/user/grab-google-user-from-token",
body: {
token: token,
@ -114,7 +124,8 @@ async function localGoogleAuth({ dbSchema, token, clientId, response, additional
};
}
const { given_name, family_name, email, sub, picture, email_verified } = payload;
const { given_name, family_name, email, sub, picture, email_verified } =
payload;
const payloadObject = {
email: email || "",

15
engine/user/social/utils/httpsRequest.js
View File

@ -3,6 +3,7 @@
* ==============================================================================
*/
const https = require("https");
const http = require("http");
//////////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////////
@ -27,14 +28,18 @@ const https = require("https");
function httpsRequest({ url, method, hostname, path, href, headers, body }) {
const reqPayloadString = body ? JSON.stringify(body) : null;
const scheme = process.env.DSQL_HTTP_SCHEME;
const localHost = process.env.DSQL_LOCAL_HOST;
const localHostPort = process.env.DSQL_LOCAL_HOST_PORT;
////////////////////////////////////////////////
////////////////////////////////////////////////
////////////////////////////////////////////////
let requestOptions = {
method: method,
hostname: hostname,
port: 443,
hostname: localHost || hostname,
port: localHostPort || 443,
headers: {},
};
@ -44,7 +49,9 @@ function httpsRequest({ url, method, hostname, path, href, headers, body }) {
if (headers) requestOptions.headers = headers;
if (body) {
requestOptions.headers["Content-Type"] = "application/json";
requestOptions.headers["Content-Length"] = Buffer.from(reqPayloadString || "").length;
requestOptions.headers["Content-Length"] = Buffer.from(
reqPayloadString || ""
).length;
}
////////////////////////////////////////////////
@ -52,7 +59,7 @@ function httpsRequest({ url, method, hostname, path, href, headers, body }) {
////////////////////////////////////////////////
return new Promise((res, rej) => {
const httpsRequest = https.request(
const httpsRequest = (scheme?.match(/^http$/i) ? http : https).request(
/* ====== Request Options object ====== */
// @ts-ignore
url ? url : requestOptions,

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "datasquirel",
"version": "1.9.2",
"version": "1.9.3",
"description": "Cloud-based SQL data management tool",
"main": "index.js",
"bin": {

33
users/add-user.js
View File

@ -6,6 +6,7 @@
* ==============================================================================
*/
const https = require("https");
const http = require("http");
const path = require("path");
const fs = require("fs");
const localAddUser = require("../engine/user/add-user");
@ -50,14 +51,34 @@ async function addUser({ key, payload, database }) {
*
* @description Look for local db settings in `.env` file and by pass the http request if available
*/
const { DSQL_HOST, DSQL_USER, DSQL_PASS, DSQL_DB_NAME, DSQL_KEY, DSQL_REF_DB_NAME, DSQL_FULL_SYNC } = process.env;
const {
DSQL_HOST,
DSQL_USER,
DSQL_PASS,
DSQL_DB_NAME,
DSQL_KEY,
DSQL_REF_DB_NAME,
DSQL_FULL_SYNC,
} = process.env;
if (DSQL_HOST?.match(/./) && DSQL_USER?.match(/./) && DSQL_PASS?.match(/./) && DSQL_DB_NAME?.match(/./)) {
const scheme = process.env.DSQL_HTTP_SCHEME;
const localHost = process.env.DSQL_LOCAL_HOST;
const localHostPort = process.env.DSQL_LOCAL_HOST_PORT;
if (
DSQL_HOST?.match(/./) &&
DSQL_USER?.match(/./) &&
DSQL_PASS?.match(/./) &&
DSQL_DB_NAME?.match(/./)
) {
/** @type {import("../types/database-schema.td").DSQL_DatabaseSchemaType | undefined} */
let dbSchema;
try {
const localDbSchemaPath = path.resolve(process.cwd(), "dsql.schema.json");
const localDbSchemaPath = path.resolve(
process.cwd(),
"dsql.schema.json"
);
dbSchema = JSON.parse(fs.readFileSync(localDbSchemaPath, "utf8"));
} catch (error) {}
@ -82,7 +103,7 @@ async function addUser({ key, payload, database }) {
database,
});
const httpsRequest = https.request(
const httpsRequest = (scheme?.match(/^http$/i) ? http : https).request(
{
method: "POST",
headers: {
@ -90,8 +111,8 @@ async function addUser({ key, payload, database }) {
"Content-Length": Buffer.from(reqPayload).length,
Authorization: key,
},
port: 443,
hostname: "datasquirel.com",
port: localHostPort || 443,
hostname: localHost || "datasquirel.com",
path: `/api/user/add-user`,
},

53
users/get-user.js
View File

@ -4,6 +4,7 @@
* ==============================================================================
*/
const https = require("https");
const http = require("http");
const getLocalUser = require("../engine/user/get-user");
/** ****************************************************************************** */
@ -48,9 +49,25 @@ async function getUser({ key, userId, database, fields }) {
/**
* Initialize
*/
const defaultFields = ["id", "first_name", "last_name", "email", "username", "image", "image_thumbnail", "verification_status", "date_created", "date_created_code", "date_created_timestamp", "date_updated", "date_updated_code", "date_updated_timestamp"];
const defaultFields = [
"id",
"first_name",
"last_name",
"email",
"username",
"image",
"image_thumbnail",
"verification_status",
"date_created",
"date_created_code",
"date_created_timestamp",
"date_updated",
"date_updated_code",
"date_updated_timestamp",
];
const updatedFields = fields && fields[0] ? [...defaultFields, ...fields] : defaultFields;
const updatedFields =
fields && fields[0] ? [...defaultFields, ...fields] : defaultFields;
const reqPayload = JSON.stringify({
userId,
@ -58,19 +75,39 @@ async function getUser({ key, userId, database, fields }) {
fields: [...new Set(updatedFields)],
});
const scheme = process.env.DSQL_HTTP_SCHEME;
const localHost = process.env.DSQL_LOCAL_HOST;
const localHostPort = process.env.DSQL_LOCAL_HOST_PORT;
/**
* Check for local DB settings
*
* @description Look for local db settings in `.env` file and by pass the http request if available
*/
const { DSQL_HOST, DSQL_USER, DSQL_PASS, DSQL_DB_NAME, DSQL_KEY, DSQL_REF_DB_NAME, DSQL_FULL_SYNC } = process.env;
const {
DSQL_HOST,
DSQL_USER,
DSQL_PASS,
DSQL_DB_NAME,
DSQL_KEY,
DSQL_REF_DB_NAME,
DSQL_FULL_SYNC,
} = process.env;
if (DSQL_HOST?.match(/./) && DSQL_USER?.match(/./) && DSQL_PASS?.match(/./) && DSQL_DB_NAME?.match(/./)) {
if (
DSQL_HOST?.match(/./) &&
DSQL_USER?.match(/./) &&
DSQL_PASS?.match(/./) &&
DSQL_DB_NAME?.match(/./)
) {
/** @type {import("../types/database-schema.td").DSQL_DatabaseSchemaType | undefined} */
let dbSchema;
try {
const localDbSchemaPath = path.resolve(process.cwd(), "dsql.schema.json");
const localDbSchemaPath = path.resolve(
process.cwd(),
"dsql.schema.json"
);
dbSchema = JSON.parse(fs.readFileSync(localDbSchemaPath, "utf8"));
} catch (error) {}
@ -91,7 +128,7 @@ async function getUser({ key, userId, database, fields }) {
* @description make a request to datasquirel.com
*/
const httpResponse = await new Promise((resolve, reject) => {
const httpsRequest = https.request(
const httpsRequest = (scheme?.match(/^http$/i) ? http : https).request(
{
method: "POST",
headers: {
@ -99,8 +136,8 @@ async function getUser({ key, userId, database, fields }) {
"Content-Length": Buffer.from(reqPayload).length,
Authorization: key,
},
port: 443,
hostname: "datasquirel.com",
port: localHostPort || 443,
hostname: localHost || "datasquirel.com",
path: `/api/user/get-user`,
},

50
users/login-user.js
View File

@ -47,7 +47,19 @@ const loginLocalUser = require("../engine/user/login-user");
*
* @returns { Promise<AuthenticatedUser>}
*/
async function loginUser({ key, payload, database, additionalFields, response, encryptionKey, encryptionSalt }) {
async function loginUser({
key,
payload,
database,
additionalFields,
response,
encryptionKey,
encryptionSalt,
}) {
const scheme = process.env.DSQL_HTTP_SCHEME;
const localHost = process.env.DSQL_LOCAL_HOST;
const localHostPort = process.env.DSQL_LOCAL_HOST_PORT;
/**
* Check Encryption Keys
*
@ -91,14 +103,30 @@ async function loginUser({ key, payload, database, additionalFields, response, e
*
* @description Look for local db settings in `.env` file and by pass the http request if available
*/
const { DSQL_HOST, DSQL_USER, DSQL_PASS, DSQL_DB_NAME, DSQL_KEY, DSQL_REF_DB_NAME, DSQL_FULL_SYNC } = process.env;
const {
DSQL_HOST,
DSQL_USER,
DSQL_PASS,
DSQL_DB_NAME,
DSQL_KEY,
DSQL_REF_DB_NAME,
DSQL_FULL_SYNC,
} = process.env;
if (DSQL_HOST?.match(/./) && DSQL_USER?.match(/./) && DSQL_PASS?.match(/./) && DSQL_DB_NAME?.match(/./)) {
if (
DSQL_HOST?.match(/./) &&
DSQL_USER?.match(/./) &&
DSQL_PASS?.match(/./) &&
DSQL_DB_NAME?.match(/./)
) {
/** @type {import("../types/database-schema.td").DSQL_DatabaseSchemaType | undefined} */
let dbSchema;
try {
const localDbSchemaPath = path.resolve(process.cwd(), "dsql.schema.json");
const localDbSchemaPath = path.resolve(
process.cwd(),
"dsql.schema.json"
);
dbSchema = JSON.parse(fs.readFileSync(localDbSchemaPath, "utf8"));
} catch (error) {}
@ -126,7 +154,9 @@ async function loginUser({ key, payload, database, additionalFields, response, e
additionalFields,
});
const httpsRequest = https.request(
const httpsRequest = (
scheme?.match(/^http$/i) ? http : https
).request(
{
method: "POST",
headers: {
@ -134,8 +164,8 @@ async function loginUser({ key, payload, database, additionalFields, response, e
"Content-Length": Buffer.from(reqPayload).length,
Authorization: key,
},
port: 443,
hostname: "datasquirel.com",
port: localHostPort || 443,
hostname: localHost || "datasquirel.com",
path: `/api/user/login-user`,
},
@ -187,7 +217,11 @@ async function loginUser({ key, payload, database, additionalFields, response, e
const authKeyName = `datasquirel_${userId}_${database}_auth_key`;
const csrfName = `datasquirel_${userId}_${database}_csrf`;
response.setHeader("Set-Cookie", [`${authKeyName}=${encryptedPayload};samesite=strict;path=/;HttpOnly=true;Secure=true`, `${csrfName}=${httpResponse.payload?.csrf_k};samesite=strict;path=/;HttpOnly=true`, `dsqluid=${userId};samesite=strict;path=/;HttpOnly=true`]);
response.setHeader("Set-Cookie", [
`${authKeyName}=${encryptedPayload};samesite=strict;path=/;HttpOnly=true;Secure=true`,
`${csrfName}=${httpResponse.payload?.csrf_k};samesite=strict;path=/;HttpOnly=true`,
`dsqluid=${userId};samesite=strict;path=/;HttpOnly=true`,
]);
}
/** ********************************************** */

51
users/reauth-user.js
View File

@ -47,12 +47,25 @@ const localReauthUser = require("../engine/user/reauth-user");
*
* @returns { Promise<FunctionReturn> }
*/
async function reauthUser({ key, database, response, request, level, encryptionKey, encryptionSalt, additionalFields }) {
async function reauthUser({
key,
database,
response,
request,
level,
encryptionKey,
encryptionSalt,
additionalFields,
}) {
/**
* Check Encryption Keys
*
* @description Check Encryption Keys
*/
const scheme = process.env.DSQL_HTTP_SCHEME;
const localHost = process.env.DSQL_LOCAL_HOST;
const localHostPort = process.env.DSQL_LOCAL_HOST_PORT;
const existingUser = userAuth({
database,
encryptionKey,
@ -79,14 +92,30 @@ async function reauthUser({ key, database, response, request, level, encryptionK
*
* @description Look for local db settings in `.env` file and by pass the http request if available
*/
const { DSQL_HOST, DSQL_USER, DSQL_PASS, DSQL_DB_NAME, DSQL_KEY, DSQL_REF_DB_NAME, DSQL_FULL_SYNC } = process.env;
const {
DSQL_HOST,
DSQL_USER,
DSQL_PASS,
DSQL_DB_NAME,
DSQL_KEY,
DSQL_REF_DB_NAME,
DSQL_FULL_SYNC,
} = process.env;
if (DSQL_HOST?.match(/./) && DSQL_USER?.match(/./) && DSQL_PASS?.match(/./) && DSQL_DB_NAME?.match(/./)) {
if (
DSQL_HOST?.match(/./) &&
DSQL_USER?.match(/./) &&
DSQL_PASS?.match(/./) &&
DSQL_DB_NAME?.match(/./)
) {
/** @type {import("../types/database-schema.td").DSQL_DatabaseSchemaType | undefined} */
let dbSchema;
try {
const localDbSchemaPath = path.resolve(process.cwd(), "dsql.schema.json");
const localDbSchemaPath = path.resolve(
process.cwd(),
"dsql.schema.json"
);
dbSchema = JSON.parse(fs.readFileSync(localDbSchemaPath, "utf8"));
} catch (error) {}
@ -112,7 +141,9 @@ async function reauthUser({ key, database, response, request, level, encryptionK
additionalFields,
});
const httpsRequest = https.request(
const httpsRequest = (
scheme?.match(/^http$/i) ? http : https
).request(
{
method: "POST",
headers: {
@ -120,8 +151,8 @@ async function reauthUser({ key, database, response, request, level, encryptionK
"Content-Length": Buffer.from(reqPayload).length,
Authorization: key,
},
port: 443,
hostname: "datasquirel.com",
port: localHostPort || 443,
hostname: localHost || "datasquirel.com",
path: `/api/user/reauth-user`,
},
@ -173,7 +204,11 @@ async function reauthUser({ key, database, response, request, level, encryptionK
const authKeyName = `datasquirel_${userId}_${database}_auth_key`;
const csrfName = `datasquirel_${userId}_${database}_csrf`;
response.setHeader("Set-Cookie", [`${authKeyName}=${encryptedPayload};samesite=strict;path=/;HttpOnly=true;Secure=true`, `${csrfName}=${httpResponse.payload.csrf_k};samesite=strict;path=/;HttpOnly=true`, `dsqluid=${userId};samesite=strict;path=/;HttpOnly=true`]);
response.setHeader("Set-Cookie", [
`${authKeyName}=${encryptedPayload};samesite=strict;path=/;HttpOnly=true;Secure=true`,
`${csrfName}=${httpResponse.payload.csrf_k};samesite=strict;path=/;HttpOnly=true`,
`dsqluid=${userId};samesite=strict;path=/;HttpOnly=true`,
]);
}
/** ********************************************** */

54
users/social/github-auth.js
View File

@ -47,12 +47,27 @@ const localGithubAuth = require("../../engine/user/social/github-auth");
*
* @returns { Promise<FunctionReturn | undefined> }
*/
async function githubAuth({ key, code, email, database, clientId, clientSecret, response, encryptionKey, encryptionSalt, additionalFields }) {
async function githubAuth({
key,
code,
email,
database,
clientId,
clientSecret,
response,
encryptionKey,
encryptionSalt,
additionalFields,
}) {
/**
* Check inputs
*
* @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;
if (!key || key?.match(/ /)) {
return {
success: false,
@ -123,14 +138,30 @@ async function githubAuth({ key, code, email, database, clientId, clientSecret,
*
* @description Look for local db settings in `.env` file and by pass the http request if available
*/
const { DSQL_HOST, DSQL_USER, DSQL_PASS, DSQL_DB_NAME, DSQL_KEY, DSQL_REF_DB_NAME, DSQL_FULL_SYNC } = process.env;
const {
DSQL_HOST,
DSQL_USER,
DSQL_PASS,
DSQL_DB_NAME,
DSQL_KEY,
DSQL_REF_DB_NAME,
DSQL_FULL_SYNC,
} = process.env;
if (DSQL_HOST?.match(/./) && DSQL_USER?.match(/./) && DSQL_PASS?.match(/./) && DSQL_DB_NAME?.match(/./)) {
if (
DSQL_HOST?.match(/./) &&
DSQL_USER?.match(/./) &&
DSQL_PASS?.match(/./) &&
DSQL_DB_NAME?.match(/./)
) {
/** @type {import("../../types/database-schema.td").DSQL_DatabaseSchemaType | undefined} */
let dbSchema;
try {
const localDbSchemaPath = path.resolve(process.cwd(), "dsql.schema.json");
const localDbSchemaPath = path.resolve(
process.cwd(),
"dsql.schema.json"
);
dbSchema = JSON.parse(fs.readFileSync(localDbSchemaPath, "utf8"));
} catch (error) {}
@ -164,7 +195,9 @@ async function githubAuth({ key, code, email, database, clientId, clientSecret,
additionalFields,
});
const httpsRequest = https.request(
const httpsRequest = (
scheme?.match(/^http$/i) ? http : https
).request(
{
method: "POST",
headers: {
@ -172,8 +205,8 @@ async function githubAuth({ key, code, email, database, clientId, clientSecret,
"Content-Length": Buffer.from(reqPayload).length,
Authorization: key,
},
port: 443,
hostname: "datasquirel.com",
port: localHostPort || 443,
hostname: localHost || "datasquirel.com",
path: `/api/user/github-login`,
},
@ -234,7 +267,12 @@ async function githubAuth({ key, code, email, database, clientId, clientSecret,
const authKeyName = `datasquirel_${dsqlUserId}_${database}_auth_key`;
const csrfName = `datasquirel_${dsqlUserId}_${database}_csrf`;
response.setHeader("Set-Cookie", [`${authKeyName}=${encryptedPayload};samesite=strict;path=/;HttpOnly=true;Secure=true`, `${csrfName}=${user.csrf_k};samesite=strict;path=/;HttpOnly=true`, `dsqluid=${dsqlUserId};samesite=strict;path=/;HttpOnly=true`, `datasquirel_social_id=${user.social_id};samesite=strict;path=/`]);
response.setHeader("Set-Cookie", [
`${authKeyName}=${encryptedPayload};samesite=strict;path=/;HttpOnly=true;Secure=true`,
`${csrfName}=${user.csrf_k};samesite=strict;path=/;HttpOnly=true`,
`dsqluid=${dsqlUserId};samesite=strict;path=/;HttpOnly=true`,
`datasquirel_social_id=${user.social_id};samesite=strict;path=/`,
]);
}
////////////////////////////////////////

52
users/social/google-auth.js
View File

@ -45,7 +45,20 @@ const localGoogleAuth = require("../../engine/user/social/google-auth");
*
* @returns { Promise<FunctionReturn> }
*/
async function googleAuth({ key, token, database, clientId, response, encryptionKey, encryptionSalt, additionalFields }) {
async function googleAuth({
key,
token,
database,
clientId,
response,
encryptionKey,
encryptionSalt,
additionalFields,
}) {
const scheme = process.env.DSQL_HTTP_SCHEME;
const localHost = process.env.DSQL_LOCAL_HOST;
const localHostPort = process.env.DSQL_LOCAL_HOST_PORT;
/**
* Check inputs
*
@ -121,14 +134,30 @@ async function googleAuth({ key, token, database, clientId, response, encryption
*
* @description Look for local db settings in `.env` file and by pass the http request if available
*/
const { DSQL_HOST, DSQL_USER, DSQL_PASS, DSQL_DB_NAME, DSQL_KEY, DSQL_REF_DB_NAME, DSQL_FULL_SYNC } = process.env;
const {
DSQL_HOST,
DSQL_USER,
DSQL_PASS,
DSQL_DB_NAME,
DSQL_KEY,
DSQL_REF_DB_NAME,
DSQL_FULL_SYNC,
} = process.env;
if (DSQL_HOST?.match(/./) && DSQL_USER?.match(/./) && DSQL_PASS?.match(/./) && DSQL_DB_NAME?.match(/./)) {
if (
DSQL_HOST?.match(/./) &&
DSQL_USER?.match(/./) &&
DSQL_PASS?.match(/./) &&
DSQL_DB_NAME?.match(/./)
) {
/** @type {import("../../types/database-schema.td").DSQL_DatabaseSchemaType | undefined} */
let dbSchema;
try {
const localDbSchemaPath = path.resolve(process.cwd(), "dsql.schema.json");
const localDbSchemaPath = path.resolve(
process.cwd(),
"dsql.schema.json"
);
dbSchema = JSON.parse(fs.readFileSync(localDbSchemaPath, "utf8"));
} catch (error) {}
@ -162,7 +191,9 @@ async function googleAuth({ key, token, database, clientId, response, encryption
additionalFields,
});
const httpsRequest = https.request(
const httpsRequest = (
scheme?.match(/^http$/i) ? http : https
).request(
{
method: "POST",
headers: {
@ -170,8 +201,8 @@ async function googleAuth({ key, token, database, clientId, response, encryption
"Content-Length": Buffer.from(reqPayload).length,
Authorization: key,
},
port: 443,
hostname: "datasquirel.com",
port: localHostPort || 443,
hostname: localHost || "datasquirel.com",
path: `/api/user/google-login`,
},
@ -222,7 +253,12 @@ async function googleAuth({ key, token, database, clientId, response, encryption
const authKeyName = `datasquirel_${dsqlUserId}_${database}_auth_key`;
const csrfName = `datasquirel_${dsqlUserId}_${database}_csrf`;
response.setHeader("Set-Cookie", [`${authKeyName}=${encryptedPayload};samesite=strict;path=/;HttpOnly=true;Secure=true`, `${csrfName}=${user.csrf_k};samesite=strict;path=/;HttpOnly=true`, `dsqluid=${dsqlUserId};samesite=strict;path=/;HttpOnly=true`, `datasquirel_social_id=${user.social_id};samesite=strict;path=/`]);
response.setHeader("Set-Cookie", [
`${authKeyName}=${encryptedPayload};samesite=strict;path=/;HttpOnly=true;Secure=true`,
`${csrfName}=${user.csrf_k};samesite=strict;path=/;HttpOnly=true`,
`dsqluid=${dsqlUserId};samesite=strict;path=/;HttpOnly=true`,
`datasquirel_social_id=${user.social_id};samesite=strict;path=/`,
]);
}
////////////////////////////////////////

33
users/update-user.js
View File

@ -5,6 +5,7 @@
* Imports
* ==============================================================================
*/
const http = require("http");
const https = require("https");
const path = require("path");
const fs = require("fs");
@ -42,14 +43,34 @@ async function updateUser({ key, payload, database }) {
*
* @description Look for local db settings in `.env` file and by pass the http request if available
*/
const { DSQL_HOST, DSQL_USER, DSQL_PASS, DSQL_DB_NAME, DSQL_KEY, DSQL_REF_DB_NAME, DSQL_FULL_SYNC } = process.env;
const {
DSQL_HOST,
DSQL_USER,
DSQL_PASS,
DSQL_DB_NAME,
DSQL_KEY,
DSQL_REF_DB_NAME,
DSQL_FULL_SYNC,
} = process.env;
if (DSQL_HOST?.match(/./) && DSQL_USER?.match(/./) && DSQL_PASS?.match(/./) && DSQL_DB_NAME?.match(/./)) {
const scheme = process.env.DSQL_HTTP_SCHEME;
const localHost = process.env.DSQL_LOCAL_HOST;
const localHostPort = process.env.DSQL_LOCAL_HOST_PORT;
if (
DSQL_HOST?.match(/./) &&
DSQL_USER?.match(/./) &&
DSQL_PASS?.match(/./) &&
DSQL_DB_NAME?.match(/./)
) {
/** @type {import("../types/database-schema.td").DSQL_DatabaseSchemaType | undefined} */
let dbSchema;
try {
const localDbSchemaPath = path.resolve(process.cwd(), "dsql.schema.json");
const localDbSchemaPath = path.resolve(
process.cwd(),
"dsql.schema.json"
);
dbSchema = JSON.parse(fs.readFileSync(localDbSchemaPath, "utf8"));
} catch (error) {}
@ -74,7 +95,7 @@ async function updateUser({ key, payload, database }) {
database,
});
const httpsRequest = https.request(
const httpsRequest = (scheme?.match(/^http$/i) ? http : https).request(
{
method: "POST",
headers: {
@ -82,8 +103,8 @@ async function updateUser({ key, payload, database }) {
"Content-Length": Buffer.from(reqPayload).length,
Authorization: key,
},
port: 443,
hostname: "datasquirel.com",
port: localHostPort || 443,
hostname: localHost || "datasquirel.com",
path: `/api/user/update-user`,
},

13
utils/delete-file.js
View File

@ -3,6 +3,7 @@
* Imports
* ==============================================================================
*/
const http = require("http");
const https = require("https");
/** ****************************************************************************** */
@ -35,6 +36,10 @@ const https = require("https");
* @returns { Promise<FunctionReturn> } - Image Url
*/
async function uploadImage({ key, url }) {
const scheme = process.env.DSQL_HTTP_SCHEME;
const localHost = process.env.DSQL_LOCAL_HOST;
const localHostPort = process.env.DSQL_LOCAL_HOST_PORT;
try {
/**
* Make https request
@ -44,7 +49,9 @@ async function uploadImage({ key, url }) {
const httpResponse = await new Promise((resolve, reject) => {
const reqPayload = JSON.stringify({ url: url });
const httpsRequest = https.request(
const httpsRequest = (
scheme?.match(/^http$/i) ? http : https
).request(
{
method: "POST",
headers: {
@ -52,8 +59,8 @@ async function uploadImage({ key, url }) {
"Content-Length": Buffer.from(reqPayload).length,
Authorization: key,
},
port: 443,
hostname: "datasquirel.com",
port: localHostPort || 443,
hostname: localHost || "datasquirel.com",
path: `/api/query/delete-file`,
},

15
utils/get-schema.js
View File

@ -5,6 +5,7 @@
* Imports
* ==============================================================================
*/
const http = require("http");
const https = require("https");
/** ****************************************************************************** */
@ -32,13 +33,17 @@ const https = require("https");
* @returns { Promise<GetSchemaReturn> } - Return Object
*/
async function getSchema({ key, database }) {
const scheme = process.env.DSQL_HTTP_SCHEME;
const localHost = process.env.DSQL_LOCAL_HOST;
const localHostPort = process.env.DSQL_LOCAL_HOST_PORT;
/**
* Make https request
*
* @description make a request to datasquirel.com
*/
const httpResponse = await new Promise((resolve, reject) => {
https
(scheme?.match(/^http$/i) ? http : https)
.request(
{
method: "GET",
@ -46,9 +51,11 @@ async function getSchema({ key, database }) {
"Content-Type": "application/json",
Authorization: key,
},
port: 443,
hostname: "datasquirel.com",
path: "/api/query/get-schema" + (database ? `?database=${database}` : ""),
port: localHostPort || 443,
hostname: localHost || "datasquirel.com",
path:
"/api/query/get-schema" +
(database ? `?database=${database}` : ""),
},
/**

37
utils/get.js
View File

@ -5,6 +5,7 @@
* Imports
* ==============================================================================
*/
const http = require("http");
const https = require("https");
const path = require("path");
const fs = require("fs");
@ -40,19 +41,39 @@ const localGet = require("../engine/query/get");
* @returns { Promise<GetReturn> } - Return Object
*/
async function get({ key, db, query, queryValues, tableName }) {
const scheme = process.env.DSQL_HTTP_SCHEME;
const localHost = process.env.DSQL_LOCAL_HOST;
const localHostPort = process.env.DSQL_LOCAL_HOST_PORT;
/**
* Check for local DB settings
*
* @description Look for local db settings in `.env` file and by pass the http request if available
*/
const { DSQL_HOST, DSQL_USER, DSQL_PASS, DSQL_DB_NAME, DSQL_KEY, DSQL_REF_DB_NAME, DSQL_FULL_SYNC } = process.env;
const {
DSQL_HOST,
DSQL_USER,
DSQL_PASS,
DSQL_DB_NAME,
DSQL_KEY,
DSQL_REF_DB_NAME,
DSQL_FULL_SYNC,
} = process.env;
if (DSQL_HOST?.match(/./) && DSQL_USER?.match(/./) && DSQL_PASS?.match(/./) && DSQL_DB_NAME?.match(/./)) {
if (
DSQL_HOST?.match(/./) &&
DSQL_USER?.match(/./) &&
DSQL_PASS?.match(/./) &&
DSQL_DB_NAME?.match(/./)
) {
/** @type {import("../types/database-schema.td").DSQL_DatabaseSchemaType | undefined} */
let dbSchema;
try {
const localDbSchemaPath = path.resolve(process.cwd(), "dsql.schema.json");
const localDbSchemaPath = path.resolve(
process.cwd(),
"dsql.schema.json"
);
dbSchema = JSON.parse(fs.readFileSync(localDbSchemaPath, "utf8"));
} catch (error) {}
@ -80,10 +101,12 @@ async function get({ key, db, query, queryValues, tableName }) {
.replace(/ /g, "+")}`;
if (queryValues) {
path += `&queryValues=${JSON.stringify(queryValues)}${tableName ? `&tableName=${tableName}` : ""}`;
path += `&queryValues=${JSON.stringify(queryValues)}${
tableName ? `&tableName=${tableName}` : ""
}`;
}
https
(scheme?.match(/^http$/i) ? http : https)
.request(
{
method: "GET",
@ -91,8 +114,8 @@ async function get({ key, db, query, queryValues, tableName }) {
"Content-Type": "application/json",
Authorization: key,
},
port: 443,
hostname: "datasquirel.com",
port: localHostPort || 443,
hostname: localHost || "datasquirel.com",
path: path,
},

33
utils/post.js
View File

@ -3,6 +3,7 @@
/**
* Imports
*/
const http = require("http");
const https = require("https");
const path = require("path");
const fs = require("fs");
@ -52,19 +53,39 @@ const localPost = require("../engine/query/post");
* @returns { Promise<PostReturn> } - Return Object
*/
async function post({ key, query, queryValues, database, tableName }) {
const scheme = process.env.DSQL_HTTP_SCHEME;
const localHost = process.env.DSQL_LOCAL_HOST;
const localHostPort = process.env.DSQL_LOCAL_HOST_PORT;
/**
* Check for local DB settings
*
* @description Look for local db settings in `.env` file and by pass the http request if available
*/
const { DSQL_HOST, DSQL_USER, DSQL_PASS, DSQL_DB_NAME, DSQL_KEY, DSQL_REF_DB_NAME, DSQL_FULL_SYNC } = process.env;
const {
DSQL_HOST,
DSQL_USER,
DSQL_PASS,
DSQL_DB_NAME,
DSQL_KEY,
DSQL_REF_DB_NAME,
DSQL_FULL_SYNC,
} = process.env;
if (DSQL_HOST?.match(/./) && DSQL_USER?.match(/./) && DSQL_PASS?.match(/./) && DSQL_DB_NAME?.match(/./)) {
if (
DSQL_HOST?.match(/./) &&
DSQL_USER?.match(/./) &&
DSQL_PASS?.match(/./) &&
DSQL_DB_NAME?.match(/./)
) {
/** @type {import("../types/database-schema.td").DSQL_DatabaseSchemaType | undefined} */
let dbSchema;
try {
const localDbSchemaPath = path.resolve(process.cwd(), "dsql.schema.json");
const localDbSchemaPath = path.resolve(
process.cwd(),
"dsql.schema.json"
);
dbSchema = JSON.parse(fs.readFileSync(localDbSchemaPath, "utf8"));
} catch (error) {}
@ -108,7 +129,7 @@ async function post({ key, query, queryValues, database, tableName }) {
const reqPayload = reqPayloadString;
const httpsRequest = https.request(
const httpsRequest = (scheme?.match(/^http$/i) ? http : https).request(
{
method: "POST",
headers: {
@ -116,8 +137,8 @@ async function post({ key, query, queryValues, database, tableName }) {
"Content-Length": Buffer.from(reqPayload).length,
Authorization: key,
},
port: 443,
hostname: "datasquirel.com",
port: localHostPort || 443,
hostname: localHost || "datasquirel.com",
path: `/api/query/post`,
},

17
utils/upload-file.js
View File

@ -1,8 +1,11 @@
// @ts-check
/**
* ==============================================================================
* Imports
* ==============================================================================
*/
const http = require("http");
const https = require("https");
/** ****************************************************************************** */
@ -17,7 +20,7 @@ const https = require("https");
* @property {boolean} success - Did the function run successfully?
* @property {{
* urlPath: string,
* }} payload - Payload containing the url for the image and its thumbnail
* } | null} payload - Payload containing the url for the image and its thumbnail
* @property {string} [msg] - An optional message
*/
@ -40,6 +43,10 @@ const https = require("https");
* @returns { Promise<FunctionReturn> } - Return Object
*/
async function uploadImage({ key, payload }) {
const scheme = process.env.DSQL_HTTP_SCHEME;
const localHost = process.env.DSQL_LOCAL_HOST;
const localHostPort = process.env.DSQL_LOCAL_HOST_PORT;
try {
/**
* Make https request
@ -49,7 +56,9 @@ async function uploadImage({ key, payload }) {
const httpResponse = await new Promise((resolve, reject) => {
const reqPayload = JSON.stringify(payload);
const httpsRequest = https.request(
const httpsRequest = (
scheme?.match(/^http$/i) ? http : https
).request(
{
method: "POST",
headers: {
@ -57,8 +66,8 @@ async function uploadImage({ key, payload }) {
"Content-Length": Buffer.from(reqPayload).length,
Authorization: key,
},
port: 443,
hostname: "datasquirel.com",
port: localHostPort || 443,
hostname: localHost || "datasquirel.com",
path: `/api/query/add-file`,
},

17
utils/upload-image.js
View File

@ -1,8 +1,11 @@
// @ts-check
/**
* ==============================================================================
* Imports
* ==============================================================================
*/
const http = require("http");
const https = require("https");
/** ****************************************************************************** */
@ -18,7 +21,7 @@ const https = require("https");
* @property {{
* urlPath: string,
* urlThumbnailPath: string
* }} payload - Payload containing the url for the image and its thumbnail
* } | null} payload - Payload containing the url for the image and its thumbnail
* @property {string} [msg] - An optional message
*/
@ -42,6 +45,10 @@ const https = require("https");
* @returns { Promise<FunctionReturn> } - Return Object
*/
async function uploadImage({ key, payload }) {
const scheme = process.env.DSQL_HTTP_SCHEME;
const localHost = process.env.DSQL_LOCAL_HOST;
const localHostPort = process.env.DSQL_LOCAL_HOST_PORT;
try {
/**
* Make https request
@ -51,7 +58,9 @@ async function uploadImage({ key, payload }) {
const httpResponse = await new Promise((resolve, reject) => {
const reqPayload = JSON.stringify(payload);
const httpsRequest = https.request(
const httpsRequest = (
scheme?.match(/^http$/i) ? http : https
).request(
{
method: "POST",
headers: {
@ -59,8 +68,8 @@ async function uploadImage({ key, payload }) {
"Content-Length": Buffer.from(reqPayload).length,
Authorization: key,
},
port: 443,
hostname: "datasquirel.com",
port: localHostPort || 443,
hostname: localHost || "datasquirel.com",
path: `/api/query/add-image`,
},