Readme and bug fixes

Author: isc-etamarch

README.md

@@ -150,6 +150,9 @@ Assuming you have the local and remote repositories created,
    `git config core.sshCommand 'ssh -i ~/.ssh/<private key name>'`
 8. Test the refresh button for the remote branches on the WebUI, fetch from the source control menu in Studio or VS Code, and `git fetch` in Git Bash. All 3 should work without any issues.
 
+### HTTPS Support
+We recommend that people connect to their remote git repository using SSH. If you cannot use SSH connections, we also have support for HTTPS connection through OAuth2. See [our documentation for setting up an https connection](/docs/https.md).
+
 ## Support
 
 If you find a bug or would like to request an enhancement, [report an issue](https://github.com/intersystems/git-source-control/issues/new). If you have a question, post it on the [InterSystems Developer Community](https://community.intersystems.com/) - consider using the "Git" and "Source Control" tags as appropriate.

cls/SourceControl/Git/Settings.cls

@@ -39,7 +39,7 @@ Property gitUserEmail As %String(MAXLEN = 255) [ InitialExpression = {##class(So
 Property gitRemoteURL As %String(MAXLEN = "") [ InitialExpression = {##class(SourceControl.Git.Utils).GetConfiguredRemote()} ];
 
 /// Type of git remote (SSH or HTTPS (Only with OAuth))
-Property gitRemoteType As %String(VALUELIST = ",HTTPS,SSH") [ InitialExpression = {##class(SourceControl.Git.Utils).GitRemoteType()} ];
+Property gitRemoteType As %String(VALUELIST = ",HTTPS,SSH") [ InitialExpression = {##class(SourceControl.Git.Settings).GetRemoteType(##class(SourceControl.Git.Utils).GetConfiguredRemote())} ];
 
 /// Whether mapped items should be read-only, preventing them from being added to source control
 Property mappedItemsReadOnly As %Boolean [ InitialExpression = {##class(SourceControl.Git.Utils).MappedItemsReadOnly()} ];
@@ -308,7 +308,7 @@ ClassMethod Configure() As %Boolean [ CodeMode = objectgenerator ]
             do %code.WriteLine(" set list(5) = """"")
             do %code.WriteLine(" set response = ##class(%Library.Prompt).GetArray("_promptQuoted_",.value,.list,,,,"_defaultPromptFlag_")")
         } elseif ((propertyDef) && (propertyDef.Name ="gitRemoteType")) {
-            do %code.WriteLine(" if (inst.gitRemoteURL '= """") { set inst.gitRemoteType = inst.GetRemoteType(inst.gitRemoteURL)}")
+            do %code.WriteLine(" if (inst.gitRemoteURL '= """") { set value = inst.GetRemoteType(inst.gitRemoteURL)}")
         } else {
             do %code.WriteLine(" set response = ##class(%Library.Prompt).GetString("_promptQuoted_",.value,,,,"_defaultPromptFlag_")")
         }
@@ -556,7 +556,7 @@ Method SaveDefaults() As %Boolean
     return ##class(%zpkg.isc.sc.git.Defaults).SetDefaultSettings(defaults)
 }
 
-ClassMethod GetRemoteType(remoteURL As %String)
+ClassMethod GetRemoteType(remoteURL As %String) As %String
 {
     return $select(remoteURL [ "https": "HTTPS",1:"SSH")
 }

cls/SourceControl/Git/Utils.cls

@@ -82,9 +82,9 @@ ClassMethod DecomposeProdAllowIDE() As %Boolean [ CodeMode = expression ]
 $Get(@..#Storage@("settings","decomposeProdAllowIDE"), 0)
 }
 
-ClassMethod GitRemoteType() As %String [ CodeMode = expression ]
+ClassMethod GitRemoteType() As %String
 {
-$Get(@..#Storage@("settings","gitRemoteType"), "")
+    return ##class(SourceControl.Git.Settings).GetRemoteType(..GitRemoteURL())
 }
 
 ClassMethod GitRemoteURL() As %String [ CodeMode = expression ]

docs/https.md

@@ -0,0 +1,18 @@
+## Setting up HTTPS
+
+We highly recommend that you use SSH to connect to your repositories. If this is not possible, then HTTPS is another option.
+
+First, add your remote repo in the settings page, or during the Configure step.
+
+After this, you have to authenticate using OAuth tokens. To do this, press "Authenticate" in the bottom left of the Embedded Git UI, or from the Source Control Menu.
+
+### Authentication
+
+If you have not already done so, create a new OAuth app in github or gitlab. The "Authorization callback URL" should be <your url>/isc/studio/usertemplates/gitsourcecontrol/oauth2.csp.
+
+Remember to save the ClientID and ClientSecret. Once this is finished, you can enter your information into the authentication page.
+![Screenshot of authentication page](/images/auth.png)
+
+Once all of the information is correct, you can press Save. This will redirect you to either gitlab or github in order to authorize the application to interact with this. After this is done, you will be redirected back to the authentication page, and you should be good to go!
+
+