Merge pull request #821 from nextcloud/backport/820/stable-2.9

[stable-2.9] RemoteOperationResult: ignore location header if there are authentication headers present
nextcloud · Feb 18, 2022 · 64ec4ed · 64ec4ed
2 parents 278838c + 41affe7
commit 64ec4ed
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/main/java/com/owncloud/android/lib/common/operations/RemoteOperationResult.java b/src/main/java/com/owncloud/android/lib/common/operations/RemoteOperationResult.java
@@ -378,10 +378,10 @@ public RemoteOperationResult(boolean success, int httpCode, String httpPhrase, H
             Header current;
             for (Header httpHeader : httpHeaders) {
                 current = httpHeader;
-                if (HEADER_LOCATION.equals(current.getName().toLowerCase(Locale.US))) {
-                    mRedirectedLocation = current.getValue();
-                } else if (HEADER_WWW_AUTHENTICATE.equals(current.getName().toLowerCase(Locale.US))) {
+                if (HEADER_WWW_AUTHENTICATE.equals(current.getName().toLowerCase(Locale.US))) {
                     mAuthenticateHeaders.add(current.getValue());
+                } else if (HEADER_LOCATION.equals(current.getName().toLowerCase(Locale.US)) && mAuthenticateHeaders.isEmpty()) {
+                    mRedirectedLocation = current.getValue();
                 }
             }
         }

diff --git a/src/test/java/com/owncloud/android/lib/common/operations/RemoteOperationResultTest.kt b/src/test/java/com/owncloud/android/lib/common/operations/RemoteOperationResultTest.kt
@@ -72,7 +72,7 @@ class RemoteOperationResultTest {
         )
         Assert.assertEquals(
             "Wrong location header",
-            LOCATION_HEADER.value,
+            null,
             sut.redirectedLocation
         )
     }