update access token getter

nfdi4plants · Apr 20, 2022 · 4760cae · 4760cae
1 parent d75be69
commit 4760cae
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 16 deletions.
diff --git a/src/ArcCommander/APIs/RemoteAccessAPI.fs b/src/ArcCommander/APIs/RemoteAccessAPI.fs
@@ -14,7 +14,11 @@ module RemoteAccessAPI =
 
             let log = Logging.createLogger "GitAuthenticateLog"
 
-            let hostAddress = getFieldValueByName "Server" remoteAccessArgs
+            let hostAddress = 
+                let ha = getFieldValueByName "Server" remoteAccessArgs
+                if ha.Contains "https" then ha
+                else $"https://{ha}"
+
 
             log.Info("Start Arc Authenticate")
 
@@ -32,16 +36,16 @@ module RemoteAccessAPI =
             | Ok token -> 
                 log.Info("Successfully retrieved access token from token service")
 
-                log.Trace("Try transfer git user metadata to global arcCommander config")
-                match IniData.tryGetGlobalConfigPath () with
-                | Some globalConfigPath ->
-                    IniData.setValueInIniPath globalConfigPath "general.gitname"    (token.FirstName + " " + token.LastName)
-                    IniData.setValueInIniPath globalConfigPath "general.gitemail"   token.Email
-                    log.Trace("Successfully transferred git user metadata to global arcCommander config")
-                | None ->
-                    log.Error("Could not transfer git user metadata to global arcCommander config")
+                //log.Trace("Try transfer git user metadata to global arcCommander config")
+                //match IniData.tryGetGlobalConfigPath () with
+                //| Some globalConfigPath ->
+                //    IniData.setValueInIniPath globalConfigPath "general.gitname"    (token.FirstName + " " + token.LastName)
+                //    IniData.setValueInIniPath globalConfigPath "general.gitemail"   token.Email
+                //    log.Trace("Successfully transferred git user metadata to global arcCommander config")
+                //| None ->
+                //    log.Error("Could not transfer git user metadata to global arcCommander config")
 
-                if GitHelper.storeCredentialsToken log token then
+                if GitHelper.storeCredentials log hostAddress "oauth2" token.AccessToken then
                     log.Info($"Finished Authentication")
 
                 else

diff --git a/src/ArcCommander/Authentication.fs b/src/ArcCommander/Authentication.fs
@@ -168,7 +168,7 @@ module Authentication =
 
             t.Wait()
             t.Result
-            |> Result.map (fun result -> IdentityToken.ofJwt result.IdentityToken)
+            //|> Result.map (fun result -> IdentityToken.ofJwt result.IdentityToken)
 
     module OAuth2 =
 

diff --git a/src/ArcCommander/GitHelper.fs b/src/ArcCommander/GitHelper.fs
@@ -118,11 +118,12 @@ module GitHelper =
         executeGitCommand dir "push"
 
     /// Stores git credentials to a git host using the git credential interface
-    let storeCredentials (log : NLog.Logger) host username password =
+    let storeCredentials (log : NLog.Logger) (host : string) username password =
 
         log.Info($"INFO: Start git credential storing")
 
         let protocol = "https"
+        let host = host.Replace($"{protocol}://","")
         let path = $"git:{protocol}://{host}"
 
         let procStartInfo = 
@@ -144,12 +145,12 @@ module GitHelper =
 
         let errorHandler (_sender:obj) (args:DataReceivedEventArgs) = 
 
-            if args.Data.Contains "trace:" then
-                outputs.Add args.Data
-                log.Trace($"{args.Data}")
-            else 
+            if args.Data.ToLower().Contains "error" then
                 errors.Add args.Data
                 log.Error($"{args.Data}")
+            else 
+                outputs.Add args.Data
+                log.Trace($"{args.Data}")
 
         let p = new Process(StartInfo = procStartInfo)
 
@@ -164,11 +165,17 @@ module GitHelper =
 
         log.Trace($"Start feeding credentials into git credential interface")
 
+        log.Trace($"url={path}")
         p.StandardInput.WriteLine $"url={path}"
+        log.Trace($"username={username}")
         p.StandardInput.WriteLine $"username={username}"
+        log.Trace($"host={host}")
         p.StandardInput.WriteLine $"host={host}"
+        log.Trace($"path={path}")
         p.StandardInput.WriteLine $"path={path}"
+        log.Trace($"protocol={protocol}")
         p.StandardInput.WriteLine $"protocol={protocol}"
+        log.Trace($"password={password}")
         p.StandardInput.WriteLine $"password={password}"
         p.StandardInput.WriteLine ""