From 68e777357c3682899ac5502d0636ce760b11ccb1 Mon Sep 17 00:00:00 2001
From: dmilov <dmilov@vmware.com>
Date: Mon, 5 Oct 2020 10:39:52 +0300
Subject: [PATCH] Address PR discussions

---
 .../VMware.vSphere.SsoAdmin.psm1              |  24 +++++------
 .../net45/VMware.vSphere.SsoAdmin.Utils.dll   | Bin 5120 -> 5632 bytes
 .../net45/VMware.vSphere.SsoAdminClient.dll   | Bin 197120 -> 197120 bytes
 .../VMware.vSphere.SsoAdmin.Utils.dll         | Bin 5120 -> 5632 bytes
 .../VMware.vSphere.SsoAdminClient.dll         | Bin 197632 -> 197632 bytes
 ...reStringArgumentTransformationAttribute.cs |  38 ++++++++++++++++++
 .../VMware.vSphere.SsoAdmin.Utils.csproj      |   2 +
 .../IntegrationTests.cs                       |   2 +-
 8 files changed, 52 insertions(+), 14 deletions(-)
 create mode 100644 Modules/VMware.vSphere.SsoAdmin/src/VMware.vSphere.SsoAdmin.Client/VMware.vSphere.SsoAdmin.Utils/StirngToSecureStringArgumentTransformationAttribute.cs

diff --git a/Modules/VMware.vSphere.SsoAdmin/VMware.vSphere.SsoAdmin.psm1 b/Modules/VMware.vSphere.SsoAdmin/VMware.vSphere.SsoAdmin.psm1
index fb86ba2..a25f5ef 100644
--- a/Modules/VMware.vSphere.SsoAdmin/VMware.vSphere.SsoAdmin.psm1
+++ b/Modules/VMware.vSphere.SsoAdmin/VMware.vSphere.SsoAdmin.psm1
@@ -112,7 +112,8 @@ function Connect-SsoAdminServer {
       ValueFromPipeline=$false,
       ValueFromPipelineByPropertyName=$false,
       HelpMessage='Password you want to use for authenticating with the server')]
