Fix connecting to remote

Author: isc-etamarch

cls/SourceControl/Git/OAuth2.cls

@@ -38,14 +38,13 @@ ClassMethod GetURLsFromRemote(remote As %String, Output authCodeURL, Output toke
     }
 }
 
-ClassMethod GetRemoteURLWithToken(token As %String) As %String
+ClassMethod SetRemoteURLWithToken(remote As %String) As %String
 {
-    set remote = ""
-    set url = ##class(SourceControl.Git.Utils).GitRemoteURL()
-    if url [ "//github.com/" {
-        set remote = "https://"_token_"@github.com"_$piece(url, "github.com", 2)
-    } elseif url [ "gitlab" {
-        set remote = "https://oauth2:"_token_"@gitlab.com"_$piece(url,"https://",2)
+    set token = ##class(SourceControl.Git.Util.CredentialManager).GetToken($username, .err, .code)
+    if ('(remote [ token)) {
+        set post = $piece($piece(remote,"https://",2),"@",2)
+        set remote = "https://oauth2:"_token_"@"_post
+
     }
     return remote
 }

cls/SourceControl/Git/Settings.cls

@@ -497,8 +497,6 @@ Method OnAfterConfigure() As %Boolean
                 $$$ThrowOnError(##class(SourceControl.Git.Utils).AddToSourceControl(##class(SourceControl.Git.Settings.Document).#INTERNALNAME))
                 $$$ThrowOnError(##class(SourceControl.Git.Utils).Commit(##class(SourceControl.Git.Settings.Document).#INTERNALNAME,"initial commit"))
             }
-            // Set remote to remove token
-            do ##class(SourceControl.Git.Utils).SetConfiguredRemote(..gitRemoteURL)
         }
     }
 }

cls/SourceControl/Git/Utils.cls

@@ -676,8 +676,7 @@ ClassMethod Clone(remote As %String) As %Status
     set settings = ##class(SourceControl.Git.Settings).%New()
     // Modify remote if using https
     if (remote [ "https") {
-        set token = ##class(SourceControl.Git.Util.CredentialManager).GetToken($username, .err, .code)
-        set remote = ##class(SourceControl.Git.OAuth2).GetRemoteURLWithToken(token)
+        set remote = ##class(SourceControl.Git.OAuth2).SetRemoteURLWithToken(remote)
     }
     // TODO: eventually use /ENV flag with GIT_TERMINAL_PROMPT=0. (This isn't doc'd yet and is only in really new versions.)
     set sc = ..RunGitWithArgs(.errStream, .outStream, "clone", remote, settings.namespaceTemp)
@@ -1878,9 +1877,11 @@ ClassMethod RunGitCommandWithInput(command As %String, inFile As %String = "", O
 
     if ((..GitRemoteType() = "HTTPS") && ((command = "pull") || (command = "push") || (command = "fetch"))) {
         // Need to use token
-        set token = ##class(SourceControl.Git.Util.CredentialManager).GetToken($username,.err,.code)
-        set url = ##class(SourceControl.Git.OAuth2).GetRemoteURLWithToken(token)
-        set newArgs($increment(newArgs)) = url
+        set remote = ..GetConfiguredRemote()
+        set tokenURL = ##class(SourceControl.Git.OAuth2).SetRemoteURLWithToken(remote)
+        if (remote '= tokenURL) {
+            do ..SetConfiguredRemote(tokenURL)
+        }
     }
 
     set syncIrisWithDiff = 0 // whether IRIS needs to be synced with repo file changes using diff output