dexie-cloud-addon 4.0.1-beta.55 → 4.0.1-beta.57

package/dist/modern/DexieCloudAPI.d.ts

@@ -11,6 +11,13 @@ import { Invite } from './Invite';
 import { BehaviorSubject, Observable } from 'rxjs';
 /** The API of db.cloud, where `db` is an instance of Dexie with dexie-cloud-addon active.
  */
+export interface LoginHints {
+    email?: string;
+    userId?: string;
+    grant_type?: 'demo' | 'otp';
+    otpId?: string;
+    otp?: string;
+}
 export interface DexieCloudAPI {
     version: string;
     options: DexieCloudOptions | null;
@@ -36,11 +43,7 @@ export interface DexieCloudAPI {
      * @param userId Optional userId to authenticate
      * @param grant_type requested grant type
      */
-    login(hint?: {
-        email?: string;
-        userId?: string;
-        grant_type?: 'demo' | 'otp';
-    }): Promise<void>;
+    login(hint?: LoginHints): Promise<void>;
     logout(options?: {
         force?: boolean;
     }): Promise<void>;

package/dist/modern/authentication/authenticate.d.ts

@@ -3,18 +3,11 @@ import { BehaviorSubject } from 'rxjs';
 import { DexieCloudDB } from '../db/DexieCloudDB';
 import { UserLogin } from '../db/entities/UserLogin';
 import { DXCUserInteraction } from '../types/DXCUserInteraction';
+import { LoginHints } from '../DexieCloudAPI';
 export type FetchTokenCallback = (tokenParams: {
     public_key: string;
-    hints?: {
-        userId?: string;
-        email?: string;
-        grant_type?: string;
-    };
+    hints?: LoginHints;
 }) => Promise<TokenFinalResponse | TokenErrorResponse>;
 export declare function loadAccessToken(db: DexieCloudDB): Promise<UserLogin | null>;
-export declare function authenticate(url: string, context: UserLogin, fetchToken: FetchTokenCallback, userInteraction: BehaviorSubject<DXCUserInteraction | undefined>, hints?: {
-    userId?: string;
-    email?: string;
-    grant_type?: string;
-}): Promise<UserLogin>;
+export declare function authenticate(url: string, context: UserLogin, fetchToken: FetchTokenCallback, userInteraction: BehaviorSubject<DXCUserInteraction | undefined>, hints?: LoginHints): Promise<UserLogin>;
 export declare function refreshAccessToken(url: string, login: UserLogin): Promise<UserLogin>;

package/dist/modern/authentication/login.d.ts

@@ -1,6 +1,3 @@
 import { DexieCloudDB } from '../db/DexieCloudDB';
-export declare function login(db: DexieCloudDB, hints?: {
-    email?: string;
-    userId?: string;
-    grant_type?: string;
-}): Promise<boolean>;
+import { LoginHints } from '../DexieCloudAPI';
+export declare function login(db: DexieCloudDB, hints?: LoginHints): Promise<boolean>;

package/dist/modern/dexie-cloud-addon.js

@@ -8,7 +8,7 @@
  *
  * ==========================================================================
  *
- * Version 4.0.1-beta.55, Tue Jan 02 2024
+ * Version 4.0.1-beta.57, Wed Feb 14 2024
  *
  * https://dexie.org
  *
@@ -2449,6 +2449,19 @@ function otpFetchTokenCallback(db) {
                     demo_user,
                     grant_type: 'demo',
                     scopes: ['ACCESS_DB'],
+                    public_key
+                };
+            }
+            else if ((hints === null || hints === void 0 ? void 0 : hints.otpId) && hints.otp) {
+                // User provided OTP ID and OTP code. This means that the OTP email
+                // has already gone out and the user may have clicked a magic link
+                // in the email with otp and otpId in query and the app has picked
+                // up those values and passed them to db.cloud.login().
+                tokenRequest = {
+                    grant_type: 'otp',
+                    otp_id: hints.otpId,
+                    otp: hints.otp,
+                    scopes: ['ACCESS_DB'],
                     public_key,
                 };
             }
@@ -2458,7 +2471,6 @@ function otpFetchTokenCallback(db) {
                     email,
                     grant_type: 'otp',
                     scopes: ['ACCESS_DB'],
-                    public_key,
                 };
             }
             const res1 = yield fetch(`${url}/token`, {
@@ -2482,28 +2494,27 @@ function otpFetchTokenCallback(db) {
                 // Error can also be returned right away.
                 return response;
             }
-            else if (tokenRequest.grant_type === 'otp') {
+            else if (tokenRequest.grant_type === 'otp' && 'email' in tokenRequest) {
                 if (response.type !== 'otp-sent')
                     throw new Error(`Unexpected response from ${url}/token`);
                 const otp = yield promptForOTP(userInteraction, tokenRequest.email);
-                tokenRequest.otp = otp || '';
-                tokenRequest.otp_id = response.otp_id;
+                const tokenRequest2 = Object.assign(Object.assign({}, tokenRequest), { otp: otp || '', otp_id: response.otp_id, public_key });
                 let res2 = yield fetch(`${url}/token`, {
-                    body: JSON.stringify(tokenRequest),
+                    body: JSON.stringify(tokenRequest2),
                     method: 'post',
                     headers: { 'Content-Type': 'application/json' },
                     mode: 'cors',
                 });
                 while (res2.status === 401) {
                     const errorText = yield res2.text();
-                    tokenRequest.otp = yield promptForOTP(userInteraction, tokenRequest.email, {
+                    tokenRequest2.otp = yield promptForOTP(userInteraction, tokenRequest.email, {
                         type: 'error',
                         messageCode: 'INVALID_OTP',
                         message: errorText,
                         messageParams: {}
                     });
                     res2 = yield fetch(`${url}/token`, {
-                        body: JSON.stringify(tokenRequest),
+                        body: JSON.stringify(tokenRequest2),
                         method: 'post',
                         headers: { 'Content-Type': 'application/json' },
                         mode: 'cors',
@@ -3608,7 +3619,7 @@ function syncWithServer(changes, syncState, baseRevs, db, databaseUrl, schema, c
         const res = yield fetch(`${databaseUrl}/sync`, {
             method: 'post',
             headers,
-            credentials: 'include',
+            credentials: 'include', // For Arr Affinity cookie only, for better Rate-Limit counting only.
             body: TSON.stringify(syncRequest),
         });
         //const contentLength = Number(res.headers.get('content-length'));
@@ -5572,7 +5583,7 @@ function LocalSyncWorker(db, cloudOptions, cloudSchema) {
             retryPurpose = null;
             syncIfPossible(db, cloudOptions, cloudSchema, {
                 cancelToken,
-                retryImmediatelyOnFetchError: true,
+                retryImmediatelyOnFetchError: true, // workaround for "net::ERR_NETWORK_CHANGED" in chrome.
                 purpose: combPurpose,
             }).catch((e) => {
                 console.error('error in syncIfPossible()', e);
@@ -6253,7 +6264,7 @@ function dexieCloud(dexie) {
     const syncComplete = new Subject();
     dexie.cloud = {
         // @ts-ignore
-        version: "4.0.1-beta.55",
+        version: "4.0.1-beta.57",
         options: Object.assign({}, DEFAULT_OPTIONS),
         schema: null,
         get currentUserId() {
@@ -6530,7 +6541,7 @@ function dexieCloud(dexie) {
     }
 }
 // @ts-ignore
-dexieCloud.version = "4.0.1-beta.55";
+dexieCloud.version = "4.0.1-beta.57";
 Dexie.Cloud = dexieCloud;
 
 export { dexieCloud as default, dexieCloud, getTiedObjectId, getTiedRealmId, resolveText };