-   [string]
+   [VMware.vSphere.SsoAdmin.Utils.StirngToSecureStringArgumentTransformationAttribute()]
+   [SecureString]
    $Password,
 
    [Parameter(
@@ -132,14 +133,16 @@ function Connect-SsoAdminServer {
          -ArgumentList @(
          $Server,
          $User,
-         (ConvertTo-SecureString -String $Password -AsPlainText -Force),
+         $Password,
          $certificateValidator)
 
-      # Update $global:DefaultSsoAdminServers varaible
-      $global:DefaultSsoAdminServers.Add($ssoAdminServer) | Out-Null
+      if ($ssoAdminServer -ne $null) {
+         # Update $global:DefaultSsoAdminServers varaible
+         $global:DefaultSsoAdminServers.Add($ssoAdminServer) | Out-Null
 
-      # Function Output
-      Write-Output $ssoAdminServer
+         # Function Output
+         Write-Output $ssoAdminServer
+      }
    }
 }
 
@@ -327,7 +330,7 @@ function Get-PersonUser {
     Github:        https://github.com/dmilov
    ===========================================================================
    .DESCRIPTION
-   This function gets new person user account.
+   This function gets person user account.
 
    .PARAMETER Name
    Specifies Name to filter on when searching for person user accounts.
@@ -570,12 +573,7 @@ function Remove-PersonUser {
    $myNewPersonUser = New-PersonUser -Server $ssoAdminConnection -User myAdmin -Password 'MyStrongPa$$w0rd'
    Remove-PersonUser -User $myNewPersonUser
 
-   Remove person user account with user name 'myAdmin' and password 'MyStrongPa$$w0rd'
-
-   .EXAMPLE
-   New-PersonUser -User myAdmin -Password 'MyStrongPa$$w0rd' -EmailAddress 'myAdmin@mydomain.com' -FirstName 'My' -LastName 'Admin'
-
-   Creates person user account with user name 'myAdmin', password 'MyStrongPa$$w0rd', and details against connections available in 'DefaultSsoAdminServers'
+   Remove person user account with user name 'myAdmin'
 #>
 [CmdletBinding(ConfirmImpact='High')]
  param(
diff --git a/Modules/VMware.vSphere.SsoAdmin/net45/VMware.vSphere.SsoAdmin.Utils.dll b/Modules/VMware.vSphere.SsoAdmin/net45/VMware.vSphere.SsoAdmin.Utils.dll
index 831ca20b02b601ff892f7043b725b6ab61fb8a90..c18d76e56ce18f99fab0b0bbce669d55dc65138e 100644
GIT binary patch
delta 1483
zcmZ9MT}&KR6vzMf&g|^6&}Bb>mX_9qP36-Kr3D2ocDrER07AQzf~aMIVVMSIadx%|
zeJD*(Yqgqg#x(KcL6h=8{c1wgm>Bh`F-<jE6BB(PB=t?B#xyZ$QscRog;4M2{LaU{
z=iIY%cJ^G|xu#1m*HpEhSVCc~p(b3+nt>7uc-Di@HRP`j`MeE4zX%)xdewY&sAO#Y
z)E9NYpi|A8oDo**o%GU?FiDB?3TtFO=Tlb8%A8eJQ`t!s#Cnp1!-a3cz#TWhoTJ`{
zodLe%WT=^;oOT%yP`zrdjLc$pliOYA0yMAIu!q<A0MQCU%^Y+yRYD+JN<lBr_(>I4
zlr)yQJ<c|*C=(#xvwgV4<9^*}`Au`ueD8uy36ZnF8tE$v*-6_n%ygDY;ROw-A{{xN
z#JgluJw%QiPjr#KMt&DH7CAhV87E&XD#4DFa}<$*yKFxyWbdH9p^{M7Qd1u&CZS^s
z;>*dP(7+#TU2EuIzj6&1CFA&kmqMlXG?=)?G-O#P?fwhF-O@fU?JJT`%g70`y|~0r
zDn7a;qy({wYC3;b@$(=)=E7dM$?}SZ0q!T~7W0eF5fq>l@$ut4k14I2-VMZ*gXAe#
zWPUtP=VRo#Fc20w*U^E;$sd#6OFNdSD#vtTZ#(ZM@4}WnbpdZk_cCs<-okT;LR|he
zmFCzb?W?Q^%bX!V)KE$EqMqo-KFM~;m}ElosN{%bO7cxfgQ#I%GEYoucn>cs5#%w&
z>ky^693zG>O5BAr#0VCNjrf+hAAb=a#XVvi^(=}Wv=NhXca&I;olZ;*EyQS8V&)s`
zA?%gr{js0rwC|6t&w$c5R~wB@I4V7LTEnf)?Qz|*jVWUyW$P_?tS>W}o6$RAm~%P1
zD`ltPtf))1N!zf@^k62bPvk6p{f8a1(z#jPv<Iz}nVrg5vnku@aedx+IyIBik(|%k
z`fT)A&a{nLJvyXYStDc8`+zM~oSoX?2RHLKa{5wcDy@ss(OAyTP+iJ&Mzw|q=H_&B
zGCrNMu(gqR#ym}5Lbsent-iY3OdF=2FvZK4H72sq{}*uH*FLK0A3vo}*wl-t7PG9>
z{KoCFvSH6V!|w3-KYu?lJ!y^fyglIjw0i1b3)C=U9wiLsA|ntGu1|IIDxb%#1{1p#
zkD`XLo4}aj`RvRyLzM^CE_n8R^~lhNZBMm|q+q)i=2gM&Di>HV;d4H4-#Gxhn*IJV
zSl@t{&W|MidJ^$w7nYcAh@_U}HtpRmc5ZoU{1cIzZOMDj#xL&q{k4jr?+!U?(e;)>
zFw$EHirVF0e$u_1ersEz|DC0l!r!GR-7D;HzPf^UHmsC+e_<=WlDjTG*0B-@{>k#q
G?*9M=wHi?X

delta 973
zcmY+DUr19?9LK-sx?Q)q=A3^}l69TdX6m@jNsUTO1(jTB%aPQBmP;4@A)OBvIv+%`
zms;nozmU~KPy|9j5JWSH2*g4kdMKZKkRU00u^#%JvnBL{^EtoY_jiB4d(OG{Ojb^M
zu3vF2CReT@ZL4r;Sxg5kB$!fSttas~Y+H8&$AwS_v>Fm6xz;YgO7ZPIz)4=BRPs*d
zwls<&jfRC^WfjcIpEEae@Gs0&<n)kC)=Wcz5q%oqR{_Q^TKDrdrI5c<%Hs13D4hUw
z1(>H%8j1}^2YW|E<)#5Brn$5u1iKNi3%{wOrIBWh;yh7X-#>JgVqsLyn(_g&2)0-?
z3P>O~JCzf88SkJuE9J+LK@M<>i3b4{f8bVB9Akn3<SE%`qB<2l=w~Ww*gWwy1iwm-
zOWu?$mf0Zr7W`uO6&t-SOnp|^E7{&5-@!;_w3%;gN{QFVpiL8*1?X^6+$E#wLK~H)
z)?7w=vMCHXL={Cu3(ARh?2`;g9+7O3Y?thm?3Nspj1pCNY5!%!+&HRe+KE<TDLRN1
zxJRtU8{$DM5*zTFcoZh)MM!2(6AhE8!^E~t(OT(?ZCgI|752Y2El=W~wpTomkJRx9
zAE#>cKtp6W7Cj$5*By)aa40y`Guj`i<sXcXc&lpSPt^wnp|O!zWWal3bTAejh<L-1
z;gRUjARo`H=WCheTsOJ-nCS^`G4JwU__^4aeRsY2S^M(Z$MV%a7&OLA85)?8oSYmH
z+DtDloe3BDS7(Ig2=MpjP2Y0t#u8YtO?-k+G&bnZ-$-8)u~M;-TpDy!kR&9{{D;M5
zujrj!df==LzMP$(d27)x^Rlc3Us}Agl@>*Bzpv_W(jA!KyB~Ht(wBu=p;Gu-qNG4^
cdglDr&y4GeHfOVK8I`&Nb2)k6SwheJ3y9jL-v9sr

diff --git a/Modules/VMware.vSphere.SsoAdmin/net45/VMware.vSphere.SsoAdminClient.dll b/Modules/VMware.vSphere.SsoAdmin/net45/VMware.vSphere.SsoAdminClient.dll
index a578aab3c7e80c46d45c366b1b7b0dfa3bb3c351..2c5844d973eff476b4445d74ae41f2a34ab10dbe 100644
GIT binary patch
delta 117
zcmZo@;b~~$nb5(~`qBPiV^3=j<JKM~opu3{7Yr8{r(bd3sn`1HflzD4_7m+)4h1YM
zZ4&>d^ZZ~65J=js_BpXT+-u3H8(U^xn)!Wt&JU(z3Q*Cm6sRareSM-Wi`1WeoZbh;
NwyfD6^pj~F2LN?rH;@1T

delta 117
zcmZo@;b~~$nb5(qtLpjp#-7$5#;rX}I_&~h!ojT0wd;NNC-2kvbyfS&_7m+)4h1Ze
zd)BU=&hvvQK;R{VlHu2^qfT2kEQmP2e2U`qoF7cb6kwtyP*ITj;EUQTO-<(p#k#P4
L-5&IlX&nauFF`fj

diff --git a/Modules/VMware.vSphere.SsoAdmin/netcoreapp2.0/VMware.vSphere.SsoAdmin.Utils.dll b/Modules/VMware.vSphere.SsoAdmin/netcoreapp2.0/VMware.vSphere.SsoAdmin.Utils.dll
index 8309b2be5529f297b0f6874c4dde777e6d5e1065..2a9fe1b46a7ea2a20fec6c1eb327eb06542a4031 100644
GIT binary patch
delta 1495
zcmZ8hU2GIp6#nj=+1c%O-R=)9Ki%qfx7c=DoAOhzsL)ahZftGK7E(e?yKRSMNjuZb
z&Ne9zE(v0=iN<zJ(byLaF_DM?n-F;*NHm5ggM>zn1p9ywjV8vViNb^N+`B6Q&*psR
z_nvch&Yd~caH{#;v$5uk@h3{Of>^YiwE{kJc#6)2#N36${=EsHPdGY&9(ArZ>>DX&
z{oVi!I<>snIl}6_i(X2J68oH4*2MhI6;{vIIrms><1|$e^fEDr3pb-c9ra+&fOn_U
z&o>N*TNx@T%7CEiRrBjeEq6D&-3=~4^J<Bwd4nJDibCO54(d#m5X@DO)62~OiSjC6
zQ-#~(Jf)SHL9#vThkPFQJK3$jX-<Z3E}W$U@z;Shl6Mr+Q?`{gGC3-Rn;H-y89$W5
zebT8O;s*{T_mNy9o5n+Y?}Rx@wje6O4pefKk%EV88>-~&pt+$E)6`PZ94IHIw1W6^
zG9V<mcu{KTVCxkP^AeNzl~-UVji<rJ6{cZ^9poBRiE)W<LwGJo9Fd;aNcZAApI7|U
zWxo=_eY8=|Wu=aX@HKDaRVdtM-%y)zUPpl+S)G_1Apvwm`~vup+e+Ib>lSR~C9)Kp
zW&xa`{7$l5=#Pps-=YJ1$R3f_n;WiCRgUAOSQGCi>#fIPY60&_a{;$lk9;@`+aa3Y
zq0$`HQoqE?aE+c!kWj-$LN6K#1K1+5U1F!iq{IP<M<k{tejqVRNKa4V9AQesNBB~S
zV-6>I16pV=2MNPCN?47PgmIiEY{FH-ZMaML0#*sTP{~^G3SxvQ89ho^iA_$Y8ZOwh
zELCi{M9*Qf)Kv0{yHKQG<hGy8+fOIOqKg+n=sRd_LOz-IcgZKyhuT`(yL8LW9?OoU
zZGCGPFZP<_`3ZeDvc^>2-j}x1&KK%u^(i}R8JR&drH|z;y?EI>txSGWH|#+xZRC!b
z)@0gt23%Lw>GVY2@o16q$I_js*8l9IM5JbNwm#X?n>NxJUDRml%-bdv$eM;@YKdp2
zrgUSx>v-D2;~l$9W16PbE$5upSlex6vWA{C#G9APj^&{L&*5Cx;(m(jmN}Kut?BHT
z?tHH;#`;E2=wmhpP0^s!veGmE4J4ao?HR{(*Nj%CFE+U%!#$s#d$9UosIM1llrfJI
z1#^)S3<}e)x_QL!ajT(Zjp9+%C~628Q#_aU3>SjS-d&z8*PlOpamTA|;!vnvi}FaQ
zJK_QhCH>A<?iISWKV4p30qgA-oB5fzqmfv==_L{?4HMTBSJPLk+UMN%!~%<V?|l-u
zu|0XdcP+L1^D}=rYT0)!C1+z@$w{?GW}BCn|1lRPtRH4?oG5)hMd>#Z^WIH-I<XY-
We$1BqzK1UU{;s89=npp6>i!oSAR&wZ

delta 914
zcmY+CT}V_x6vzKF?!Df<d%f$r8Ge+lcg0=P%#ZEE_Cd4o16SHujYKHzr4*^Kh=OW`
zNF;-jNid4Y9(u4SVZn%AdN2u%qK7~T!UBnUQKBb%>CEgBG;n@%&i~vqbIxT(sz$=M
z$DFanf)B{76*vJ8s{u?BjI`Jio|rje{|W(zq|gM!Toa{!s}Ha!zF!V>iBeuAdRWMe
z$)W(6DQ>VzW{Ei#VtL{Va|+ADB-3gm<Ir#_07P_viD_$(i1PyRmX{^x84$b*)No*#
zESNYyJaGEtIaz6Fz!utr-3gSDpDX>=?)HPUM<|A@Z5}#vf?T<%oVDfyZW(N_dTdso
zz?;s=yevTunJ4Whkwp&hoXG^BgR>~t(WTgkF!!RD>U0cZnCXbJW#R%PR~4@*K2&s6
zHbK4#H=pA+T{lRl{bV22@p<YFMk<rT@F||$rGj`sW)`p;B^39mXtcng(sa+;X(op=
z_=q|Ri6$zDxu{iaP~5NBu6S6nN3mb=lHveSM>Wk~M)V)U4%&(lBL>k;ti(969?ytT
zydoaJcVY*A6B8=iOLUE-e<uE|DeBdw8cs|3C>H&izxbw_{r}9MoC^>ywG#1Fdm>)z
zPsMO{k+_!~6Sh$yjv65`Z8+kaF-~8KTkfrqyVip{ou0Lh$;-8it2tMC;R-NjWCg%9
za(q4++Qw|-@ucsQxld|&4Z=28>b8wWuY+~Q<&~ew*69VWXCAw3Lbm58qZf}Q!jfA!
z9w&Eab6x01TT{zqYW~fi>BnBt<#}J75ijItM0s}V-C3=oU%P0nyoeTM9z7j}NLa+J
eB3>R&4Ox$vn6=_5+uqQ4+uoFK(;Azo$^HxXMw2@L

diff --git a/Modules/VMware.vSphere.SsoAdmin/netcoreapp2.0/VMware.vSphere.SsoAdminClient.dll b/Modules/VMware.vSphere.SsoAdmin/netcoreapp2.0/VMware.vSphere.SsoAdminClient.dll
index eef1a7d502081df0cec73ac2c9aef3735647325f..c91a1b22ff80db523f9e141dfcfcc407dd0e7533 100644
GIT binary patch
delta 116
zcmZqZ;A!aKnb5(~^uej8v8T0%acd7#N{4_8x9r-9cU^qeU6;M5rMF6bTPIUM0Sl+b
z(-+f2eli6JOlSY?T*cPm-L;hCw8Op6Qq#BmWICq+6^(|8g48>xE9zZ4GsEk=$k+GV
K7yV+2;{*Uup);cZ

delta 116
zcmZqZ;A!aKnb5)VC*AmcV^3=j<JKOgln#Muo<@3e@@9HBEL_qxrPDukTPIUM0gLUu
z&WY1Qeli6JuwOTmU`)E@vG9`pubmOc1gCHL$#hNuD%z0<6$Ppnym|NeG{w_w(e*nx
My|*v=#T3U00H#hfF8}}l

diff --git a/Modules/VMware.vSphere.SsoAdmin/src/VMware.vSphere.SsoAdmin.Client/VMware.vSphere.SsoAdmin.Utils/StirngToSecureStringArgumentTransformationAttribute.cs b/Modules/VMware.vSphere.SsoAdmin/src/VMware.vSphere.SsoAdmin.Client/VMware.vSphere.SsoAdmin.Utils/StirngToSecureStringArgumentTransformationAttribute.cs
new file mode 100644
index 0000000..740c5b5
--- /dev/null
+++ b/Modules/VMware.vSphere.SsoAdmin/src/VMware.vSphere.SsoAdmin.Client/VMware.vSphere.SsoAdmin.Utils/StirngToSecureStringArgumentTransformationAttribute.cs
@@ -0,0 +1,38 @@
+// **************************************************************************
+//  Copyright 2020 VMware, Inc.
+// **************************************************************************
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Management.Automation;
+using System.Security;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace VMware.vSphere.SsoAdmin.Utils
+{
+   public class StirngToSecureStringArgumentTransformationAttribute : ArgumentTransformationAttribute
+   {
+      private static class SecureStringConverter
+      {
+         public static SecureString ToSecureString(string value) {
+            var result = new SecureString();
+
+            foreach (var c in value.ToCharArray()) {
+               result.AppendChar(c);
+            }
+
+            return result;
+         }
+      }
+
+      public override object Transform(EngineIntrinsics engineIntrinsics, object inputData) {
+         object result = inputData;
+         if (inputData is string s) {
+            result = SecureStringConverter.ToSecureString(s);
+         }
+         return result;
+      }
+   }
+}
diff --git a/Modules/VMware.vSphere.SsoAdmin/src/VMware.vSphere.SsoAdmin.Client/VMware.vSphere.SsoAdmin.Utils/VMware.vSphere.SsoAdmin.Utils.csproj b/Modules/VMware.vSphere.SsoAdmin/src/VMware.vSphere.SsoAdmin.Client/VMware.vSphere.SsoAdmin.Utils/VMware.vSphere.SsoAdmin.Utils.csproj
index 02974f9..631cd09 100644
--- a/Modules/VMware.vSphere.SsoAdmin/src/VMware.vSphere.SsoAdmin.Client/VMware.vSphere.SsoAdmin.Utils/VMware.vSphere.SsoAdmin.Utils.csproj
+++ b/Modules/VMware.vSphere.SsoAdmin/src/VMware.vSphere.SsoAdmin.Client/VMware.vSphere.SsoAdmin.Utils/VMware.vSphere.SsoAdmin.Utils.csproj
@@ -14,9 +14,11 @@
     <PackageReference Include="System.ServiceModel.Http" Version="4.4.0" />
     <PackageReference Include="System.ServiceModel.NetTcp" Version="4.4.0" />
     <PackageReference Include="System.ServiceModel.Security" Version="4.4.0" />
+    <PackageReference Include="Microsoft.PowerShell.5.ReferenceAssemblies" Version="1.0.0" />
   </ItemGroup>
   
   <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
+    <PackageReference Include="Microsoft.WSMan.Runtime" Version="6.1.0" />
     <PackageReference Include="VMware.System.Private.ServiceModel" Version="4.4.4" />
   </ItemGroup>
 
diff --git a/Modules/VMware.vSphere.SsoAdmin/src/VMware.vSphere.SsoAdmin.Client/VMware.vSphere.SsoAdminClient.Tests/IntegrationTests.cs b/Modules/VMware.vSphere.SsoAdmin/src/VMware.vSphere.SsoAdmin.Client/VMware.vSphere.SsoAdminClient.Tests/IntegrationTests.cs
index 625bfa4..d51de00 100644
--- a/Modules/VMware.vSphere.SsoAdmin/src/VMware.vSphere.SsoAdmin.Client/VMware.vSphere.SsoAdminClient.Tests/IntegrationTests.cs
+++ b/Modules/VMware.vSphere.SsoAdmin/src/VMware.vSphere.SsoAdmin.Client/VMware.vSphere.SsoAdminClient.Tests/IntegrationTests.cs
@@ -13,7 +13,7 @@ namespace VMware.vSphere.SsoAdminClient.Tests
    {
       private string _vc = "<vc>";
       private string _user = "<user>";
-      private string _rawPassword = "<password";
+      private string _rawPassword = "<password>";
       private SecureString _password;
       [SetUp]
       public void Setup() {