This commit is contained in:
Benjamin Toby 2025-07-10 17:29:34 +01:00
parent 5cb8a067c0
commit caa26217a0
10 changed files with 184 additions and 135 deletions

16
dist/index.d.ts vendored
View File

@ -9,6 +9,8 @@ declare global {
import get from "./package-shared/actions/get"; import get from "./package-shared/actions/get";
import post from "./package-shared/actions/post"; import post from "./package-shared/actions/post";
import getSchema from "./package-shared/actions/get-schema"; import getSchema from "./package-shared/actions/get-schema";
import createUser from "./package-shared/actions/users/add-user";
import updateUser from "./package-shared/actions/users/update-user";
import sqlGenerator from "./package-shared/functions/dsql/sql/sql-generator"; import sqlGenerator from "./package-shared/functions/dsql/sql/sql-generator";
import sqlInsertGenerator from "./package-shared/functions/dsql/sql/sql-insert-generator"; import sqlInsertGenerator from "./package-shared/functions/dsql/sql/sql-insert-generator";
import sqlDeleteGenerator from "./package-shared/functions/dsql/sql/sql-delete-generator"; import sqlDeleteGenerator from "./package-shared/functions/dsql/sql/sql-delete-generator";
@ -46,13 +48,13 @@ declare const datasquirel: {
}; };
user: { user: {
auth: { auth: {
login: (_: import("./package-shared/types").LoginUserParam) => Promise<import("./package-shared/types").APIResponseObject<import("./package-shared/types").DATASQUIREL_LoggedInUser | null>>; login: typeof import("./package-shared/actions/users/login-user").default;
get: (_: import("./package-shared/types").GetUserParams) => Promise<import("./package-shared/types").GetUserFunctionReturn>; get: typeof import("./package-shared/actions/users/get-user").default;
signup: (_: import("./package-shared/types").AddUserParams) => Promise<import("./package-shared/types").APIResponseObject>; signup: typeof createUser;
sendEmailCode: (_: import("./package-shared/types").SendEmailCodeParams) => Promise<import("./package-shared/types").APIResponseObject>; sendEmailCode: typeof import("./package-shared/actions/users/send-email-code").default;
update: (_: import("./package-shared/types").UpdateUserParams) => Promise<import("./package-shared/types").UpdateUserFunctionReturn>; update: typeof updateUser;
resetPassword: (_: import("./package-shared/types").ResetPasswordParams) => Promise<import("./package-shared/types").UpdateUserFunctionReturn>; resetPassword: typeof import("./package-shared/actions/users/reset-password").default;
googleLogin: (_: import("./package-shared/types").GoogleAuthParams) => Promise<import("./package-shared/types").APIResponseObject>; googleLogin: typeof import("./package-shared/actions/users/social/google-auth").default;
logout: typeof import("./package-shared/actions/users/logout-user").default; logout: typeof import("./package-shared/actions/users/logout-user").default;
auth: typeof import("./package-shared/actions/users/user-auth").default; auth: typeof import("./package-shared/actions/users/user-auth").default;
validateTempEmailCode: typeof import("./package-shared/actions/users/validate-temp-email-code").default; validateTempEmailCode: typeof import("./package-shared/actions/users/validate-temp-email-code").default;

5
dist/index.js vendored
View File

@ -22,6 +22,7 @@ const debug_log_1 = __importDefault(require("./package-shared/utils/logging/debu
const parse_env_1 = __importDefault(require("./package-shared/utils/parse-env")); const parse_env_1 = __importDefault(require("./package-shared/utils/parse-env"));
const crud_2 = __importDefault(require("./package-shared/api/crud")); const crud_2 = __importDefault(require("./package-shared/api/crud"));
const user_1 = __importDefault(require("./package-shared/api/user")); const user_1 = __importDefault(require("./package-shared/api/user"));
const local_user_1 = __importDefault(require("./package-shared/api/user/local-user"));
const media_1 = __importDefault(require("./package-shared/api/media")); const media_1 = __importDefault(require("./package-shared/api/media"));
const dbHandler_1 = __importDefault(require("./package-shared/functions/backend/dbHandler")); const dbHandler_1 = __importDefault(require("./package-shared/functions/backend/dbHandler"));
/** /**
@ -51,7 +52,7 @@ const dbHandler_1 = __importDefault(require("./package-shared/functions/backend/
const api = { const api = {
crud: crud_2.default, crud: crud_2.default,
media: media_1.default, media: media_1.default,
user: (0, user_1.default)(), user: user_1.default,
}; };
/** /**
* SQL Utils * SQL Utils
@ -78,7 +79,7 @@ const datasquirel = {
* Post Action * Post Action
*/ */
post: post_1.default, post: post_1.default,
user: (0, user_1.default)({ local: true }), user: local_user_1.default,
getSchema: get_schema_1.default, getSchema: get_schema_1.default,
client: client_1.default, client: client_1.default,
sql, sql,

View File

@ -1,22 +1,25 @@
import addUser from "../../actions/users/add-user";
import getUser from "../../actions/users/get-user";
import loginUser from "../../actions/users/login-user";
import logoutUser from "../../actions/users/logout-user"; import logoutUser from "../../actions/users/logout-user";
import resetPassword from "../../actions/users/reset-password";
import sendEmailCode from "../../actions/users/send-email-code";
import googleAuth from "../../actions/users/social/google-auth";
import updateUser from "../../actions/users/update-user";
import userAuth from "../../actions/users/user-auth"; import userAuth from "../../actions/users/user-auth";
import validateTempEmailCode from "../../actions/users/validate-temp-email-code"; import validateTempEmailCode from "../../actions/users/validate-temp-email-code";
import { AddUserParams, GetUserParams, GoogleAuthParams, LoginUserParam, ResetPasswordParams, SendEmailCodeParams, UpdateUserParams } from "../../types"; declare const user: {
type Params = {
local?: boolean;
};
export default function user(params?: Params): {
auth: { auth: {
login: (_: LoginUserParam) => Promise<import("../../types").APIResponseObject<import("../../types").DATASQUIREL_LoggedInUser | null>>; login: typeof loginUser;
get: (_: GetUserParams) => Promise<import("../../types").GetUserFunctionReturn>; get: typeof getUser;
signup: (_: AddUserParams) => Promise<import("../../types").APIResponseObject>; signup: typeof addUser;
sendEmailCode: (_: SendEmailCodeParams) => Promise<import("../../types").APIResponseObject>; sendEmailCode: typeof sendEmailCode;
update: (_: UpdateUserParams) => Promise<import("../../types").UpdateUserFunctionReturn>; update: typeof updateUser;
resetPassword: (_: ResetPasswordParams) => Promise<import("../../types").UpdateUserFunctionReturn>; resetPassword: typeof resetPassword;
googleLogin: (_: GoogleAuthParams) => Promise<import("../../types").APIResponseObject>; googleLogin: typeof googleAuth;
logout: typeof logoutUser; logout: typeof logoutUser;
auth: typeof userAuth; auth: typeof userAuth;
validateTempEmailCode: typeof validateTempEmailCode; validateTempEmailCode: typeof validateTempEmailCode;
}; };
}; };
export {}; export default user;

View File

@ -1,18 +1,8 @@
"use strict"; "use strict";
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
return new (P || (P = Promise))(function (resolve, reject) {
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
step((generator = generator.apply(thisArg, _arguments || [])).next());
});
};
var __importDefault = (this && this.__importDefault) || function (mod) { var __importDefault = (this && this.__importDefault) || function (mod) {
return (mod && mod.__esModule) ? mod : { "default": mod }; return (mod && mod.__esModule) ? mod : { "default": mod };
}; };
Object.defineProperty(exports, "__esModule", { value: true }); Object.defineProperty(exports, "__esModule", { value: true });
exports.default = user;
const add_user_1 = __importDefault(require("../../actions/users/add-user")); const add_user_1 = __importDefault(require("../../actions/users/add-user"));
const get_user_1 = __importDefault(require("../../actions/users/get-user")); const get_user_1 = __importDefault(require("../../actions/users/get-user"));
const login_user_1 = __importDefault(require("../../actions/users/login-user")); const login_user_1 = __importDefault(require("../../actions/users/login-user"));
@ -23,47 +13,18 @@ const google_auth_1 = __importDefault(require("../../actions/users/social/google
const update_user_1 = __importDefault(require("../../actions/users/update-user")); const update_user_1 = __importDefault(require("../../actions/users/update-user"));
const user_auth_1 = __importDefault(require("../../actions/users/user-auth")); const user_auth_1 = __importDefault(require("../../actions/users/user-auth"));
const validate_temp_email_code_1 = __importDefault(require("../../actions/users/validate-temp-email-code")); const validate_temp_email_code_1 = __importDefault(require("../../actions/users/validate-temp-email-code"));
function user(params) { const user = {
return { auth: {
auth: { login: login_user_1.default,
login: (params === null || params === void 0 ? void 0 : params.local) get: get_user_1.default,
? (_) => __awaiter(this, void 0, void 0, function* () { signup: add_user_1.default,
return yield (0, login_user_1.default)(Object.assign(Object.assign({}, _), { useLocal: true })); sendEmailCode: send_email_code_1.default,
}) update: update_user_1.default,
: login_user_1.default, resetPassword: reset_password_1.default,
get: (params === null || params === void 0 ? void 0 : params.local) googleLogin: google_auth_1.default,
? (_) => __awaiter(this, void 0, void 0, function* () { logout: logout_user_1.default,
return yield (0, get_user_1.default)(Object.assign(Object.assign({}, _), { useLocal: true })); auth: user_auth_1.default,
}) validateTempEmailCode: validate_temp_email_code_1.default,
: get_user_1.default, },
signup: (params === null || params === void 0 ? void 0 : params.local) };
? (_) => __awaiter(this, void 0, void 0, function* () { exports.default = user;
return yield (0, add_user_1.default)(Object.assign(Object.assign({}, _), { useLocal: true }));
})
: add_user_1.default,
sendEmailCode: (params === null || params === void 0 ? void 0 : params.local)
? (_) => __awaiter(this, void 0, void 0, function* () {
return yield (0, send_email_code_1.default)(Object.assign(Object.assign({}, _), { useLocal: true }));
})
: send_email_code_1.default,
update: (params === null || params === void 0 ? void 0 : params.local)
? (_) => __awaiter(this, void 0, void 0, function* () {
return yield (0, update_user_1.default)(Object.assign(Object.assign({}, _), { useLocal: true }));
})
: update_user_1.default,
resetPassword: (params === null || params === void 0 ? void 0 : params.local)
? (_) => __awaiter(this, void 0, void 0, function* () {
return yield (0, reset_password_1.default)(Object.assign(Object.assign({}, _), { useLocal: true }));
})
: reset_password_1.default,
googleLogin: (params === null || params === void 0 ? void 0 : params.local)
? (_) => __awaiter(this, void 0, void 0, function* () {
return yield (0, google_auth_1.default)(Object.assign(Object.assign({}, _), { useLocal: true }));
})
: google_auth_1.default,
logout: logout_user_1.default,
auth: user_auth_1.default,
validateTempEmailCode: validate_temp_email_code_1.default,
},
};
}

View File

@ -0,0 +1,19 @@
import logoutUser from "../../actions/users/logout-user";
import userAuth from "../../actions/users/user-auth";
import validateTempEmailCode from "../../actions/users/validate-temp-email-code";
import { AddUserParams, GetUserParams, GoogleAuthParams, LoginUserParam, ResetPasswordParams, SendEmailCodeParams, UpdateUserParams } from "../../types";
declare const localUser: {
auth: {
login: (_: LoginUserParam) => Promise<import("../../types").APIResponseObject<import("../../types").DATASQUIREL_LoggedInUser | null>>;
get: (_: GetUserParams) => Promise<import("../../types").GetUserFunctionReturn>;
signup: (_: AddUserParams) => Promise<import("../../types").APIResponseObject>;
sendEmailCode: (_: SendEmailCodeParams) => Promise<import("../../types").APIResponseObject>;
update: (_: UpdateUserParams) => Promise<import("../../types").UpdateUserFunctionReturn>;
resetPassword: (_: ResetPasswordParams) => Promise<import("../../types").UpdateUserFunctionReturn>;
googleLogin: (_: GoogleAuthParams) => Promise<import("../../types").APIResponseObject>;
logout: typeof logoutUser;
auth: typeof userAuth;
validateTempEmailCode: typeof validateTempEmailCode;
};
};
export default localUser;

View File

@ -0,0 +1,53 @@
"use strict";
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
return new (P || (P = Promise))(function (resolve, reject) {
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
step((generator = generator.apply(thisArg, _arguments || [])).next());
});
};
var __importDefault = (this && this.__importDefault) || function (mod) {
return (mod && mod.__esModule) ? mod : { "default": mod };
};
Object.defineProperty(exports, "__esModule", { value: true });
const add_user_1 = __importDefault(require("../../actions/users/add-user"));
const get_user_1 = __importDefault(require("../../actions/users/get-user"));
const login_user_1 = __importDefault(require("../../actions/users/login-user"));
const logout_user_1 = __importDefault(require("../../actions/users/logout-user"));
const reset_password_1 = __importDefault(require("../../actions/users/reset-password"));
const send_email_code_1 = __importDefault(require("../../actions/users/send-email-code"));
const google_auth_1 = __importDefault(require("../../actions/users/social/google-auth"));
const update_user_1 = __importDefault(require("../../actions/users/update-user"));
const user_auth_1 = __importDefault(require("../../actions/users/user-auth"));
const validate_temp_email_code_1 = __importDefault(require("../../actions/users/validate-temp-email-code"));
const localUser = {
auth: {
login: (_) => __awaiter(void 0, void 0, void 0, function* () {
return yield (0, login_user_1.default)(Object.assign(Object.assign({}, _), { useLocal: true }));
}),
get: (_) => __awaiter(void 0, void 0, void 0, function* () {
return yield (0, get_user_1.default)(Object.assign(Object.assign({}, _), { useLocal: true }));
}),
signup: (_) => __awaiter(void 0, void 0, void 0, function* () {
return yield (0, add_user_1.default)(Object.assign(Object.assign({}, _), { useLocal: true }));
}),
sendEmailCode: (_) => __awaiter(void 0, void 0, void 0, function* () {
return yield (0, send_email_code_1.default)(Object.assign(Object.assign({}, _), { useLocal: true }));
}),
update: (_) => __awaiter(void 0, void 0, void 0, function* () {
return yield (0, update_user_1.default)(Object.assign(Object.assign({}, _), { useLocal: true }));
}),
resetPassword: (_) => __awaiter(void 0, void 0, void 0, function* () {
return yield (0, reset_password_1.default)(Object.assign(Object.assign({}, _), { useLocal: true }));
}),
googleLogin: (_) => __awaiter(void 0, void 0, void 0, function* () {
return yield (0, google_auth_1.default)(Object.assign(Object.assign({}, _), { useLocal: true }));
}),
logout: logout_user_1.default,
auth: user_auth_1.default,
validateTempEmailCode: validate_temp_email_code_1.default,
},
};
exports.default = localUser;

View File

@ -32,6 +32,7 @@ import { ErrorCallback } from "./package-shared/types";
import parseEnv from "./package-shared/utils/parse-env"; import parseEnv from "./package-shared/utils/parse-env";
import crud from "./package-shared/api/crud"; import crud from "./package-shared/api/crud";
import user from "./package-shared/api/user"; import user from "./package-shared/api/user";
import localUser from "./package-shared/api/user/local-user";
import media from "./package-shared/api/media"; import media from "./package-shared/api/media";
import dbHandler from "./package-shared/functions/backend/dbHandler"; import dbHandler from "./package-shared/functions/backend/dbHandler";
@ -63,7 +64,7 @@ import dbHandler from "./package-shared/functions/backend/dbHandler";
const api = { const api = {
crud, crud,
media, media,
user: user(), user,
}; };
/** /**
@ -92,7 +93,7 @@ const datasquirel = {
* Post Action * Post Action
*/ */
post, post,
user: user({ local: true }), user: localUser,
getSchema, getSchema,
client: datasquirelClient, client: datasquirelClient,
sql, sql,

View File

@ -9,61 +9,19 @@ import updateUser from "../../actions/users/update-user";
import userAuth from "../../actions/users/user-auth"; import userAuth from "../../actions/users/user-auth";
import validateTempEmailCode from "../../actions/users/validate-temp-email-code"; import validateTempEmailCode from "../../actions/users/validate-temp-email-code";
import { const user = {
AddUserParams, auth: {
GetUserParams, login: loginUser,
GoogleAuthParams, get: getUser,
LoginUserParam, signup: addUser,
ResetPasswordParams, sendEmailCode: sendEmailCode,
SendEmailCodeParams, update: updateUser,
UpdateUserParams, resetPassword: resetPassword,
} from "../../types"; googleLogin: googleAuth,
logout: logoutUser,
type Params = { auth: userAuth,
local?: boolean; validateTempEmailCode,
},
}; };
export default function user(params?: Params) { export default user;
return {
auth: {
login: params?.local
? async (_: LoginUserParam) => {
return await loginUser({ ..._, useLocal: true });
}
: loginUser,
get: params?.local
? async (_: GetUserParams) => {
return await getUser({ ..._, useLocal: true });
}
: getUser,
signup: params?.local
? async (_: AddUserParams) => {
return await addUser({ ..._, useLocal: true });
}
: addUser,
sendEmailCode: params?.local
? async (_: SendEmailCodeParams) => {
return await sendEmailCode({ ..._, useLocal: true });
}
: sendEmailCode,
update: params?.local
? async (_: UpdateUserParams) => {
return await updateUser({ ..._, useLocal: true });
}
: updateUser,
resetPassword: params?.local
? async (_: ResetPasswordParams) => {
return await resetPassword({ ..._, useLocal: true });
}
: resetPassword,
googleLogin: params?.local
? async (_: GoogleAuthParams) => {
return await googleAuth({ ..._, useLocal: true });
}
: googleAuth,
logout: logoutUser,
auth: userAuth,
validateTempEmailCode,
},
};
}

View File

@ -0,0 +1,51 @@
import addUser from "../../actions/users/add-user";
import getUser from "../../actions/users/get-user";
import loginUser from "../../actions/users/login-user";
import logoutUser from "../../actions/users/logout-user";
import resetPassword from "../../actions/users/reset-password";
import sendEmailCode from "../../actions/users/send-email-code";
import googleAuth from "../../actions/users/social/google-auth";
import updateUser from "../../actions/users/update-user";
import userAuth from "../../actions/users/user-auth";
import validateTempEmailCode from "../../actions/users/validate-temp-email-code";
import {
AddUserParams,
GetUserParams,
GoogleAuthParams,
LoginUserParam,
ResetPasswordParams,
SendEmailCodeParams,
UpdateUserParams,
} from "../../types";
const localUser = {
auth: {
login: async (_: LoginUserParam) => {
return await loginUser({ ..._, useLocal: true });
},
get: async (_: GetUserParams) => {
return await getUser({ ..._, useLocal: true });
},
signup: async (_: AddUserParams) => {
return await addUser({ ..._, useLocal: true });
},
sendEmailCode: async (_: SendEmailCodeParams) => {
return await sendEmailCode({ ..._, useLocal: true });
},
update: async (_: UpdateUserParams) => {
return await updateUser({ ..._, useLocal: true });
},
resetPassword: async (_: ResetPasswordParams) => {
return await resetPassword({ ..._, useLocal: true });
},
googleLogin: async (_: GoogleAuthParams) => {
return await googleAuth({ ..._, useLocal: true });
},
logout: logoutUser,
auth: userAuth,
validateTempEmailCode,
},
};
export default localUser;

View File

@ -1,6 +1,6 @@
{ {
"name": "@moduletrace/datasquirel", "name": "@moduletrace/datasquirel",
"version": "5.0.0", "version": "5.0.1",
"description": "Cloud-based SQL data management tool", "description": "Cloud-based SQL data management tool",
"main": "dist/index.js", "main": "dist/index.js",
"bin": { "bin": {