From a20e10b34299e012071eb49f330eb45dd9e956ef Mon Sep 17 00:00:00 2001 From: tecxx Date: Tue, 18 Jan 2022 16:28:03 +0100 Subject: [PATCH 1/3] fix refresh token issue in TSS API --- ExternalConnectors/TSS/SecretServerInterface.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ExternalConnectors/TSS/SecretServerInterface.cs b/ExternalConnectors/TSS/SecretServerInterface.cs index e43473ab2..7aba78d07 100644 --- a/ExternalConnectors/TSS/SecretServerInterface.cs +++ b/ExternalConnectors/TSS/SecretServerInterface.cs @@ -174,7 +174,7 @@ namespace ExternalConnectors.TSS DateTime ExpiresOn = SSConnectionData.ssTokenExpiresOn; - //Check if current token is valid + // Check if current token is valid if (!String.IsNullOrEmpty(Bearer)) { if (ExpiresOn >= DateTime.UtcNow) @@ -191,6 +191,8 @@ namespace ExternalConnectors.TSS var tokenResult = token.Access_token; SSConnectionData.ssTokenBearer = tokenResult; + SSConnectionData.ssTokenRefresh = token.Refresh_token; + SSConnectionData.ssTokenExpiresOn = token.Expires_on; return tokenResult; } } From e29d2c25ba769956682dbbcd78c4e32e2938dd1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20G=C3=B6tzinger?= Date: Wed, 19 Jan 2022 16:59:16 +0100 Subject: [PATCH 2/3] Fixing Null value exception, when saving imported connections from Remote Desktop Connection Manager --- .../RemoteDesktopConnectionManagerDeserializer.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mRemoteNG/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManagerDeserializer.cs b/mRemoteNG/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManagerDeserializer.cs index 63b672229..1473863b0 100644 --- a/mRemoteNG/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManagerDeserializer.cs +++ b/mRemoteNG/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManagerDeserializer.cs @@ -183,8 +183,8 @@ namespace mRemoteNG.Config.Serializers.MiscSerializers { if (bool.TryParse(connectionSettingsNode.SelectSingleNode("./connectToConsole")?.InnerText, out var useConsole)) connectionInfo.UseConsoleSession = useConsole; - connectionInfo.RDPStartProgram = connectionSettingsNode.SelectSingleNode("./startProgram")?.InnerText; - connectionInfo.RDPStartProgramWorkDir = connectionSettingsNode.SelectSingleNode("./startProgramWorkDir")?.InnerText; + connectionInfo.RDPStartProgram = connectionSettingsNode.SelectSingleNode("./startProgram")?.InnerText ?? string.Empty; + connectionInfo.RDPStartProgramWorkDir = connectionSettingsNode.SelectSingleNode("./startProgramWorkDir")?.InnerText ?? string.Empty; if (int.TryParse(connectionSettingsNode.SelectSingleNode("./port")?.InnerText, out var port)) connectionInfo.Port = port; } From c632ba4306c97403ae60f9d7bee44b71bfeaf902 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20G=C3=B6tzinger?= Date: Wed, 19 Jan 2022 16:59:42 +0100 Subject: [PATCH 3/3] Allow importing connections from Remote Desktop Connection Manager v2.83 --- .../RemoteDesktopConnectionManagerDeserializer.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mRemoteNG/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManagerDeserializer.cs b/mRemoteNG/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManagerDeserializer.cs index 1473863b0..43ce5977d 100644 --- a/mRemoteNG/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManagerDeserializer.cs +++ b/mRemoteNG/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManagerDeserializer.cs @@ -57,7 +57,7 @@ namespace mRemoteNG.Config.Serializers.MiscSerializers if (versionAttribute != null) { var version = new Version(versionAttribute); - if (!(version == new Version(2, 7))) + if (!(version == new Version(2, 7)) && !(version == new Version(2, 83))) { throw new FileFormatException($"Unsupported file version ({version})."); }