@lvce-editor/auth-worker 1.16.0 → 1.17.0

package/dist/authWorkerMain.js

@@ -1184,14 +1184,21 @@ const getString = (value, fallback = '') => {
   return typeof value === 'string' ? value : fallback;
 };
 
+const getUserName = value => {
+  if (typeof value.userName === 'string') {
+    return value.userName;
+  }
+  return getString(value.user?.displayName);
+};
 const toBackendAuthState = value => {
   return {
     authAccessToken: getString(value.accessToken),
     authErrorMessage: getString(value.error),
     authRefreshToken: getString(value.refreshToken),
-    userName: getString(value.userName),
+    userName: getUserName(value),
     userState: value.accessToken ? 'loggedIn' : 'loggedOut',
     userSubscriptionPlan: getString(value.subscriptionPlan),
+    userSubscriptionStatus: getString(value.subscriptionStatus),
     userUsedTokens: getNumber(value.usedTokens)
   };
 };
@@ -1203,6 +1210,13 @@ const parseBackendAuthResponse = value => {
   return toBackendAuthState(value);
 };
 
+const getPayload = async response => {
+  try {
+    return await response.json();
+  } catch {
+    return undefined;
+  }
+};
 const syncBackendAuth = async backendUrl => {
   if (!backendUrl) {
     return getLoggedOutBackendAuthState('Backend URL is missing.');
@@ -1222,12 +1236,7 @@ const syncBackendAuth = async backendUrl => {
     if (response.status === 401 || response.status === 403) {
       return getLoggedOutBackendAuthState();
     }
-    let payload = undefined;
-    try {
-      payload = await response.json();
-    } catch {
-      payload = undefined;
-    }
+    const payload = await getPayload(response);
     if (!response.ok) {
       const parsed = parseBackendAuthResponse(payload);
       return getLoggedOutBackendAuthState(parsed.authErrorMessage || 'Backend authentication failed.');
@@ -2380,15 +2389,13 @@ const getLoggedInState = (state, response) => {
     userName: typeof response.userName === 'string' ? response.userName : state.userName,
     userState: accessToken ? 'loggedIn' : 'loggedOut',
     userSubscriptionPlan: typeof response.subscriptionPlan === 'string' ? response.subscriptionPlan : state.userSubscriptionPlan,
+    userSubscriptionStatus: typeof response.subscriptionStatus === 'string' ? response.subscriptionStatus : state.userSubscriptionStatus,
     userUsedTokens: typeof response.usedTokens === 'number' ? response.usedTokens : state.userUsedTokens
   };
 };
 
 const isLoginResponse = value => {
-  if (!value || typeof value !== 'object') {
-    return false;
-  }
-  return true;
+  return !!value && typeof value === 'object';
 };
 
 const databaseName = 'auth-worker';
@@ -2445,6 +2452,15 @@ const setPersistentAuthValue = async (key, value) => {
   await transactionToPromise(transaction);
 };
 
+const persistLoginResult = async loginResult => {
+  if (loginResult.userState !== 'loggedIn') {
+    return loginResult;
+  }
+  await setPersistentAuthValue('accessToken', loginResult.authAccessToken ?? '');
+  await setPersistentAuthValue('refreshToken', loginResult.authRefreshToken ?? '');
+  return loginResult;
+};
+
 const getBackendOidcTokenUrl = backendUrl => {
   return getBackendAuthUrl(backendUrl, '/oidc/token');
 };
@@ -2500,14 +2516,6 @@ const waitForElectronBackendLogin = async (backendUrl, uid, redirectUri, codeVer
   return getLoggedOutBackendAuthState('Timed out waiting for backend login.');
 };
 
-const persistLoginResult = async loginResult => {
-  if (loginResult.userState !== 'loggedIn') {
-    return loginResult;
-  }
-  await setPersistentAuthValue('accessToken', loginResult.authAccessToken ?? '');
-  await setPersistentAuthValue('refreshToken', loginResult.authRefreshToken ?? '');
-  return loginResult;
-};
 const handleClickLogin = async options => {
   const {
     authUseRedirect,

package/package.json

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