From 9ead7e8e16fd87c184a9073bb0e7f8ddbd769799 Mon Sep 17 00:00:00 2001 From: David Sparer Date: Sun, 20 Jan 2019 11:18:40 -0600 Subject: [PATCH] fixed an issue with putty session importing cred id was not being set. also added a test for it --- .../PuttyConnectionManagerDeserializerTests.cs | 8 ++++++++ .../MiscSerializers/PuttyConnectionManagerDeserializer.cs | 1 + 2 files changed, 9 insertions(+) diff --git a/mRemoteNGTests/Config/Serializers/MiscSerializers/PuttyConnectionManagerDeserializerTests.cs b/mRemoteNGTests/Config/Serializers/MiscSerializers/PuttyConnectionManagerDeserializerTests.cs index 1857496c8..5e3f1aaa1 100644 --- a/mRemoteNGTests/Config/Serializers/MiscSerializers/PuttyConnectionManagerDeserializerTests.cs +++ b/mRemoteNGTests/Config/Serializers/MiscSerializers/PuttyConnectionManagerDeserializerTests.cs @@ -82,6 +82,14 @@ namespace mRemoteNGTests.Config.Serializers.MiscSerializers Assert.That(connection.PuttySession, Is.EqualTo(ExpectedPuttySession)); } + [Test] + public void CredentialIdProperlySet() + { + var connection = GetSshConnection(); + var cred = _deserializationResult.ConnectionToCredentialMap.DistinctCredentialRecords.First(); + Assert.That(connection.CredentialRecordId.FirstOrDefault(), Is.EqualTo(cred.Id)); + } + [Test] public void ConnectionUsernameImported() { diff --git a/mRemoteV1/Config/Serializers/MiscSerializers/PuttyConnectionManagerDeserializer.cs b/mRemoteV1/Config/Serializers/MiscSerializers/PuttyConnectionManagerDeserializer.cs index c9af6f274..81e3ac258 100644 --- a/mRemoteV1/Config/Serializers/MiscSerializers/PuttyConnectionManagerDeserializer.cs +++ b/mRemoteV1/Config/Serializers/MiscSerializers/PuttyConnectionManagerDeserializer.cs @@ -107,6 +107,7 @@ namespace mRemoteNG.Config.Serializers var connectionInfo = ConnectionInfoFromXml(connectionNode); var cred = CredentialFromXml(connectionNode); + connectionInfo.CredentialRecordId = cred.Id; credentialMap.Add(Guid.Parse(connectionInfo.ConstantID), cred); return connectionInfo; }