Automatically use user token when sharing token is not sufficient for a request

CHANGELOG.unreleased.md

@@ -27,6 +27,7 @@ For upgrade instructions, please check the [migration guide](MIGRATIONS.released
 
 ### Fixed
 - Fixed a bug during dataset upload in case the configured `datastore.baseFolder` is an absolute path. [#8098](https://github.com/scalableminds/webknossos/pull/8098) [#8103](https://github.com/scalableminds/webknossos/pull/8103)
+- When trying to save an annotation opened via a link including a sharing token, the token is automatically discarded in case it is insufficient for update actions but the users token is. [#8139](https://github.com/scalableminds/webknossos/pull/8139)
 - Fixed that the skeleton search did not automatically expand groups that contained the selected tree [#8129](https://github.com/scalableminds/webknossos/pull/8129)
 - Fixed a bug that zarr streaming version 3 returned the shape of mag (1, 1, 1) / the finest mag for all mags. [#8116](https://github.com/scalableminds/webknossos/pull/8116)
 - Fixed sorting of mags in outbound zarr streaming. [#8125](https://github.com/scalableminds/webknossos/pull/8125)

frontend/javascripts/admin/admin_rest_api.ts

@@ -2035,7 +2035,7 @@ export function computeAdHocMesh(
         },
       },
     );
-    const neighbors = Utils.parseMaybe(headers.neighbors) || [];
+    const neighbors = (Utils.parseMaybe(headers.neighbors) as number[] | null) || [];
     return {
       buffer,
       neighbors,

frontend/javascripts/admin/api/token.ts

@@ -2,9 +2,12 @@ import { location } from "libs/window";
 import Request from "libs/request";
 import * as Utils from "libs/utils";
 
+const MAX_TOKEN_RETRY_ATTEMPTS = 3;
+
 let tokenPromise: Promise<string>;
 
 let tokenRequestPromise: Promise<string> | null;
+let shouldUseURLToken: boolean = true;
 
 function requestUserToken(): Promise<string> {
   if (tokenRequestPromise) {
@@ -33,22 +36,36 @@ export function getSharingTokenFromUrlParameters(): string | null | undefined {
   return null;
 }
 
-export function doWithToken<T>(fn: (token: string) => Promise<T>, tries: number = 1): Promise<any> {
-  const sharingToken = getSharingTokenFromUrlParameters();
+export async function doWithToken<T>(
+  fn: (token: string) => Promise<T>,
+  tries: number = 1,
+  useURLTokenIfAvailable: boolean = true,
+): Promise<T> {
+  let token =
+    useURLTokenIfAvailable && shouldUseURLToken ? getSharingTokenFromUrlParameters() : null;
 
-  if (sharingToken != null) {
-    return fn(sharingToken);
+  if (token == null) {
+    tokenPromise = tokenPromise == null ? requestUserToken() : tokenPromise;
+  } else {
+    tokenPromise = Promise.resolve(token);
   }
 
-  if (!tokenPromise) tokenPromise = requestUserToken();
-  return tokenPromise.then(fn).catch((error) => {
+  return tokenPromise.then(fn).catch(async (error) => {
     if (error.status === 403) {
-      console.warn("Token expired. Requesting new token...");
+      console.warn(
+        `Token expired (attempt ${tries}/${MAX_TOKEN_RETRY_ATTEMPTS}). Requesting new token...`,
+      );
       tokenPromise = requestUserToken();
 
       // If three new tokens did not fix the 403, abort, otherwise we'll get into an endless loop here
-      if (tries < 3) {
-        return doWithToken(fn, tries + 1);
+      if (tries < MAX_TOKEN_RETRY_ATTEMPTS) {
+        // If using the url sharing token failed, we try the user specific token instead.
+        const result = await doWithToken(fn, tries + 1, false);
+        // Upon successful retry with own token, discard the url token.
+        if (useURLTokenIfAvailable) {
+          shouldUseURLToken = false;
+        }
+        return result;
       }
     }
 

frontend/javascripts/libs/request.ts

@@ -311,15 +311,23 @@ class Request {
                 ...message,
                 key: json.status.toString(),
               }));
-              if (showErrorToast) Toast.messages(messages);
+              if (showErrorToast) {
+                Toast.messages(messages); // Note: Toast.error internally logs to console
+              } else {
+                console.error(messages);
+              }
               // Check whether the error chain mentions an url which belongs
               // to a datastore. Then, ping the datastore
               pingMentionedDataStores(text);
 
               /* eslint-disable-next-line prefer-promise-reject-errors */
               return Promise.reject({ ...json, url: requestedUrl });
             } catch (_jsonError) {
-              if (showErrorToast) Toast.error(text);
+              if (showErrorToast) {
+                Toast.error(text); // Note: Toast.error internally logs to console
+              } else {
+                console.error(`Request failed for ${requestedUrl}:`, text);
+              }
 
               /* eslint-disable-next-line prefer-promise-reject-errors */
               return Promise.reject({

frontend/javascripts/oxalis/model/sagas/save_saga.ts

@@ -196,6 +196,9 @@ export function* sendRequestToServer(
           method: "POST",
           data: compactedSaveQueue,
           compress: process.env.NODE_ENV === "production",
+          // Suppressing error toast, as the doWithToken retry with personal token functionality should not show an error.
+          // Instead the error is logged and toggleErrorHighlighting should take care of showing an error to the user.
+          showErrorToast: false,
         },
       );
       const endTime = Date.now();

frontend/javascripts/test/sagas/save_saga.spec.ts

@@ -130,6 +130,7 @@ test("SaveSaga should send request to server", (t) => {
       method: "POST",
       data: saveQueueWithVersions,
       compress: false,
+      showErrorToast: false,
     }),
   );
 });
@@ -147,6 +148,7 @@ test("SaveSaga should retry update actions", (t) => {
       method: "POST",
       data: saveQueueWithVersions,
       compress: false,
+      showErrorToast: false,
     },
   );
   const saga = sendRequestToServer(TRACING_TYPE, tracingId);
@@ -187,6 +189,7 @@ test("SaveSaga should escalate on permanent client error update actions", (t) =>
       method: "POST",
       data: saveQueueWithVersions,
       compress: false,
+      showErrorToast: false,
     }),
   );
   saga.throw({