fix ci issues

owncloud · Nov 8, 2021 · 964415d · 964415d
1 parent 6f643b2
commit 964415d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/packages/web-app-files/src/views/PublicFiles.vue b/packages/web-app-files/src/views/PublicFiles.vue
@@ -86,6 +86,10 @@ const unauthenticatedUserReady = async (router, store) => {
   const publicToken = (router.currentRoute.params.item || '').split('/')[0]
   const publicLinkPassword = store.getters['Files/publicLinkPassword']
 
+  if (publicLinkPassword) {
+    return
+  }
+
   await store.dispatch('loadCapabilities', {
     publicToken,
     ...(publicLinkPassword && { user: 'public', password: publicLinkPassword })
@@ -156,6 +160,7 @@ export default {
 
         if (error.statusCode === 401) {
           ref.redirectToResolvePage()
+          return
         }
       }
 

diff --git a/packages/web-app-media-viewer/src/App.vue b/packages/web-app-media-viewer/src/App.vue
@@ -288,7 +288,7 @@ export default {
       // FIXME: at the moment the signing key is not cached, thus it will be loaded again on each request.
       // workaround for now: Load file as blob for images, load as signed url (if supported) for everything else.
       let promise
-      if (this.isActiveMediaFileTypeImage || !this.isUrlSigningEnabled) {
+      if (this.isActiveMediaFileTypeImage || !this.isUrlSigningEnabled || !this.$route.meta.auth) {
         promise = this.mediaSource(url, 'url', null)
       } else {
         promise = this.$client.signUrl(url, 86400) // Timeout of the signed URL = 24 hours