From fdefa6f2ac6037c5f53904307be75f5a77c53ab8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Qian=20Qian=20=22Cubik=22=E2=80=8E?=
 <cubik65536@cubik65536.top>
Date: Thu, 27 Apr 2023 12:48:47 -0400
Subject: [PATCH 1/2] fix: Fix error when adding new GitHub/GitLab account

---
 .../Pages/AccountsSettings/AccountsSettingsSigninView.swift   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CodeEdit/Features/Settings/Pages/AccountsSettings/AccountsSettingsSigninView.swift b/CodeEdit/Features/Settings/Pages/AccountsSettings/AccountsSettingsSigninView.swift
index 7369b5d341..3799823ecf 100644
--- a/CodeEdit/Features/Settings/Pages/AccountsSettings/AccountsSettingsSigninView.swift
+++ b/CodeEdit/Features/Settings/Pages/AccountsSettings/AccountsSettingsSigninView.swift
@@ -159,7 +159,7 @@ struct AccountsSettingsSigninView: View {
 
         switch provider {
         case .github, .githubEnterprise:
-            let config = GitHubTokenConfiguration(personalAccessToken, url: configURL)
+            let config = GitHubTokenConfiguration(personalAccessToken, url: configURL ?? GitURL.githubBaseURL)
             GitHubAccount(config).me { response in
                 switch response {
                 case .success:
@@ -169,7 +169,7 @@ struct AccountsSettingsSigninView: View {
                 }
             }
         case .gitlab, .gitlabSelfHosted:
-            let config = GitLabTokenConfiguration(personalAccessToken, url: configURL)
+            let config = GitLabTokenConfiguration(personalAccessToken, url: configURL ?? GitURL.gitlabBaseURL)
             GitLabAccount(config).me { response in
                 switch response {
                 case .success:

From 6403f65930477bcff2d596df40c9057fc700eb6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Qian=20Qian=20=22Cubik=22=E2=80=8E?=
 <cubik65536@cubik65536.top>
Date: Thu, 27 Apr 2023 12:51:21 -0400
Subject: [PATCH 2/2] fix: Prevent user from adding the same account multiple
 times

Use `providerLink` instead of `server` that can be null
---
 .../Pages/AccountsSettings/AccountsSettingsSigninView.swift   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CodeEdit/Features/Settings/Pages/AccountsSettings/AccountsSettingsSigninView.swift b/CodeEdit/Features/Settings/Pages/AccountsSettings/AccountsSettingsSigninView.swift
index 3799823ecf..fe64a765ef 100644
--- a/CodeEdit/Features/Settings/Pages/AccountsSettings/AccountsSettingsSigninView.swift
+++ b/CodeEdit/Features/Settings/Pages/AccountsSettings/AccountsSettingsSigninView.swift
@@ -197,11 +197,11 @@ struct AccountsSettingsSigninView: View {
         } else {
             settings.accounts.sourceControlAccounts.gitAccounts.append(
                 SourceControlAccount(
-                    id: "\(server)_\(username.lowercased())",
+                    id: "\(providerLink)_\(username.lowercased())",
                     name: username,
                     description: provider.name,
                     provider: provider,
-                    serverURL: server,
+                    serverURL: providerLink,
                     urlProtocol: true,
                     sshKey: "",
                     isTokenValid: true