prostgles-client 4.0.199 → 4.0.201

package/dist/Auth.d.ts

@@ -11,24 +11,16 @@ type ClientAuthSuccess<T> = T & {
      */
     redirect_url?: string;
 };
-export type MagicLinkAuthResponse = ClientAuthSuccess<AuthResponse.MagicLinkAuthFailure | AuthResponse.MagicLinkAuthSuccess>;
-export type PasswordLoginResponse = ClientAuthSuccess<AuthResponse.PasswordLoginFailure | AuthResponse.PasswordLoginSuccess>;
+export type PasswordLoginResponse = ClientAuthSuccess<AuthResponse.PasswordLoginFailure | AuthResponse.PasswordLoginSuccess | AuthResponse.MagicLinkAuthSuccess | AuthResponse.MagicLinkAuthFailure | AuthResponse.OAuthRegisterSuccess | AuthResponse.OAuthRegisterFailure>;
 export type PasswordRegisterResponse = ClientAuthSuccess<AuthResponse.PasswordLoginFailure | AuthResponse.PasswordLoginSuccess>;
 export type PasswordRegister = (params: AuthRequest.RegisterData) => Promise<PasswordRegisterResponse>;
 export type PasswordLogin = (params: AuthRequest.LoginData) => Promise<PasswordLoginResponse>;
