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
2025-03-17 08:48:58 +01:00
parent ec4d0428bb
commit 34f843bc84
20 changed files with 113 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/package-shared/actions/users/login-user.d.ts
Vendored
+2 -1
View File
@@ -25,9 +25,10 @@ type Param = {
apiUserID?: string | number;
dbUserId?: string | number;
cleanupTokens?: boolean;
secureCookie?: boolean;
};
/**
* # Login A user
*/
export default function loginUser({ key, payload, database, additionalFields, response, encryptionKey, encryptionSalt, email_login, email_login_code, temp_code_field, token, user_id, skipPassword, apiUserID, skipWriteAuthFile, dbUserId, debug, cleanupTokens, }: Param): Promise<APILoginFunctionReturn>;
export default function loginUser({ key, payload, database, additionalFields, response, encryptionKey, encryptionSalt, email_login, email_login_code, temp_code_field, token, user_id, skipPassword, apiUserID, skipWriteAuthFile, dbUserId, debug, cleanupTokens, secureCookie, }: Param): Promise<APILoginFunctionReturn>;
export {};
dist/package-shared/actions/users/login-user.js
Vendored
+2 -2
View File
@@ -25,7 +25,7 @@ const debug_log_1 = __importDefault(require("../../utils/logging/debug-log"));
* # Login A user
*/
function loginUser(_a) {
return __awaiter(this, arguments, void 0, function* ({ key, payload, database, additionalFields, response, encryptionKey, encryptionSalt, email_login, email_login_code, temp_code_field, token, user_id, skipPassword, apiUserID, skipWriteAuthFile, dbUserId, debug, cleanupTokens, }) {
return __awaiter(this, arguments, void 0, function* ({ key, payload, database, additionalFields, response, encryptionKey, encryptionSalt, email_login, email_login_code, temp_code_field, token, user_id, skipPassword, apiUserID, skipWriteAuthFile, dbUserId, debug, cleanupTokens, secureCookie, }) {
var _b, _c, _d;
const grabedHostNames = (0, grab_host_names_1.default)({ userId: user_id || apiUserID });
const { host, port, scheme } = grabedHostNames;
@@ -186,7 +186,7 @@ function loginUser(_a) {
debugFn(encryptedPayload, "encryptedPayload");
}
response === null || response === void 0 ? void 0 : response.setHeader("Set-Cookie", [
`${authKeyName}=${encryptedPayload};samesite=strict;path=/;HttpOnly=true;Secure=true`,
`${authKeyName}=${encryptedPayload};samesite=strict;path=/;HttpOnly=true${secureCookie ? ";Secure=true" : ""}`,
`${csrfName}=${(_d = httpResponse.payload) === null || _d === void 0 ? void 0 : _d.csrf_k};samesite=strict;path=/;HttpOnly=true`,
]);
if (debug) {
dist/package-shared/actions/users/reauth-user.d.ts
Vendored
+2 -1
View File
@@ -11,9 +11,10 @@ type Param = {
additionalFields?: string[];
encryptedUserString?: string;
user_id?: string | number;
secureCookie?: boolean;
};
/**
* # Reauthorize User
*/
export default function reauthUser({ key, database, response, request, level, encryptionKey, encryptionSalt, additionalFields, encryptedUserString, user_id, }: Param): Promise<APILoginFunctionReturn>;
export default function reauthUser({ key, database, response, request, level, encryptionKey, encryptionSalt, additionalFields, encryptedUserString, user_id, secureCookie, }: Param): Promise<APILoginFunctionReturn>;
export {};
dist/package-shared/actions/users/reauth-user.js
Vendored
+2 -2
View File
@@ -25,7 +25,7 @@ const get_auth_cookie_names_1 = __importDefault(require("../../functions/backend
* # Reauthorize User
*/
function reauthUser(_a) {
return __awaiter(this, arguments, void 0, function* ({ key, database, response, request, level, encryptionKey, encryptionSalt, additionalFields, encryptedUserString, user_id, }) {
return __awaiter(this, arguments, void 0, function* ({ key, database, response, request, level, encryptionKey, encryptionSalt, additionalFields, encryptedUserString, user_id, secureCookie, }) {
var _b, _c;
/**
* Check Encryption Keys
@@ -143,7 +143,7 @@ function reauthUser(_a) {
const authKeyName = cookieNames.keyCookieName;
const csrfName = cookieNames.csrfCookieName;
response === null || response === void 0 ? void 0 : response.setHeader("Set-Cookie", [
`${authKeyName}=${encryptedPayload};samesite=strict;path=/;HttpOnly=true;Secure=true`,
`${authKeyName}=${encryptedPayload};samesite=strict;path=/;HttpOnly=true${secureCookie ? ";Secure=true" : ""}`,
`${csrfName}=${(_c = httpResponse.payload) === null || _c === void 0 ? void 0 : _c.csrf_k};samesite=strict;path=/;HttpOnly=true`,
]);
if (httpResponse.csrf) {
dist/package-shared/actions/users/social/github-auth.d.ts
Vendored
+2 -1
View File
@@ -26,9 +26,10 @@ type Param = {
[s: string]: string | number;
};
user_id?: boolean;
secureCookie?: boolean;
};
/**
* # SERVER FUNCTION: Login with google Function
*/
export default function githubAuth({ key, code, email, database, clientId, clientSecret, response, encryptionKey, encryptionSalt, additionalFields, user_id, additionalData, }: Param): Promise<FunctionReturn | undefined>;
export default function githubAuth({ key, code, email, database, clientId, clientSecret, response, encryptionKey, encryptionSalt, additionalFields, user_id, additionalData, secureCookie, }: Param): Promise<FunctionReturn | undefined>;
export {};
dist/package-shared/actions/users/social/github-auth.js
Vendored
+2 -4
View File
@@ -22,7 +22,7 @@ const api_github_login_1 = __importDefault(require("../../../functions/api/users
* # SERVER FUNCTION: Login with google Function
*/
function githubAuth(_a) {
return __awaiter(this, arguments, void 0, function* ({ key, code, email, database, clientId, clientSecret, response, encryptionKey, encryptionSalt, additionalFields, user_id, additionalData, }) {
return __awaiter(this, arguments, void 0, function* ({ key, code, email, database, clientId, clientSecret, response, encryptionKey, encryptionSalt, additionalFields, user_id, additionalData, secureCookie, }) {
/**
* Check inputs
*
@@ -162,10 +162,8 @@ function githubAuth(_a) {
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`,
`${authKeyName}=${encryptedPayload};samesite=strict;path=/;HttpOnly=true${secureCookie ? ";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=/`,
]);
}
return httpResponse;
dist/package-shared/actions/users/social/google-auth.d.ts
Vendored
+2 -1
View File
@@ -13,9 +13,10 @@ type Param = {
};
apiUserID?: string | number;
debug?: boolean;
secureCookie?: boolean;
};
/**
* # SERVER FUNCTION: Login with google Function
*/
export default function googleAuth({ key, token, database, response, encryptionKey, encryptionSalt, additionalFields, additionalData, apiUserID, debug, }: Param): Promise<APILoginFunctionReturn>;
export default function googleAuth({ key, token, database, response, encryptionKey, encryptionSalt, additionalFields, additionalData, apiUserID, debug, secureCookie, }: Param): Promise<APILoginFunctionReturn>;
export {};
dist/package-shared/actions/users/social/google-auth.js
Vendored
+2 -2
View File
@@ -22,7 +22,7 @@ const write_auth_files_1 = require("../../../functions/backend/auth/write-auth-f
* # SERVER FUNCTION: Login with google Function
*/
function googleAuth(_a) {
return __awaiter(this, arguments, void 0, function* ({ key, token, database, response, encryptionKey, encryptionSalt, additionalFields, additionalData, apiUserID, debug, }) {
return __awaiter(this, arguments, void 0, function* ({ key, token, database, response, encryptionKey, encryptionSalt, additionalFields, additionalData, apiUserID, debug, secureCookie, }) {
var _b;
const grabedHostNames = (0, grab_host_names_1.default)({
userId: apiUserID || process.env.DSQL_API_USER_ID,
@@ -150,7 +150,7 @@ function googleAuth(_a) {
const authKeyName = cookieNames.keyCookieName;
const csrfName = cookieNames.csrfCookieName;
response === null || response === void 0 ? void 0 : response.setHeader("Set-Cookie", [
`${authKeyName}=${encryptedPayload};samesite=strict;path=/;HttpOnly=true;Secure=true`,
`${authKeyName}=${encryptedPayload};samesite=strict;path=/;HttpOnly=true${secureCookie ? ";Secure=true" : ""}`,
`${csrfName}=${(_b = httpResponse.payload) === null || _b === void 0 ? void 0 : _b.csrf_k};samesite=strict;path=/;HttpOnly=true`,
]);
}
dist/package-shared/functions/backend/auth/write-auth-files.js
Vendored
+9 -5
View File
@@ -7,6 +7,10 @@ exports.checkAuthFile = exports.deleteAuthFile = exports.getAuthFile = exports.c
const fs_1 = __importDefault(require("fs"));
const path_1 = __importDefault(require("path"));
const ejson_1 = __importDefault(require("../../../utils/ejson"));
const debug_log_1 = __importDefault(require("../../../utils/logging/debug-log"));
function debugFn(log, label) {
(0, debug_log_1.default)({ log, addTime: true, title: "write-auth-files", label });
}
const grabAuthDirs = () => {
const DSQL_AUTH_DIR = process.env.DSQL_AUTH_DIR;
const ROOT_DIR = (DSQL_AUTH_DIR === null || DSQL_AUTH_DIR === void 0 ? void 0 : DSQL_AUTH_DIR.match(/./))
@@ -39,14 +43,14 @@ exports.initAuthFiles = initAuthFiles;
const writeAuthFile = (name, data, cleanup) => {
(0, exports.initAuthFiles)();
try {
const { auth, root } = (0, exports.grabAuthDirs)();
const { auth } = (0, exports.grabAuthDirs)();
if (cleanup) {
(0, exports.cleanupUserAuthFiles)(cleanup.userId);
}
fs_1.default.writeFileSync(path_1.default.join(auth, name), data);
return true;
}
catch ( /** @type {any} */error) {
catch (error) {
console.log(`Error writing Auth File: ${error.message}`);
return false;
}
@@ -87,7 +91,7 @@ const getAuthFile = (name) => {
const authFilePath = path_1.default.join((0, exports.grabAuthDirs)().auth, name);
return fs_1.default.readFileSync(authFilePath, "utf-8");
}
catch ( /** @type {any} */error) {
catch (error) {
console.log(`Error getting Auth File: ${error.message}`);
return null;
}
@@ -101,7 +105,7 @@ const deleteAuthFile = (name) => {
try {
return fs_1.default.rmSync(path_1.default.join((0, exports.grabAuthDirs)().auth, name));
}
catch ( /** @type {any} */error) {
catch (error) {
console.log(`Error deleting Auth File: ${error.message}`);
return null;
}
@@ -116,7 +120,7 @@ const checkAuthFile = (name) => {
return fs_1.default.existsSync(path_1.default.join((0, exports.grabAuthDirs)().auth, name));
return true;
}
catch ( /** @type {any} */error) {
catch (error) {
console.log(`Error checking Auth File: ${error.message}`);
return false;
}
dist/package-shared/shell/grantFullPriviledges.js
Vendored
+6 -2
View File
@@ -32,8 +32,12 @@ function grantFullPrivileges(_a) {
for (let i = 0; i < datasquirelUserDatabases.length; i++) {
const datasquirelUserDatabase = datasquirelUserDatabases[i];
const { Database } = datasquirelUserDatabase;
const grantDbPriviledges = yield (0, noDatabaseDbHandler_1.default)(`GRANT ALL PRIVILEGES ON ${Database}.* TO '${process.env.DSQL_DB_FULL_ACCESS_USERNAME}'@'%' WITH GRANT OPTION`);
const grantRead = yield (0, noDatabaseDbHandler_1.default)(`GRANT SELECT ON ${Database}.* TO '${process.env.DSQL_DB_READ_ONLY_USERNAME}'@'%'`);
// const grantDbPriviledges = await noDatabaseDbHandler(
// `GRANT ALL PRIVILEGES ON ${Database}.* TO '${process.env.DSQL_DB_FULL_ACCESS_USERNAME}'@'%' WITH GRANT OPTION`
// );
// const grantRead = await noDatabaseDbHandler(
// `GRANT SELECT ON ${Database}.* TO '${process.env.DSQL_DB_READ_ONLY_USERNAME}'@'%'`
// );
}
const flushPriviledged = yield (0, noDatabaseDbHandler_1.default)(`FLUSH PRIVILEGES`);
}
dist/package-shared/utils/backend/names/grab-dir-names.d.ts
Vendored
+7
View File
@@ -2,8 +2,10 @@ import { DATASQUIREL_LoggedInUser, UserType } from "../../../types";
type Param = {
user?: DATASQUIREL_LoggedInUser | UserType;
userId?: string | number | null;
appDir?: string;
};
export default function grabDirNames(param?: Param): {
appDir: string;
schemasDir: string;
userDirPath: string | undefined;
mainShemaJSONFilePath: string;
@@ -22,5 +24,10 @@ export default function grabDirNames(param?: Param): {
userPrivateDbImportZipFileName: string;
userPrivateDbImportZipFilePath: string | undefined;
dbNginxLoadBalancerConfigFile: string;
dockerComposeFile: string;
testDockerComposeFile: string;
siteSetupFile: string;
envFile: string;
testEnvFile: string;
};
export {};
dist/package-shared/utils/backend/names/grab-dir-names.js
Vendored
+15 -3
View File
@@ -7,11 +7,12 @@ exports.default = grabDirNames;
const path_1 = __importDefault(require("path"));
function grabDirNames(param) {
var _a;
const appDir = process.env.DSQL_APP_DIR;
const schemasDir = process.env.DSQL_DB_SCHEMA_DIR;
const tempDirName = ".tmp";
const appDir = (param === null || param === void 0 ? void 0 : param.appDir) || process.env.DSQL_APP_DIR;
if (!appDir)
throw new Error("Please provide the `DSQL_APP_DIR` env variable.");
const schemasDir = process.env.DSQL_DB_SCHEMA_DIR ||
path_1.default.join(appDir, "jsonData", "dbSchemas");
const tempDirName = ".tmp";
if (!schemasDir)
throw new Error("Please provide the `DSQL_DB_SCHEMA_DIR` env variable.");
const pakageSharedDir = path_1.default.join(appDir, `package-shared`);
@@ -51,7 +52,13 @@ function grabDirNames(param) {
? path_1.default.join(userPrivateSQLExportsDir, userPrivateDbImportZipFileName)
: undefined;
const dbNginxLoadBalancerConfigFile = path_1.default.join(appDir, "docker/mariadb/load-balancer/config/template/nginx.conf");
const dockerComposeFile = path_1.default.join(appDir, "docker-compose.yml");
const testDockerComposeFile = path_1.default.join(appDir, "test.docker-compose.yml");
const siteSetupFile = path_1.default.join(appDir, "site-setup.json");
const envFile = path_1.default.join(appDir, ".env");
const testEnvFile = path_1.default.join(appDir, "test.env");
return {
appDir,
schemasDir,
userDirPath,
mainShemaJSONFilePath,
@@ -70,5 +77,10 @@ function grabDirNames(param) {
userPrivateDbImportZipFileName,
userPrivateDbImportZipFilePath,
dbNginxLoadBalancerConfigFile,
dockerComposeFile,
testDockerComposeFile,
siteSetupFile,
envFile,
testEnvFile,
};
}