Fix resolving of password protected links

owncloud · Oct 11, 2022 · 190685f · 190685f
1 parent a73cfba
commit 190685f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/packages/web-runtime/src/composables/tokenInfo/useLoadTokenInfo.ts b/packages/web-runtime/src/composables/tokenInfo/useLoadTokenInfo.ts
@@ -8,14 +8,23 @@ export function useLoadTokenInfo(token) {
   const isUserContext = useUserContext({ store })
 
   const loadTokenInfoTask = useTask(function* () {
+    let tokenInfo
+
     try {
       if (unref(isUserContext)) {
-        return yield owncloudSdk.shares.getProtectedTokenInfo(token)
+        tokenInfo = yield owncloudSdk.shares.getProtectedTokenInfo(token)
       } else {
-        return yield owncloudSdk.shares.getUnprotectedTokenInfo(token)
+        tokenInfo = yield owncloudSdk.shares.getUnprotectedTokenInfo(token)
       }
-    } catch (e) {} // backend doesn't support the token info endpoint
-    return {}
+    } catch (e) {
+      // backend doesn't support the token info endpoint
+      return {}
+    }
+    return {
+      ...tokenInfo,
+      alias_link: tokenInfo.alias_link === 'true',
+      password_protected: tokenInfo.password_protected === 'true'
+    }
   })
 
   return { loadTokenInfoTask }

diff --git a/packages/web-runtime/src/pages/resolvePublicLink.vue b/packages/web-runtime/src/pages/resolvePublicLink.vue
@@ -105,7 +105,7 @@ export default defineComponent({
     }))
     const isPasswordRequiredTask = useTask(function* (signal, ref) {
       if (!isEmpty(ref.tokenInfo)) {
-        return ref.tokenInfo.password_protected === 'true'
+        return ref.tokenInfo.password_protected
       }
       try {
         yield webdav.getFileInfo({ ...unref(publicLinkSpace), publicLinkPassword: null })