commit e6689fa73daeafd7f6f048f99e28e4875ad1fc15
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Jun 06 21:52:17 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jun 06 21:52:17 2023 +0000
tree 81a649788bd62c25a62a62e3b9feca339abd67ee
parent 27d3a2edeb07f8e9dc1a1b42b639768486a7f29d
parent f90961ff23c57aee8a4a1500320fca13f80b3f02

Merge "[Partner request] Remove https and trailing slash in an https origin" into udc-dev am: f90961ff23

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23591487

Change-Id: Iff5533baf0dd38b1651c910b9280995148f07ed2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

packages/CredentialManager/src/com/android/credentialmanager/CredentialManagerRepo.kt

diff --git a/packages/CredentialManager/src/com/android/credentialmanager/CredentialManagerRepo.kt b/packages/CredentialManager/src/com/android/credentialmanager/CredentialManagerRepo.kt
index 2dafbcb..a78509d 100644
--- a/packages/CredentialManager/src/com/android/credentialmanager/CredentialManagerRepo.kt
+++ b/packages/CredentialManager/src/com/android/credentialmanager/CredentialManagerRepo.kt
@@ -66,8 +66,9 @@
         )
 
         val originName: String? = when (requestInfo?.type) {
-            RequestInfo.TYPE_CREATE -> requestInfo.createCredentialRequest?.origin
-            RequestInfo.TYPE_GET -> requestInfo.getCredentialRequest?.origin
+            RequestInfo.TYPE_CREATE -> processHttpsOrigin(
+                requestInfo.createCredentialRequest?.origin)
+            RequestInfo.TYPE_GET -> processHttpsOrigin(requestInfo.getCredentialRequest?.origin)
             else -> null
         }
 
@@ -247,6 +248,9 @@
     }
 
     companion object {
+        private const val HTTPS = "https://"
+        private const val FORWARD_SLASH = "/"
+
         fun sendCancellationCode(
             cancelCode: Int,
             requestToken: IBinder?,
@@ -266,5 +270,17 @@
                 CancelUiRequest::class.java
             )
         }
+
+        /** Removes "https://", and the trailing slash if present for an https request. */
+        private fun processHttpsOrigin(origin: String?): String? {
+            var processed = origin
+            if (processed?.startsWith(HTTPS) == true) { // Removes "https://"
+                processed = processed.substring(HTTPS.length)
+                if (processed?.endsWith(FORWARD_SLASH) == true) { // Removes the trailing slash
+                    processed = processed.substring(0, processed.length - 1)
+                }
+            }
+            return processed
+        }
     }
 }