@lvce-editor/auth-worker 1.1.0 → 1.3.0

package/dist/authWorkerMain.js

@@ -997,10 +997,7 @@ const getLoggedOutBackendAuthState = (authErrorMessage = '') => {
   return {
     authAccessToken: '',
     authErrorMessage,
-    userName: '',
-    userState: 'loggedOut',
-    userSubscriptionPlan: '',
-    userUsedTokens: 0
+    userState: 'loggedOut'
   };
 };
 
@@ -1029,6 +1026,57 @@ const getBackendRefreshUrl = backendUrl => {
   return getBackendAuthUrl(backendUrl, '/auth/refresh');
 };
 
+const delay = async ms => {
+  await new Promise(resolve => setTimeout(resolve, ms));
+};
+
+let nextLoginResponse;
+let nextRefreshResponse;
+const setNextLoginResponse = response => {
+  nextLoginResponse = response;
+};
+const setNextRefreshResponse = response => {
+  nextRefreshResponse = response;
+};
+const clear = () => {
+  nextLoginResponse = undefined;
+  nextRefreshResponse = undefined;
+};
+const hasPendingMockLoginResponse = () => {
+  return !!nextLoginResponse;
+};
+const hasPendingMockRefreshResponse = () => {
+  return !!nextRefreshResponse;
+};
+const consumeNextLoginResponse = async () => {
+  if (!nextLoginResponse) {
+    return undefined;
+  }
+  const response = nextLoginResponse;
+  nextLoginResponse = undefined;
+  if (response.delay > 0) {
+    await delay(response.delay);
+  }
+  if (response.type === 'error') {
+    throw new Error(response.message);
+  }
+  return response.response;
+};
+const consumeNextRefreshResponse = async () => {
+  if (!nextRefreshResponse) {
+    return undefined;
+  }
+  const response = nextRefreshResponse;
+  nextRefreshResponse = undefined;
+  if (response.delay > 0) {
+    await new Promise(resolve => setTimeout(resolve, response.delay));
+  }
+  if (response.type === 'error') {
+    throw new Error(response.message);
+  }
+  return response.response;
+};
+
 const isObject = value => {
   return !!value && typeof value === 'object';
 };
@@ -1068,6 +1116,10 @@ const syncBackendAuth = async backendUrl => {
     return getLoggedOutBackendAuthState('Backend URL is missing.');
   }
   try {
+    if (hasPendingMockRefreshResponse()) {
+      const mockResponse = await consumeNextRefreshResponse();
+      return parseBackendAuthResponse(mockResponse);
+    }
     const response = await fetch(getBackendRefreshUrl(backendUrl), {
       credentials: 'include',
       headers: {
@@ -1102,10 +1154,6 @@ const syncBackendAuth = async backendUrl => {
   }
 };
 
-const delay = async ms => {
-  await new Promise(resolve => setTimeout(resolve, ms));
-};
-
 const waitForBackendLogin = async (backendUrl, timeoutMs = 30_000, pollIntervalMs = 1000) => {
   const deadline = Date.now() + timeoutMs;
   let lastErrorMessage = '';
@@ -1142,38 +1190,18 @@ const isLoginResponse = value => {
   return true;
 };
 
-let nextLoginResponse;
-const clear = () => {
-  nextLoginResponse = undefined;
-};
-const hasPendingMockLoginResponse = () => {
-  return !!nextLoginResponse;
-};
-const consumeNextLoginResponse = async () => {
-  if (!nextLoginResponse) {
-    return undefined;
-  }
-  const response = nextLoginResponse;
-  nextLoginResponse = undefined;
-  if (response.delay > 0) {
-    await delay(response.delay);
-  }
-  if (response.type === 'error') {
-    throw new Error(response.message);
-  }
-  return response.response;
-};
-
-const handleClickLogin = async state => {
-  if (!state.backendUrl) {
+const handleClickLogin = async options => {
+  const {
+    backendUrl,
+    platform
+  } = options;
+  if (!backendUrl) {
     return {
-      ...state,
       authErrorMessage: 'Backend URL is missing.',
       userState: 'loggedOut'
     };
   }
   const signingInState = {
-    ...state,
     authErrorMessage: '',
     userState: 'loggingIn'
   };
@@ -1182,24 +1210,21 @@ const handleClickLogin = async state => {
       const response = await consumeNextLoginResponse();
       if (!isLoginResponse(response)) {
         return {
-          ...signingInState,
           authErrorMessage: 'Backend returned an invalid login response.',
           userState: 'loggedOut'
         };
       }
       if (typeof response.error === 'string' && response.error) {
         return {
-          ...signingInState,
           authErrorMessage: response.error,
           userState: 'loggedOut'
         };
       }
       return getLoggedInState(signingInState, response);
     }
-    await openUrl(getBackendLoginUrl(state.backendUrl), state.platform);
-    const authState = await waitForBackendLogin(state.backendUrl);
+    await openUrl(getBackendLoginUrl(backendUrl), platform);
+    const authState = await waitForBackendLogin(backendUrl);
     return {
-      ...signingInState,
       ...authState
     };
   } catch (error) {
@@ -1225,9 +1250,16 @@ const logout = async state => {
 
 const commandMap = {
   'Auth.clearMocks': clear,
+  'Auth.consumeNextLoginResponse': consumeNextLoginResponse,
+  'Auth.consumeNextRefreshResponse': consumeNextRefreshResponse,
+  'Auth.hasPendingMockLoginResponse': hasPendingMockLoginResponse,
+  'Auth.hasPendingMockRefreshResponse': hasPendingMockRefreshResponse,
   'Auth.initialize': initialize,
   'Auth.login': handleClickLogin,
   'Auth.logout': logout,
+  'Auth.setNextLoginResponse': setNextLoginResponse,
+  'Auth.setNextRefreshResponse': setNextRefreshResponse,
+  'Auth.syncBackendAuth': syncBackendAuth,
   'HandleMessagePort.handleMessagePort': handleMessagePort
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/auth-worker",
-  "version": "1.1.0",
+  "version": "1.3.0",
   "description": "Auth Worker",
   "repository": {
     "type": "git",