@lvce-editor/auth-worker 3.16.0 → 3.16.2

package/dist/authWorkerMain.js

@@ -2331,6 +2331,7 @@ const clientIdKey = 'oidcClientId';
 const pendingClientIdKey = 'pendingOidcClientId';
 const pendingCodeVerifierKey = 'pendingOidcCodeVerifier';
 const pendingRedirectUriKey = 'pendingOidcRedirectUri';
+const pendingReturnUrlKey = 'pendingOidcReturnUrl';
 const pendingStateKey = 'pendingOidcState';
 const clearOidcCallbackUrl = async () => {
   await clearPersistentAuthValue(callbackUrlKey);
@@ -2339,7 +2340,7 @@ const clearStoredOidcClientId = async () => {
   await clearPersistentAuthValue(clientIdKey);
 };
 const clearPendingOidcAuthState = async () => {
-  await Promise.all([clearPersistentAuthValue(pendingClientIdKey), clearPersistentAuthValue(pendingCodeVerifierKey), clearPersistentAuthValue(pendingRedirectUriKey), clearPersistentAuthValue(pendingStateKey)]);
+  await Promise.all([clearPersistentAuthValue(pendingClientIdKey), clearPersistentAuthValue(pendingCodeVerifierKey), clearPersistentAuthValue(pendingRedirectUriKey), clearPersistentAuthValue(pendingReturnUrlKey), clearPersistentAuthValue(pendingStateKey)]);
 };
 const getOidcCallbackUrl = async () => {
   return getPersistentAuthValue(callbackUrlKey);
@@ -2348,7 +2349,7 @@ const getStoredOidcClientId = async () => {
   return getPersistentAuthValue(clientIdKey);
 };
 const loadPendingOidcAuthState = async () => {
-  const [clientId, codeVerifier, redirectUri, state] = await Promise.all([getPersistentAuthValue(pendingClientIdKey), getPersistentAuthValue(pendingCodeVerifierKey), getPersistentAuthValue(pendingRedirectUriKey), getPersistentAuthValue(pendingStateKey)]);
+  const [clientId, codeVerifier, redirectUri, returnUrl, state] = await Promise.all([getPersistentAuthValue(pendingClientIdKey), getPersistentAuthValue(pendingCodeVerifierKey), getPersistentAuthValue(pendingRedirectUriKey), getPersistentAuthValue(pendingReturnUrlKey), getPersistentAuthValue(pendingStateKey)]);
   if (!clientId || !codeVerifier || !redirectUri || !state) {
     return undefined;
   }
@@ -2356,6 +2357,7 @@ const loadPendingOidcAuthState = async () => {
     clientId,
     codeVerifier,
     redirectUri,
+    returnUrl,
     state
   };
 };
@@ -2363,7 +2365,7 @@ const saveOidcClientId = async clientId => {
   await setPersistentAuthValue(clientIdKey, clientId);
 };
 const savePendingOidcAuthState = async value => {
-  await Promise.all([setPersistentAuthValue(pendingClientIdKey, value.clientId), setPersistentAuthValue(pendingCodeVerifierKey, value.codeVerifier), setPersistentAuthValue(pendingRedirectUriKey, value.redirectUri), setPersistentAuthValue(pendingStateKey, value.state)]);
+  await Promise.all([setPersistentAuthValue(pendingClientIdKey, value.clientId), setPersistentAuthValue(pendingCodeVerifierKey, value.codeVerifier), setPersistentAuthValue(pendingRedirectUriKey, value.redirectUri), setPersistentAuthValue(pendingReturnUrlKey, value.returnUrl), setPersistentAuthValue(pendingStateKey, value.state)]);
 };
 
 const normalizeRedirectUri = value => {
@@ -2447,6 +2449,9 @@ const getAccountProfile = async (backendUrl, accessToken, fetchFn = fetch) => {
     throw new Error('The backend did not return an account identity.');
   }
   return {
+    ...(typeof value.avatarUrl === 'string' && {
+      avatarUrl: value.avatarUrl
+    }),
     displayName: typeof value.displayName === 'string' ? value.displayName : '',
     email: typeof value.email === 'string' ? value.email : '',
     id: value.id,
@@ -3186,10 +3191,12 @@ const getInteractiveLoginResult = async (backendUrl, platform, signingInState, p
     state
   } = await getBackendLoginRequest(backendUrl, platform, uid);
   if (platform !== Electron) {
+    const returnUrl = await getCurrentHref();
     await savePendingOidcAuthState({
       clientId,
       codeVerifier,
       redirectUri,
+      returnUrl,
       state
     });
   }

package/package.json

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