-export type MagicLinkAuth = (params: AuthRequest.RegisterData) => Promise<MagicLinkAuthResponse>;
-export type EmailAuth<Type extends "register" | "login"> = {
-    withPassword?: Type extends "register" ? PasswordRegister : PasswordLogin;
-    withMagicLink?: undefined;
-} | {
-    withPassword?: undefined;
-    withMagicLink?: MagicLinkAuth;
-};
 type LoginSignupOptions = {
     prefferedLogin: "email" | IdentityProvider | undefined;
     loginWithProvider: undefined | WithProviderLogin;
-    login: undefined | EmailAuth<"login">;
-    register: undefined | EmailAuth<"register">;
+    loginType: AuthSocketSchema["loginType"];
+    login: undefined | PasswordLogin;
+    signupWithEmailAndPassword: undefined | PasswordRegister;
     providers: AuthSocketSchema["providers"];
 };
 type AuthStateLoggedOut = LoginSignupOptions & {
@@ -42,6 +34,61 @@ type AuthStateLoggedIn = LoginSignupOptions & {
 };
 export type AuthHandler = AuthStateLoggedOut | AuthStateLoggedIn;
 export declare const setupAuth: ({ authData: authConfig, socket, onReload }: Args) => AuthHandler;
-export declare const postAuthData: (path: string, data: object) => Promise<PasswordRegisterResponse | PasswordRegisterResponse | MagicLinkAuthResponse>;
+export declare const authRequest: <T extends (import("prostgles-types").CommonAuthFailure & {
+    /**
+     * This is a client-only property that is obtained from server redirect response
+     */
+    redirect_url?: string | undefined;
+}) | ({
+    success: false;
+    code: "no-match";
+    message?: string | undefined;
+} & {
+    /**
+     * This is a client-only property that is obtained from server redirect response
+     */
+    redirect_url?: string | undefined;
+}) | ({
+    success: false;
+    code: "inactive-account";
+    message?: string | undefined;
+} & {
+    /**
+     * This is a client-only property that is obtained from server redirect response
+     */
+    redirect_url?: string | undefined;
+}) | ({
+    success: false;
+    code: "totp-token-missing" | "invalid-username" | "username-missing" | "password-missing" | "invalid-password" | "is-from-OAuth" | "is-from-magic-link" | "invalid-totp-recovery-code" | "invalid-totp-code" | "email-not-confirmed";
+    message?: string | undefined;
+} & {
+    /**
+     * This is a client-only property that is obtained from server redirect response
+     */
+    redirect_url?: string | undefined;
+}) | (AuthResponse.AuthSuccess & {
+    /**
+     * This is a client-only property that is obtained from server redirect response
+     */
+    redirect_url?: string | undefined;
+}) | ({
+    success: false;
+    code: "expired-magic-link" | "invalid-magic-link" | "used-magic-link";
+    message?: string | undefined;
+} & {
+    /**
+     * This is a client-only property that is obtained from server redirect response
+     */
+    redirect_url?: string | undefined;
+}) | ({
+    success: false;
+    code: "provider-issue";
+    message?: string | undefined;
+} & {
+    /**
+     * This is a client-only property that is obtained from server redirect response
+     */
+    redirect_url?: string | undefined;
+})>(path: string, data: object, method?: "GET") => Promise<T>;
 export {};
 //# sourceMappingURL=Auth.d.ts.map

package/dist/Auth.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Auth.d.ts","sourceRoot":"","sources":["../lib/Auth.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,SAAS,EAGT,gBAAgB,EAChB,gBAAgB,EAChB,YAAY,EACZ,WAAW,EACZ,MAAM,iBAAiB,CAAC;AAIzB,KAAK,IAAI,GAAG;IACV,MAAM,EAAE,GAAG,CAAC;IACZ,QAAQ,EAAE,gBAAgB,GAAG,SAAS,CAAC;IACvC,QAAQ,EAAE,YAAY,GAAG,SAAS,CAAC;CACpC,CAAC;AAEF,KAAK,iBAAiB,GAAG,OAAO,CAAC,MAAM,CAAC,gBAAgB,EAAE,YAAY,CAAC,CAAC,CAAC;AAEzE,KAAK,iBAAiB,CAAC,CAAC,IAAI,CAAC,GAAG;IAC9B;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG,iBAAiB,CACnD,YAAY,CAAC,oBAAoB,GAAG,YAAY,CAAC,oBAAoB,CACtE,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG,iBAAiB,CACnD,YAAY,CAAC,oBAAoB,GAAG,YAAY,CAAC,oBAAoB,CACtE,CAAC;AACF,MAAM,MAAM,wBAAwB,GAAG,iBAAiB,CACtD,YAAY,CAAC,oBAAoB,GAAG,YAAY,CAAC,oBAAoB,CACtE,CAAC;AACF,MAAM,MAAM,gBAAgB,GAAG,CAC7B,MAAM,EAAE,WAAW,CAAC,YAAY,KAC7B,OAAO,CAAC,wBAAwB,CAAC,CAAC;AACvC,MAAM,MAAM,aAAa,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,SAAS,KAAK,OAAO,CAAC,qBAAqB,CAAC,CAAC;AAC9F,MAAM,MAAM,aAAa,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,YAAY,KAAK,OAAO,CAAC,qBAAqB,CAAC,CAAC;AAEjG,MAAM,MAAM,SAAS,CAAC,IAAI,SAAS,UAAU,GAAG,OAAO,IACnD;IACE,YAAY,CAAC,EAAE,IAAI,SAAS,UAAU,GAAG,gBAAgB,GAAG,aAAa,CAAC;IAC1E,aAAa,CAAC,EAAE,SAAS,CAAC;CAC3B,GACD;IACE,YAAY,CAAC,EAAE,SAAS,CAAC;IACzB,aAAa,CAAC,EAAE,aAAa,CAAC;CAC/B,CAAC;AAEN,KAAK,kBAAkB,GAAG;IACxB,cAAc,EAAE,OAAO,GAAG,gBAAgB,GAAG,SAAS,CAAC;IACvD,iBAAiB,EAAE,SAAS,GAAG,iBAAiB,CAAC;IACjD,KAAK,EAAE,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC;IACtC,QAAQ,EAAE,SAAS,GAAG,SAAS,CAAC,UAAU,CAAC,CAAC;IAC5C,SAAS,EAAE,gBAAgB,CAAC,WAAW,CAAC,CAAC;CAC1C,CAAC;AAEF,KAAK,kBAAkB,GAAG,kBAAkB,GAAG;IAC7C,UAAU,EAAE,KAAK,CAAC;IAClB,IAAI,CAAC,EAAE,SAAS,CAAC;CAClB,CAAC;AAEF,KAAK,iBAAiB,GAAG,kBAAkB,GAAG;IAC5C,UAAU,EAAE,IAAI,CAAC;IACjB,IAAI,EAAE,SAAS,CAAC;IAChB,MAAM,EAAE,YAAY,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG,kBAAkB,GAAG,iBAAiB,CAAC;AAEjE,eAAO,MAAM,SAAS,+CAAgD,IAAI,KAAG,WA+E5E,CAAC;AAEF,eAAO,MAAM,YAAY,SACjB,MAAM,QACN,MAAM,KACX,QAAQ,wBAAwB,GAAG,wBAAwB,GAAG,qBAAqB,CA8BrF,CAAC"}
+{"version":3,"file":"Auth.d.ts","sourceRoot":"","sources":["../lib/Auth.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,SAAS,EAGT,gBAAgB,EAChB,gBAAgB,EAChB,YAAY,EACZ,WAAW,EACZ,MAAM,iBAAiB,CAAC;AAIzB,KAAK,IAAI,GAAG;IACV,MAAM,EAAE,GAAG,CAAC;IACZ,QAAQ,EAAE,gBAAgB,GAAG,SAAS,CAAC;IACvC,QAAQ,EAAE,YAAY,GAAG,SAAS,CAAC;CACpC,CAAC;AAEF,KAAK,iBAAiB,GAAG,OAAO,CAAC,MAAM,CAAC,gBAAgB,EAAE,YAAY,CAAC,CAAC,CAAC;AAEzE,KAAK,iBAAiB,CAAC,CAAC,IAAI,CAAC,GAAG;IAC9B;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG,iBAAiB,CACjD,YAAY,CAAC,oBAAoB,GACjC,YAAY,CAAC,oBAAoB,GACjC,YAAY,CAAC,oBAAoB,GACjC,YAAY,CAAC,oBAAoB,GACjC,YAAY,CAAC,oBAAoB,GACjC,YAAY,CAAC,oBAAoB,CACpC,CAAC;AACF,MAAM,MAAM,wBAAwB,GAAG,iBAAiB,CACtD,YAAY,CAAC,oBAAoB,GAAG,YAAY,CAAC,oBAAoB,CACtE,CAAC;AACF,MAAM,MAAM,gBAAgB,GAAG,CAC7B,MAAM,EAAE,WAAW,CAAC,YAAY,KAC7B,OAAO,CAAC,wBAAwB,CAAC,CAAC;AACvC,MAAM,MAAM,aAAa,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,SAAS,KAAK,OAAO,CAAC,qBAAqB,CAAC,CAAC;AAE9F,KAAK,kBAAkB,GAAG;IACxB,cAAc,EAAE,OAAO,GAAG,gBAAgB,GAAG,SAAS,CAAC;IACvD,iBAAiB,EAAE,SAAS,GAAG,iBAAiB,CAAC;IACjD,SAAS,EAAE,gBAAgB,CAAC,WAAW,CAAC,CAAC;IACzC,KAAK,EAAE,SAAS,GAAG,aAAa,CAAC;IACjC,0BAA0B,EAAE,SAAS,GAAG,gBAAgB,CAAC;IACzD,SAAS,EAAE,gBAAgB,CAAC,WAAW,CAAC,CAAC;CAC1C,CAAC;AAEF,KAAK,kBAAkB,GAAG,kBAAkB,GAAG;IAC7C,UAAU,EAAE,KAAK,CAAC;IAClB,IAAI,CAAC,EAAE,SAAS,CAAC;CAClB,CAAC;AAEF,KAAK,iBAAiB,GAAG,kBAAkB,GAAG;IAC5C,UAAU,EAAE,IAAI,CAAC;IACjB,IAAI,EAAE,SAAS,CAAC;IAChB,MAAM,EAAE,YAAY,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG,kBAAkB,GAAG,iBAAiB,CAAC;AAEjE,eAAO,MAAM,SAAS,+CAAgD,IAAI,KAAG,WAmF5E,CAAC;AAEF,eAAO,MAAM,WAAW;IAjItB;;OAEG;;;;;;;IAFH;;OAEG;;;;;;;IAFH;;OAEG;;;;;;;IAFH;;OAEG;;;IAFH;;OAEG;;;;;;;IAFH;;OAEG;;;;;;;IAFH;;OAEG;;UAgIG,MAAM,QACN,MAAM,WACH,KAAK,eAgCf,CAAC"}

package/dist/Auth.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.postAuthData = exports.setupAuth = void 0;
+exports.authRequest = exports.setupAuth = void 0;
 const prostgles_types_1 = require("prostgles-types");
 const prostgles_1 = require("./prostgles");
 const setupAuth = ({ authData: authConfig, socket, onReload }) => {
@@ -10,11 +10,14 @@ const setupAuth = ({ authData: authConfig, socket, onReload }) => {
                 if (onReload)
                     onReload();
                 else if (prostgles_1.hasWnd) {
-                    window.location.reload();
+                    console.log("prostgles page reload due to authguard", res);
+                    setTimeout(() => {
+                        window.location.reload();
+                    }, 200);
                 }
             }
         };
-        socket.emit(prostgles_types_1.CHANNELS.AUTHGUARD, JSON.stringify(window.location), (err, res) => {
+        socket.emit(prostgles_types_1.CHANNELS.AUTHGUARD, JSON.stringify(window.location), (_err, res) => {
             doReload(res);
         });
         socket.removeAllListeners(prostgles_types_1.CHANNELS.AUTHGUARD);
@@ -23,14 +26,15 @@ const setupAuth = ({ authData: authConfig, socket, onReload }) => {
         });
     }
     const loginSignupOptions = {
+        loginType: authConfig === null || authConfig === void 0 ? void 0 : authConfig.loginType,
         login: undefined,
         prefferedLogin: undefined,
         loginWithProvider: undefined,
-        register: undefined,
+        signupWithEmailAndPassword: undefined,
         providers: authConfig === null || authConfig === void 0 ? void 0 : authConfig.providers,
     };
     if (authConfig) {
-        const { providers, register, loginType } = authConfig;
+        const { providers, signupWithEmailAndPassword, loginType } = authConfig;
         loginSignupOptions.loginWithProvider =
             (0, prostgles_types_1.isEmpty)(providers) ? undefined : (providers &&
                 Object.entries(providers).reduce((acc, [provider, { url }]) => {
@@ -43,16 +47,16 @@ const setupAuth = ({ authData: authConfig, socket, onReload }) => {
             const { search } = window.location;
             return url + search;
         };
-        loginSignupOptions.login = loginType && {
-            [loginType]: async (params) => {
-                return (0, exports.postAuthData)(addSearchInCaseItHasReturnUrl("/login"), params);
-            },
-        };
-        loginSignupOptions.register = (register === null || register === void 0 ? void 0 : register.type) && {
-            [register.type]: (params) => {
-                return (0, exports.postAuthData)(addSearchInCaseItHasReturnUrl(register.url), params);
-            },
-        };
+        loginSignupOptions.login =
+            loginType &&
+                (async (params) => {
+                    return (0, exports.authRequest)(addSearchInCaseItHasReturnUrl("/login"), params);
+                });
+        loginSignupOptions.signupWithEmailAndPassword =
+            signupWithEmailAndPassword &&
+                ((params) => {
+                    return (0, exports.authRequest)(addSearchInCaseItHasReturnUrl(signupWithEmailAndPassword.url), params);
+                });
     }
     if (!(authConfig === null || authConfig === void 0 ? void 0 : authConfig.user)) {
         return {
@@ -71,9 +75,9 @@ const setupAuth = ({ authData: authConfig, socket, onReload }) => {
     };
 };
 exports.setupAuth = setupAuth;
-const postAuthData = async (path, data) => {
+const authRequest = async (path, data, method) => {
     const rawResponse = await fetch(path, {
-        method: "POST",
+        method: method !== null && method !== void 0 ? method : "POST",
         headers: {
             Accept: "application/json",
             "Content-Type": "application/json",
@@ -99,4 +103,4 @@ const postAuthData = async (path, data) => {
     }
     return responseObject;
 };
-exports.postAuthData = postAuthData;
+exports.authRequest = authRequest;