Update Credentials.kt

Flank · May 21, 2021 · 0d8f2e0 · 0d8f2e0
1 parent b3e1772
commit 0d8f2e0
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/test_runner/src/main/kotlin/ftl/client/google/Credentials.kt b/test_runner/src/main/kotlin/ftl/client/google/Credentials.kt
@@ -23,8 +23,7 @@ val credential: GoogleCredentials by lazy {
             }.getOrElse {
                 when {
                     isWindows -> loadCredentialsWindows()
-                    UserAuth.exists() -> UserAuth.load()
-                    else -> throw FlankGeneralError("Error: Failed to read service account credential.\n${it.message}")
+                    else -> loadUserAuth(it.message.orEmpty())
                 }
             }
     }
@@ -33,8 +32,7 @@ val credential: GoogleCredentials by lazy {
 private fun loadCredentialsWindows() = runCatching {
     loadGoogleAccountCredentials()
 }.getOrElse {
-    if (UserAuth.exists()) UserAuth.load()
-    else throw FlankGeneralError("Error: Failed to read service account credential.\n${it.message}")
+    loadUserAuth(it.message.orEmpty())
 }
 
 private fun loadGoogleAccountCredentials(): GoogleCredentials = try {
@@ -43,6 +41,10 @@ private fun loadGoogleAccountCredentials(): GoogleCredentials = try {
     throw FlankGeneralError("Error: Failed to read service account credential.\n${e.message}")
 }
 
+private fun loadUserAuth(topLevelErrorMessage: String) =
+    if (UserAuth.exists()) UserAuth.load()
+    else throw FlankGeneralError("Error: Failed to read service account credential.\n$topLevelErrorMessage")
+
 val httpCredential: HttpRequestInitializer by lazy {
     if (FtlConstants.useMock) {
         HttpRequestInitializer {}