fix: Allow multiple account with same username (#1012) (#1013)

* fix: Allow multiple account with same username

Allow multiple source control accounts to use same username if they are not using the same provider

* fix: Use provider name for clone using description

This prevent the description from always says `New repositories will be cloned from GitHub using`

* refactor: Check git provider & username instead of `id`

This is to prevent changes to the `id` format braking the old accounts added in earlier versions

Author: Qubik65536

CodeEdit/Features/AppPreferences/Sections/AccountsPreferences/AccountPreferencesView.swift

@@ -88,6 +88,8 @@ struct AccountPreferencesView: View {
                     .padding(.bottom, 5)
 
                 PreferencesSection("Clone Using", width: 100) {
+                    let account = getSourceControlAccount(selectedAccountId: accountSelection ?? "")
+
                     Picker("", selection: $cloneUsing) {
                         Text("HTTPS")
                             .tag(false) // temporary
@@ -96,7 +98,8 @@ struct AccountPreferencesView: View {
                     }
                     .pickerStyle(.radioGroup)
 
-                    Text("New repositories will be cloned from GitHub using \(cloneUsing ? "SSH" : "HTTPS").")
+                    Text("New repositories will be cloned from \(account?.gitProviderDescription ?? "")"
+                         + " using \(cloneUsing ? "SSH" : "HTTPS").")
                         .lineLimit(2)
                         .font(.system(size: 11))
                         .foregroundColor(Color.secondary)

CodeEdit/Features/AppPreferences/Sections/AccountsPreferences/Accounts/Login/Github/GitHubEnterpriseLoginView.swift

@@ -86,13 +86,18 @@ struct GitHubEnterpriseLoginView: View {
         GitHubAccount(config).me { response in
             switch response {
             case .success(let user):
-                if gitAccounts.contains(where: { $0.id == gitAccountName.lowercased() }) {
-                    print("Account with the username already exists!")
+                if gitAccounts.contains(
+                    where: {
+                        $0.gitProviderLink == eneterpriseLink &&
+                        $0.gitAccountName.lowercased() == gitAccountName.lowercased()
+                    }
+                ) {
+                    print("Account with the username and provider already exists!")
                 } else {
                     print(user)
                     prefs.preferences.accounts.sourceControlAccounts.gitAccount.append(
                         SourceControlAccounts(
-                            id: gitAccountName.lowercased(),
+                            id: "\(eneterpriseLink)_\(gitAccountName.lowercased())",
                             gitProvider: "GitHub",
                             gitProviderLink: eneterpriseLink,
                             gitProviderDescription: "GitHub",

CodeEdit/Features/AppPreferences/Sections/AccountsPreferences/Accounts/Login/Github/GitHubLoginView.swift

@@ -106,18 +106,25 @@ struct GitHubLoginView: View {
         let gitAccounts = prefs.preferences.accounts.sourceControlAccounts.gitAccount
 
         let config = GitHubTokenConfiguration(accountToken)
+
+        let providerLink = "https://github.com"
         GitHubAccount(config).me { response in
             switch response {
             case .success(let user):
-                if gitAccounts.contains(where: { $0.id == gitAccountName.lowercased() }) {
-                    print("Account with the username already exists!")
+                if gitAccounts.contains(
+                    where: {
+                        $0.gitProviderLink == providerLink &&
+                        $0.gitAccountName.lowercased() == gitAccountName.lowercased()
+                    }
+                ) {
+                    print("Account with the username and provider already exists!")
                 } else {
                     print(user)
                     prefs.preferences.accounts.sourceControlAccounts.gitAccount.append(
                         SourceControlAccounts(
-                            id: gitAccountName.lowercased(),
+                            id: "\(providerLink)_\(gitAccountName.lowercased())",
                             gitProvider: "GitHub",
-                            gitProviderLink: "https://github.com",
+                            gitProviderLink: providerLink,
                             gitProviderDescription: "GitHub",
                             gitAccountName: gitAccountName,
                             gitCloningProtocol: true,

CodeEdit/Features/AppPreferences/Sections/AccountsPreferences/Accounts/Login/Gitlab/GitLabHostedLoginView.swift

@@ -82,13 +82,18 @@ struct GitLabHostedLoginView: View {
         GitLabAccount(config).me { response in
             switch response {
             case .success(let user):
-                if gitAccounts.contains(where: { $0.id == gitAccountName.lowercased() }) {
-                    print("Account with the username already exists!")
+                if gitAccounts.contains(
+                    where: {
+                        $0.gitProviderLink == eneterpriseLink &&
+                        $0.gitAccountName.lowercased() == gitAccountName.lowercased()
+                    }
+                ) {
+                    print("Account with the username and provider already exists!")
                 } else {
                     print(user)
                     prefs.preferences.accounts.sourceControlAccounts.gitAccount.append(
                         SourceControlAccounts(
-                            id: gitAccountName.lowercased(),
+                            id: "\(eneterpriseLink)_\(gitAccountName.lowercased())",
                             gitProvider: "GitLab",
                             gitProviderLink: eneterpriseLink,
                             gitProviderDescription: "GitLab",

CodeEdit/Features/AppPreferences/Sections/AccountsPreferences/Accounts/Login/Gitlab/GitLabLoginView.swift

@@ -74,18 +74,25 @@ struct GitLabLoginView: View {
         let gitAccounts = prefs.preferences.accounts.sourceControlAccounts.gitAccount
 
         let config = GitLabTokenConfiguration(accountToken)
+
+        let providerLink = "https://gitlab.com"
         GitLabAccount(config).me { response in
             switch response {
             case .success(let user):
-                if gitAccounts.contains(where: { $0.id == gitAccountName.lowercased() }) {
-                    print("Account with the username already exists!")
+                if gitAccounts.contains(
+                    where: {
+                        $0.gitProviderLink == providerLink &&
+                        $0.gitAccountName.lowercased() == gitAccountName.lowercased()
+                    }
+                ) {
+                    print("Account with the username and provider already exists!")
                 } else {
                     print(user)
                     prefs.preferences.accounts.sourceControlAccounts.gitAccount.append(
                         SourceControlAccounts(
-                            id: gitAccountName.lowercased(),
+                            id: "\(providerLink)_\(gitAccountName.lowercased())",
                             gitProvider: "GitLab",
-                            gitProviderLink: "https://gitlab.com",
+                            gitProviderLink: providerLink,
                             gitProviderDescription: "GitLab",
                             gitAccountName: gitAccountName,
                             gitCloningProtocol: true,