From 8ace50de3471514d2166c5a9fd9463ccb54bd4e3 Mon Sep 17 00:00:00 2001
From: Kirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Date: Thu, 24 Aug 2017 20:09:03 +0300
Subject: [PATCH] Use utility method to generate canonical CredentialAttributes
 service name

---
 .../src/com/intellij/credentialStore/CredentialAttributes.kt  | 2 ++
 .../org/zmlx/hg4idea/execution/HgCommandAuthenticator.java    | 2 +-
 plugins/settings-repository/src/IcsCredentialsStore.kt        | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/platform/platform-api/src/com/intellij/credentialStore/CredentialAttributes.kt b/platform/platform-api/src/com/intellij/credentialStore/CredentialAttributes.kt
index c33965e5fc2b..119fb6eb29f2 100644
--- a/platform/platform-api/src/com/intellij/credentialStore/CredentialAttributes.kt
+++ b/platform/platform-api/src/com/intellij/credentialStore/CredentialAttributes.kt
@@ -28,6 +28,8 @@ import java.util.concurrent.atomic.AtomicReference
 
 const val SERVICE_NAME_PREFIX = "IntelliJ Platform"
 
+fun generateServiceName(subsystem: String, key: String) = "$SERVICE_NAME_PREFIX $subsystem — $key"
+
 /**
  * requestor is deprecated. Never use it in new code.
  */
diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/execution/HgCommandAuthenticator.java b/plugins/hg4idea/src/org/zmlx/hg4idea/execution/HgCommandAuthenticator.java
index c91dc1a8748b..acd8723d832e 100644
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/execution/HgCommandAuthenticator.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/execution/HgCommandAuthenticator.java
@@ -156,6 +156,6 @@ class HgCommandAuthenticator {
 
   @NotNull
   private static CredentialAttributes createCredentialAttributes(@NotNull String url) {
-    return new CredentialAttributes(CredentialAttributesKt.SERVICE_NAME_PREFIX + " HG — " + url, null);
+    return new CredentialAttributes(CredentialAttributesKt.generateServiceName("HG", url), null);
   }
 }
diff --git a/plugins/settings-repository/src/IcsCredentialsStore.kt b/plugins/settings-repository/src/IcsCredentialsStore.kt
index e7420c9c1434..98eeca3d8d6e 100644
--- a/plugins/settings-repository/src/IcsCredentialsStore.kt
+++ b/plugins/settings-repository/src/IcsCredentialsStore.kt
@@ -17,7 +17,7 @@ package org.jetbrains.settingsRepository
 
 import com.intellij.credentialStore.CredentialAttributes
 import com.intellij.credentialStore.Credentials
-import com.intellij.credentialStore.SERVICE_NAME_PREFIX
+import com.intellij.credentialStore.generateServiceName
 import com.intellij.ide.passwordSafe.PasswordSafe
 
 /**
@@ -34,7 +34,7 @@ class IcsCredentialsStore() {
 
 private fun CredentialAttributes(host: String?, sshKeyFile: String?, accountName: String?): CredentialAttributes? {
   if (sshKeyFile == null) {
-    return CredentialAttributes("$SERVICE_NAME_PREFIX Settings Repository — $host", accountName)
+    return CredentialAttributes(generateServiceName("Settings Repository", host.toString()), accountName)
   }
   else {
     return CredentialAttributes("SSH", sshKeyFile)