Merge pull request #456 from UiPath/fix/STUD-73198_FTP_secured_string

FTP: Replace menu (25.2) [STUD-73198]
UiPath · Dec 17, 2024 · b3175de · b3175de
2 parents 60d6dc8 + 9653d1c
commit b3175de
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/Activities/FTP/UiPath.FTP.Activities/NetCore/MenuActionBuilder.cs b/Activities/FTP/UiPath.FTP.Activities/NetCore/MenuActionBuilder.cs
@@ -75,13 +75,14 @@ public MenuActionsBuilder<T> AddMenuProperty(DesignProperty property, T value, s
         /// <summary>
         /// For each of the stored properties, adds <see cref="MenuAction">menu actions</see> that represent all the other stored properties.
         /// </summary>
-        public void BuildAndInsertMenuActions()
+        public void BuildAndInsertMenuActions(bool isMain)
         {
             foreach (var targetPropertyInfo in _properties)
             {
                 var menuAction = new MenuAction
                 {
                     DisplayName = targetPropertyInfo.DisplayName,
+                    IsMain = isMain,
                     Handler = _ =>
                     {
                         _valueProperty.Value = targetPropertyInfo.Value;
@@ -91,8 +92,6 @@ public void BuildAndInsertMenuActions()
                 };
                 foreach (var propertyInfo in _properties.Where(pi => pi != targetPropertyInfo))
                 {
-
-
                     propertyInfo.Property.AddMenuAction(menuAction);
                 }
             }

diff --git a/Activities/FTP/UiPath.FTP.Activities/NetCore/ViewModels/WithFtpSessionViewModel.cs b/Activities/FTP/UiPath.FTP.Activities/NetCore/ViewModels/WithFtpSessionViewModel.cs
@@ -135,12 +135,12 @@ protected override void InitializeModel()
             MenuActionsBuilder<PasswordInputMode>.WithValueProperty(PasswordInputModeSwitch)
               .AddMenuProperty(Password, PasswordInputMode.Password)
               .AddMenuProperty(SecurePassword, PasswordInputMode.SecurePassword)
-              .BuildAndInsertMenuActions();
+              .BuildAndInsertMenuActions(true);
 
             MenuActionsBuilder<PasswordInputMode>.WithValueProperty(CertificatePasswordInputModeSwitch)
               .AddMenuProperty(ClientCertificatePassword, PasswordInputMode.Password)
               .AddMenuProperty(ClientCertificateSecurePassword, PasswordInputMode.SecurePassword)
-              .BuildAndInsertMenuActions();
+              .BuildAndInsertMenuActions(true);
         }
 
         /// <inheritdoc/>

diff --git a/Activities/FTP/UiPath.FTP.Activities/WithFtpSession.cs b/Activities/FTP/UiPath.FTP.Activities/WithFtpSession.cs
@@ -173,13 +173,17 @@ protected override async Task<Action<NativeActivityContext>> ExecuteAsync(Native
             ftpConfiguration.Port = Port.Expression == null ? null : (int?)Port.Get(context);
             ftpConfiguration.UseAnonymousLogin = UseAnonymousLogin;
             ftpConfiguration.SslProtocols = SslProtocols;
-            ftpConfiguration.Password = passwordValue;
             ftpConfiguration.ProxyType = ProxyType;
 
-            if (ftpConfiguration.Password == null)
+            if (PasswordInputModeSwitch == PasswordInputMode.Password)
+            {
+                ftpConfiguration.Password = passwordValue;
+            }
+            else
             {
                 ftpConfiguration.Password = new NetworkCredential("", securePasswordValue).Password;
             }
+
             if(ftpConfiguration.ProxyType != FtpProxyType.None)
             {
                 ftpConfiguration.ProxyServer = ProxyServer.Get(context);

diff --git a/Activities/FTP/UiPath.FTP/Properties/UiPath.FTP.resx b/Activities/FTP/UiPath.FTP/Properties/UiPath.FTP.resx
@@ -136,9 +136,9 @@
     <value>The destination directory already exists</value>
   </data>
   <data name="Password" xml:space="preserve">
-    <value>Toggle to text input</value>
+    <value>Use string</value>
   </data>
   <data name="SecurePassword" xml:space="preserve">
-    <value>Toggle to Secure input</value>
+    <value>Use secure string</value>
   </data>
 </root>