prostgles-client 4.0.141 → 4.0.142

package/dist/index.no-sync.js.LICENSE.txt

@@ -0,0 +1,9 @@
+/**
+ * @license React
+ * react.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */

package/lib/Auth.ts

@@ -1,4 +1,4 @@
-import { type AnyObject, type AuthGuardLocation, type AuthGuardLocationResponse, type AuthSocketSchema, CHANNELS, type IdentityProvider, type EmailAuthType } from "prostgles-types";
+import { type AnyObject, type AuthGuardLocation, type AuthGuardLocationResponse, type AuthSocketSchema, CHANNELS, type IdentityProvider, type EmailAuthType, isEmpty } from "prostgles-types";
 import { hasWnd } from "./prostgles";
 
 type Args = {
@@ -7,62 +7,41 @@ type Args = {
   onReload: VoidFunction | undefined;
 }
 
+type WithProviderLogin = Partial<Record<IdentityProvider, VoidFunction>>;
+
+type EmailAuth = 
+| {
+  withPassword?: (params: { username: string; password: string; remember_me?: boolean; totp_token?: string; totp_recovery_code?: string; }) => Promise<any>;
+  withMagicLink?: undefined;
+} 
+| {
+  withPassword?: undefined;
+  withMagicLink?: (params: { username: string; }) => Promise<any>;
+}
+
 type AuthStateLoggedOut = {
   isLoggedin: false;
   user?: undefined;
   prefferedLogin: string;
   login?: {
-    withEmailAndPassword?: (params: { email: string; password: string }) => Promise<any>;
-    withMagicLink?: (params: { email: string; }) => Promise<any>;
-    withProvider?: (provider: IdentityProvider) => void;
-  };
-  register?: {
-    withPassword: (params: { email: string; password: string }) => Promise<any>;
-  } | {
-    magicLink: (params: { email: string; }) => Promise<any>;
-  }
-}
+    withProvider?: WithProviderLogin;
+  } & EmailAuth;
+  register?: EmailAuth
+};
+
 type AuthStateLoggedIn = {
   isLoggedin: true;
   user: AnyObject;
   prefferedLogin: string;
   logout: VoidFunction;
-}
+};
+
 export type AuthHandler = 
 | AuthStateLoggedOut 
 | AuthStateLoggedIn;
 
 export const setupAuth = ({ authData: authConfig, socket, onReload }: Args): AuthHandler => {
-
-  const emit = (channel: string, params: any) => {
-    return new Promise((resolve, reject) => {
-      socket.emit(channel, params, (err, res) => {
-        if (err) reject(err);
-        else resolve(res);
-      });
-    });
-  }
-
-  if(!authConfig?.user){
-    return {
-      isLoggedin: false,
-      user: undefined,
-      prefferedLogin: "",
-      login: {
-        withEmailAndPassword: (params) => emit(CHANNELS.LOGIN, { type: "withPassword" satisfies EmailAuthType, params }),
-        withMagicLink: (params) => emit(CHANNELS.LOGIN, { type: "magicLink" satisfies EmailAuthType, params }),
-        withProvider: (provider) => {
-          const url = authConfig?.providers?.[provider]?.url;
-          if(!url) throw new Error(`Provider ${provider} not enabled`);
-          window.location.assign(url);
-        }
-      },
-      register: authConfig?.register? {
-        [authConfig.register]: (params) => emit(CHANNELS.REGISTER, { type: authConfig.register, params })
-      } as any : undefined
-    } satisfies AuthStateLoggedOut;
-  } 
-  if (authConfig.pathGuard && hasWnd) {
+  if (authConfig?.pathGuard && hasWnd) {
     const doReload = (res?: AuthGuardLocationResponse) => {
       if (res?.shouldReload) {
         if (onReload) onReload();
@@ -80,11 +59,60 @@ export const setupAuth = ({ authData: authConfig, socket, onReload }: Args): Aut
       doReload(res);
     });
   }
+
+  if(!authConfig?.user){
+    const { login, providers, register } = authConfig ?? {};
+    const withProvider: WithProviderLogin | undefined = isEmpty(providers)? undefined : providers && Object.entries(providers).reduce((acc, [provider, { url }]) => {
+      acc[provider as IdentityProvider] = () => {
+        window.location.assign(url);
+      }
+      return acc;
+    }, {});
+
+    return {
+      isLoggedin: false,
+      user: undefined,
+      prefferedLogin: "",
+      login: (login || providers) && {
+        withProvider,
+        ...(login && {
+          [login.type]: async (params) => {
+            return POST(login.url, params);
+          },
+        }),
+      },
+      register: register?.type? {
+        [register.type]: (params) => {
+          POST(register.url, params);
+        }
+      } : undefined
+    } satisfies AuthStateLoggedOut;
+  }
  
   return {
     isLoggedin: true,
     user: authConfig.user,
-    logout: () => emit(CHANNELS.LOGOUT, {}),
+    logout: () => {
+
+    },
     prefferedLogin: "",
   } satisfies AuthStateLoggedIn;
+}
+
+export const POST = async (path: string, data: object) => {
+  const rawResponse = await fetch(path, {
+    method: "POST",
+    headers: {
+      "Accept": "application/json",
+      "Content-Type": "application/json"
+    },
+    body: JSON.stringify(data)
+  });
+
+  if(!rawResponse.ok){
+    const error = await rawResponse.json().catch(() => rawResponse.text()).catch(() => rawResponse.statusText);
+    throw new Error(error);
+  }
+  
+  return rawResponse;   
 }

package/lib/SyncedTable/SyncedTable.ts

@@ -1072,7 +1072,7 @@ export function quickClone<T>(obj: T): T {
   const s: Sync<{ a: number, b: string; }> = 1 as any;
   const sh = s({ a: 1 }, {  } as any, (d) => { d });
   
-  const syncTyped: Sync<{ col1: string; }, ()=>any> = 1 as any;
+  const syncTyped: Sync<{ col1: string; }, ()=> any> = 1 as any;
   
   // const sUntyped: Sync<AnyObject, any> = syncTyped;
 })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prostgles-client",
-  "version": "4.0.141",
+  "version": "4.0.142",
   "description": "Reactive client for Postgres",
   "main": "dist/prostgles-full.js",
   "types": "dist/prostgles-full.d.ts",
@@ -30,7 +30,7 @@
   "dependencies": {
     "i": "^0.3.7",
     "npm": "^10.9.1",
-    "prostgles-types": "^4.0.94"
+    "prostgles-types": "^4.0.99"
   },
   "devDependencies": {
     "@types/node": "^14.14.14",

package/tests/package-lock.json

@@ -17,12 +17,12 @@
     },
     "..": {
       "name": "prostgles-client",
-      "version": "4.0.139",
+      "version": "4.0.141",
       "license": "MIT",
       "dependencies": {
         "i": "^0.3.7",
         "npm": "^10.9.1",
-        "prostgles-types": "^4.0.92"
+        "prostgles-types": "^4.0.99"
       },
       "devDependencies": {
         "@types/node": "^14.14.14",