Fix issue with size trend retrieval using empty credentials. (#77)

JetBrains · Jun 8, 2023 · bf6a864 · bf6a864
1 parent fbce91b
commit bf6a864
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/...framework/app/src/main/kotlin/com/jetbrains/teamcity/docker/hub/DockerRegistryAccessor.kt b/...framework/app/src/main/kotlin/com/jetbrains/teamcity/docker/hub/DockerRegistryAccessor.kt
@@ -35,7 +35,7 @@ class DockerRegistryAccessor(private val uri: String, credentials: DockerhubCred
             // -- parse JSON fields that don't have an assigned serializer into a String, e.g.: Number
             isLenient = true
         }
-        this.token = if (credentials != null) this.getPersonalAccessToken(credentials) else ""
+        this.token = if (credentials != null && credentials.isUsable()) this.getPersonalAccessToken(credentials) else ""
     }
 
     /**

diff --git a/...mework/app/src/main/kotlin/com/jetbrains/teamcity/docker/hub/auth/DockerhubCredentials.kt b/...mework/app/src/main/kotlin/com/jetbrains/teamcity/docker/hub/auth/DockerhubCredentials.kt
@@ -16,4 +16,11 @@ class DockerhubCredentials {
         this.username = username?.trim() ?: ""
         this.token = token?.trim() ?: ""
     }
+
+    /**
+     * @return true if credentials are usable for DockerHub auth (both are non-empty)
+     */
+    fun isUsable(): Boolean {
+        return !(this.username.isNullOrEmpty() || this.token.isNullOrEmpty())
+    }
 }