prostgles-client 4.0.422 → 4.0.425

package/dist/getAuthHandler.d.ts

@@ -1,6 +1,9 @@
-import type { AuthRequest, AuthResponse, AuthSocketSchema, IdentityProvider, LocalLoginMode, UserLike } from "prostgles-types";
+import type { AuthRequest, AuthSocketSchema, IdentityProvider, LocalLoginMode, UserLike } from "prostgles-types";
 import { type InitOptions } from "./prostgles";
 import type { Socket } from "socket.io-client";
+import type { ClientAuthResponse } from "./auth/authRequest";
+import { type ClientAuthCalls } from "./auth/getAuthCalls";
+export { authRequest } from "./auth/authRequest";
 type OptionalToUndefined<T> = {
     [K in {} & keyof T]: T[K];
 };
@@ -11,22 +14,17 @@ type Args = Pick<OptionalToUndefined<InitOptions>, "credentials" | "redirect"> &
     endpoint: string | undefined;
 };
 type WithProviderLogin = Partial<Record<IdentityProvider, VoidFunction>>;
-type ClientAuthSuccess<T> = T & {
-    /**
-     * This is a client-only property that is obtained from server redirect response
-     */
-    redirect_url?: string;
-};
-export type PasswordLoginResponse = ClientAuthSuccess<AuthResponse.PasswordLoginFailure | AuthResponse.PasswordLoginSuccess | AuthResponse.MagicLinkAuthSuccess | AuthResponse.MagicLinkAuthFailure | AuthResponse.OAuthRegisterSuccess | AuthResponse.OAuthRegisterFailure>;
-export type PasswordRegisterResponse = ClientAuthSuccess<AuthResponse.PasswordRegisterSuccess | AuthResponse.PasswordRegisterFailure>;
-export type PasswordRegister = (params: AuthRequest.RegisterData) => Promise<PasswordRegisterResponse>;
-export type PasswordLogin = (params: AuthRequest.LoginData) => Promise<PasswordLoginResponse>;
+export type PasswordLoginResponse = ClientAuthResponse<"login">;
+export type PasswordRegisterResponse = ClientAuthResponse<"register">;
+export type PasswordRegister = ClientAuthCalls["register"];
+export type PasswordLogin = ClientAuthCalls["login"];
+export type ConfirmEmail = (data: AuthRequest.ConfirmEmailData) => Promise<ClientAuthResponse<"magicLinkOrOTP">>;
 type LoginSignupOptions = Pick<AuthSocketSchema, "providers" | "preferredLogin"> & {
     loginWithProvider: undefined | WithProviderLogin;
     login: undefined | PasswordLogin;
     loginType: LocalLoginMode | undefined;
     signupWithEmailAndPassword: undefined | PasswordRegister;
-    confirmEmail: undefined | ((data: AuthRequest.ConfirmEmailData) => Promise<PasswordRegisterResponse>);
+    confirmEmail: undefined | ConfirmEmail;
 };
 type AuthStateLoggedOut = LoginSignupOptions & {
     isLoggedin: false;
@@ -35,10 +33,8 @@ type AuthStateLoggedOut = LoginSignupOptions & {
 type AuthStateLoggedIn<U extends UserLike = UserLike> = LoginSignupOptions & {
     isLoggedin: true;
     user: U;
-    logout: () => Promise<any>;
+    logout: () => Promise<ClientAuthResponse<"logout">>;
 };
 export type AuthHandler<U extends UserLike = UserLike> = AuthStateLoggedOut | AuthStateLoggedIn<U>;
 export declare const getAuthHandler: ({ authData: authConfig, socket, onReload, endpoint, ...authOpts }: Args) => AuthHandler;
-export declare const authRequest: <T extends PasswordRegisterResponse | PasswordLoginResponse>(path: string, data: object, method: "GET" | "POST", { credentials, redirect }: Pick<Partial<Request>, "credentials" | "redirect">) => Promise<T>;
-export {};
 //# sourceMappingURL=getAuthHandler.d.ts.map

package/dist/getAuthHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getAuthHandler.d.ts","sourceRoot":"","sources":["../lib/getAuthHandler.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"getAuthHandler.d.ts","sourceRoot":"","sources":["../lib/getAuthHandler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAGV,WAAW,EACX,gBAAgB,EAChB,gBAAgB,EAChB,cAAc,EACd,QAAQ,EACT,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAgB,KAAK,WAAW,EAAE,MAAM,aAAa,CAAC;AAC7D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAC7D,OAAO,EAAgB,KAAK,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACzE,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,KAAK,mBAAmB,CAAC,CAAC,IAAI;KAAG,CAAC,IAAI,EAAE,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAAE,CAAC;AAE5D,KAAK,IAAI,GAAG,IAAI,CAAC,mBAAmB,CAAC,WAAW,CAAC,EAAE,aAAa,GAAG,UAAU,CAAC,GAAG;IAC/E,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,gBAAgB,GAAG,SAAS,CAAC;IACvC,QAAQ,EAAE,YAAY,GAAG,SAAS,CAAC;IACnC,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;CAC9B,CAAC;AAEF,KAAK,iBAAiB,GAAG,OAAO,CAAC,MAAM,CAAC,gBAAgB,EAAE,YAAY,CAAC,CAAC,CAAC;AAEzE,MAAM,MAAM,qBAAqB,GAAG,kBAAkB,CAAC,OAAO,CAAC,CAAC;AAChE,MAAM,MAAM,wBAAwB,GAAG,kBAAkB,CAAC,UAAU,CAAC,CAAC;AACtE,MAAM,MAAM,gBAAgB,GAAG,eAAe,CAAC,UAAU,CAAC,CAAC;AAC3D,MAAM,MAAM,aAAa,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC;AACrD,MAAM,MAAM,YAAY,GAAG,CACzB,IAAI,EAAE,WAAW,CAAC,gBAAgB,KAC/B,OAAO,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,CAAC,CAAC;AAEnD,KAAK,kBAAkB,GAAG,IAAI,CAAC,gBAAgB,EAAE,WAAW,GAAG,gBAAgB,CAAC,GAAG;IACjF,iBAAiB,EAAE,SAAS,GAAG,iBAAiB,CAAC;IACjD,KAAK,EAAE,SAAS,GAAG,aAAa,CAAC;IACjC,SAAS,EAAE,cAAc,GAAG,SAAS,CAAC;IACtC,0BAA0B,EAAE,SAAS,GAAG,gBAAgB,CAAC;IACzD,YAAY,EAAE,SAAS,GAAG,YAAY,CAAC;CACxC,CAAC;AAEF,KAAK,kBAAkB,GAAG,kBAAkB,GAAG;IAC7C,UAAU,EAAE,KAAK,CAAC;IAClB,IAAI,CAAC,EAAE,SAAS,CAAC;CAClB,CAAC;AAEF,KAAK,iBAAiB,CAAC,CAAC,SAAS,QAAQ,GAAG,QAAQ,IAAI,kBAAkB,GAAG;IAC3E,UAAU,EAAE,IAAI,CAAC;IACjB,IAAI,EAAE,CAAC,CAAC;IACR,MAAM,EAAE,MAAM,OAAO,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC,CAAC;CACrD,CAAC;AAEF,MAAM,MAAM,WAAW,CAAC,CAAC,SAAS,QAAQ,GAAG,QAAQ,IAAI,kBAAkB,GAAG,iBAAiB,CAAC,CAAC,CAAC,CAAC;AAEnG,eAAO,MAAM,cAAc,GAAI,mEAM5B,IAAI,KAAG,WAsFT,CAAC"}

package/dist/getAuthHandler.js

@@ -1,8 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.authRequest = exports.getAuthHandler = void 0;
+exports.getAuthHandler = exports.authRequest = void 0;
 const prostgles_types_1 = require("prostgles-types");
 const prostgles_1 = require("./prostgles");
+const getAuthCalls_1 = require("./auth/getAuthCalls");
+var authRequest_1 = require("./auth/authRequest");
+Object.defineProperty(exports, "authRequest", { enumerable: true, get: function () { return authRequest_1.authRequest; } });
 const getAuthHandler = ({ authData: authConfig, socket, onReload, endpoint, ...authOpts }) => {
     const urlWithEndpointAndSearch = (route) => {
         const search = typeof window !== "undefined" ? window.location.search : "";
@@ -11,6 +14,12 @@ const getAuthHandler = ({ authData: authConfig, socket, onReload, endpoint, ...a
             url = `${endpoint}${url}`;
         return url;
     };
+    const authCalls = (0, getAuthCalls_1.getAuthCalls)({
+        login: authConfig?.login?.loginRoute,
+        register: authConfig?.signupWithEmailAndPassword?.url,
+        magicLinkOrOTP: authConfig?.signupWithEmailAndPassword?.emailConfirmationRoute,
+        logout: authConfig?.login?.logoutRoute,
+    }, urlWithEndpointAndSearch, authOpts);
     if (authConfig?.pathGuard && prostgles_1.isClientSide) {
         const doReload = (res) => {
             if (res?.shouldReload) {
@@ -51,21 +60,10 @@ const getAuthHandler = ({ authData: authConfig, socket, onReload, endpoint, ...a
                     };
                     return acc;
                 }, {}));
-        loginSignupOptions.login =
-            login &&
-                (async (params) => {
-                    return (0, exports.authRequest)(urlWithEndpointAndSearch(login.loginRoute), params, "POST", authOpts);
-                });
+        loginSignupOptions.login = login && authCalls.login;
         loginSignupOptions.signupWithEmailAndPassword =
-            signupWithEmailAndPassword &&
-                ((params) => {
-                    return (0, exports.authRequest)(urlWithEndpointAndSearch(signupWithEmailAndPassword.url), params, "POST", authOpts);
-                });
-        loginSignupOptions.confirmEmail =
-            signupWithEmailAndPassword &&
-                ((data) => {
-                    return (0, exports.authRequest)(urlWithEndpointAndSearch(signupWithEmailAndPassword.emailConfirmationRoute), data, "POST", authOpts);
-                });
+            signupWithEmailAndPassword && authCalls.register;
+        loginSignupOptions.confirmEmail = signupWithEmailAndPassword && authCalls.magicLinkOrOTP;
     }
     if (!authConfig?.user) {
         return {
@@ -77,44 +75,8 @@ const getAuthHandler = ({ authData: authConfig, socket, onReload, endpoint, ...a
     return {
         isLoggedin: true,
         user: authConfig.user,
-        logout: async () => {
-            const { logoutRoute } = authConfig.login ?? {};
-            if (!logoutRoute)
-                throw new Error("Unexpected");
-            return (0, exports.authRequest)(urlWithEndpointAndSearch(logoutRoute), {}, "POST", authOpts);
-        },
+        logout: () => authCalls.logout({}),
         ...loginSignupOptions,
     };
 };
 exports.getAuthHandler = getAuthHandler;
-const authRequest = async (path, data, method, { credentials, redirect }) => {
-    const rawResponse = await fetch(path, {
-        method: method,
-        headers: {
-            Accept: "application/json",
-            "Content-Type": "application/json",
-        },
-        ...(method !== "GET" && { body: JSON.stringify(data) }),
-        credentials,
-        redirect,
-    });
-    if (!rawResponse.ok) {
-        const error = await rawResponse
-            .json()
-            .catch(() => rawResponse.text())
-            .catch(() => rawResponse.statusText);
-        if (typeof error === "string") {
-            return { success: false, code: "something-went-wrong", message: error };
-        }
-        return error;
-    }
-    const responseObject = await rawResponse
-        .json()
-        .catch(async () => ({ message: await rawResponse.text() }))
-        .catch(() => ({ message: rawResponse.statusText }));
-    if (rawResponse.redirected) {
-        return { ...responseObject, success: true, redirect_url: rawResponse.url };
-    }
-    return responseObject;
-};
-exports.authRequest = authRequest;