From caa26217a04a2566b23824405a5751c8d7cfaddd Mon Sep 17 00:00:00 2001 From: Benjamin Toby Date: Thu, 10 Jul 2025 17:29:34 +0100 Subject: [PATCH] Updates --- dist/index.d.ts | 16 +++-- dist/index.js | 5 +- dist/package-shared/api/user/index.d.ts | 29 ++++---- dist/package-shared/api/user/index.js | 69 +++++-------------- dist/package-shared/api/user/local-user.d.ts | 19 ++++++ dist/package-shared/api/user/local-user.js | 53 +++++++++++++++ index.ts | 5 +- package-shared/api/user/index.ts | 70 ++++---------------- package-shared/api/user/local-user.ts | 51 ++++++++++++++ package.json | 2 +- 10 files changed, 184 insertions(+), 135 deletions(-) create mode 100644 dist/package-shared/api/user/local-user.d.ts create mode 100644 dist/package-shared/api/user/local-user.js create mode 100644 package-shared/api/user/local-user.ts diff --git a/dist/index.d.ts b/dist/index.d.ts index 99380d6..4df81ba 100644 --- a/dist/index.d.ts +++ b/dist/index.d.ts @@ -9,6 +9,8 @@ declare global { import get from "./package-shared/actions/get"; import post from "./package-shared/actions/post"; 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 sqlInsertGenerator from "./package-shared/functions/dsql/sql/sql-insert-generator"; import sqlDeleteGenerator from "./package-shared/functions/dsql/sql/sql-delete-generator"; @@ -46,13 +48,13 @@ declare const datasquirel: { }; user: { auth: { - login: (_: import("./package-shared/types").LoginUserParam) => Promise>; - get: (_: import("./package-shared/types").GetUserParams) => Promise; - signup: (_: import("./package-shared/types").AddUserParams) => Promise; - sendEmailCode: (_: import("./package-shared/types").SendEmailCodeParams) => Promise; - update: (_: import("./package-shared/types").UpdateUserParams) => Promise; - resetPassword: (_: import("./package-shared/types").ResetPasswordParams) => Promise; - googleLogin: (_: import("./package-shared/types").GoogleAuthParams) => Promise; + login: typeof import("./package-shared/actions/users/login-user").default; + get: typeof import("./package-shared/actions/users/get-user").default; + signup: typeof createUser; + sendEmailCode: typeof import("./package-shared/actions/users/send-email-code").default; + update: typeof updateUser; + resetPassword: typeof import("./package-shared/actions/users/reset-password").default; + googleLogin: typeof import("./package-shared/actions/users/social/google-auth").default; logout: typeof import("./package-shared/actions/users/logout-user").default; auth: typeof import("./package-shared/actions/users/user-auth").default; validateTempEmailCode: typeof import("./package-shared/actions/users/validate-temp-email-code").default; diff --git a/dist/index.js b/dist/index.js index ab23810..0552e84 100644 --- a/dist/index.js +++ b/dist/index.js @@ -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 crud_2 = __importDefault(require("./package-shared/api/crud")); 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 dbHandler_1 = __importDefault(require("./package-shared/functions/backend/dbHandler")); /** @@ -51,7 +52,7 @@ const dbHandler_1 = __importDefault(require("./package-shared/functions/backend/ const api = { crud: crud_2.default, media: media_1.default, - user: (0, user_1.default)(), + user: user_1.default, }; /** * SQL Utils @@ -78,7 +79,7 @@ const datasquirel = { * Post Action */ post: post_1.default, - user: (0, user_1.default)({ local: true }), + user: local_user_1.default, getSchema: get_schema_1.default, client: client_1.default, sql, diff --git a/dist/package-shared/api/user/index.d.ts b/dist/package-shared/api/user/index.d.ts index 0944691..8f6a374 100644 --- a/dist/package-shared/api/user/index.d.ts +++ b/dist/package-shared/api/user/index.d.ts @@ -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 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"; -type Params = { - local?: boolean; -}; -export default function user(params?: Params): { +declare const user: { auth: { - login: (_: LoginUserParam) => Promise>; - get: (_: GetUserParams) => Promise; - signup: (_: AddUserParams) => Promise; - sendEmailCode: (_: SendEmailCodeParams) => Promise; - update: (_: UpdateUserParams) => Promise; - resetPassword: (_: ResetPasswordParams) => Promise; - googleLogin: (_: GoogleAuthParams) => Promise; + login: typeof loginUser; + get: typeof getUser; + signup: typeof addUser; + sendEmailCode: typeof sendEmailCode; + update: typeof updateUser; + resetPassword: typeof resetPassword; + googleLogin: typeof googleAuth; logout: typeof logoutUser; auth: typeof userAuth; validateTempEmailCode: typeof validateTempEmailCode; }; }; -export {}; +export default user; diff --git a/dist/package-shared/api/user/index.js b/dist/package-shared/api/user/index.js index e919f8b..a9654ed 100644 --- a/dist/package-shared/api/user/index.js +++ b/dist/package-shared/api/user/index.js @@ -1,18 +1,8 @@ "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 }); -exports.default = user; 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")); @@ -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 user_auth_1 = __importDefault(require("../../actions/users/user-auth")); const validate_temp_email_code_1 = __importDefault(require("../../actions/users/validate-temp-email-code")); -function user(params) { - return { - auth: { - login: (params === null || params === void 0 ? void 0 : params.local) - ? (_) => __awaiter(this, void 0, void 0, function* () { - return yield (0, login_user_1.default)(Object.assign(Object.assign({}, _), { useLocal: true })); - }) - : login_user_1.default, - get: (params === null || params === void 0 ? void 0 : params.local) - ? (_) => __awaiter(this, void 0, void 0, function* () { - return yield (0, get_user_1.default)(Object.assign(Object.assign({}, _), { useLocal: true })); - }) - : get_user_1.default, - signup: (params === null || params === void 0 ? void 0 : params.local) - ? (_) => __awaiter(this, void 0, void 0, function* () { - 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, - }, - }; -} +const user = { + auth: { + login: login_user_1.default, + get: get_user_1.default, + signup: add_user_1.default, + sendEmailCode: send_email_code_1.default, + update: update_user_1.default, + resetPassword: reset_password_1.default, + googleLogin: google_auth_1.default, + logout: logout_user_1.default, + auth: user_auth_1.default, + validateTempEmailCode: validate_temp_email_code_1.default, + }, +}; +exports.default = user; diff --git a/dist/package-shared/api/user/local-user.d.ts b/dist/package-shared/api/user/local-user.d.ts new file mode 100644 index 0000000..ac0c079 --- /dev/null +++ b/dist/package-shared/api/user/local-user.d.ts @@ -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>; + get: (_: GetUserParams) => Promise; + signup: (_: AddUserParams) => Promise; + sendEmailCode: (_: SendEmailCodeParams) => Promise; + update: (_: UpdateUserParams) => Promise; + resetPassword: (_: ResetPasswordParams) => Promise; + googleLogin: (_: GoogleAuthParams) => Promise; + logout: typeof logoutUser; + auth: typeof userAuth; + validateTempEmailCode: typeof validateTempEmailCode; + }; +}; +export default localUser; diff --git a/dist/package-shared/api/user/local-user.js b/dist/package-shared/api/user/local-user.js new file mode 100644 index 0000000..75f7684 --- /dev/null +++ b/dist/package-shared/api/user/local-user.js @@ -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; diff --git a/index.ts b/index.ts index 54afab5..32dea7b 100644 --- a/index.ts +++ b/index.ts @@ -32,6 +32,7 @@ import { ErrorCallback } from "./package-shared/types"; import parseEnv from "./package-shared/utils/parse-env"; import crud from "./package-shared/api/crud"; import user from "./package-shared/api/user"; +import localUser from "./package-shared/api/user/local-user"; import media from "./package-shared/api/media"; import dbHandler from "./package-shared/functions/backend/dbHandler"; @@ -63,7 +64,7 @@ import dbHandler from "./package-shared/functions/backend/dbHandler"; const api = { crud, media, - user: user(), + user, }; /** @@ -92,7 +93,7 @@ const datasquirel = { * Post Action */ post, - user: user({ local: true }), + user: localUser, getSchema, client: datasquirelClient, sql, diff --git a/package-shared/api/user/index.ts b/package-shared/api/user/index.ts index 88a7415..35eb707 100644 --- a/package-shared/api/user/index.ts +++ b/package-shared/api/user/index.ts @@ -9,61 +9,19 @@ 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"; - -type Params = { - local?: boolean; +const user = { + auth: { + login: loginUser, + get: getUser, + signup: addUser, + sendEmailCode: sendEmailCode, + update: updateUser, + resetPassword: resetPassword, + googleLogin: googleAuth, + logout: logoutUser, + auth: userAuth, + validateTempEmailCode, + }, }; -export default function user(params?: Params) { - 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, - }, - }; -} +export default user; diff --git a/package-shared/api/user/local-user.ts b/package-shared/api/user/local-user.ts new file mode 100644 index 0000000..f0c4edd --- /dev/null +++ b/package-shared/api/user/local-user.ts @@ -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; diff --git a/package.json b/package.json index 813a645..935928d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@moduletrace/datasquirel", - "version": "5.0.0", + "version": "5.0.1", "description": "Cloud-based SQL data management tool", "main": "dist/index.js", "bin": {