Merge pull request #10 from privacyidea/improve_setup

improve setup, set new version

ADFSInstaller/Dialogues.wxs

@@ -6,9 +6,9 @@
             <!-- PAGE 1-->
             <Dialog Id="ConfigurationDlg" Width="370" Height="270" Title="[ProductName] Setup" NoMinimize="yes">
                 <!-- MAIN -->
-                <Control Type="Edit" Id="in_url" Width="164" Height="15" X="90" Y="56" Text="Server URL" Property="URL" Help="Server URL including scheme and path." />
-                <Control Type="CheckBox" Id="cbox_ssl" Width="123" Height="15" X="38" Y="75" Text="Disable SSL Verification" CheckBoxValue="1" Property="DISABLESSL" />
-                <Control Type="Edit" Id="in_realm" Width="74" Height="15" X="90" Y="98" Text="Realm" Property="REALM" />
+                <Control Type="Edit" Id="in_url" Width="143" Height="15" X="112" Y="56" Text="https://..." Property="URL" Help="Server URL including scheme and path." />
+                <Control Type="CheckBox" Id="cbox_ssl" Width="123" Height="15" X="38" Y="79" Text="Disable SSL verification" CheckBoxValue="1" Property="DISABLESSL" />
+                <Control Type="Edit" Id="in_realm" Width="74" Height="15" X="90" Y="109" Text="Realm" Property="REALM" />
                 <!-- TRIGGER CHALLENGE / SEND PASSWORD CONTROLS -->
                 <!-- The checkboxes are mutually exclusive and the inputs only active if the trigger challenge on is checked -->
                 <Control Type="CheckBox" Id="cbox_trigger" Width="188" Height="17" X="38" Y="154" Text="Trigger challenges using service account" CheckBoxValue="1" Property="TRIGGERCHALLENGES">
@@ -50,8 +50,8 @@
                     <Text>{\WixUI_Font_Title}AD FS Provider Configuration</Text>
                 </Control>
                 <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="2" />
-                <Control Type="Text" Id="label_url" Width="44" Height="9" X="38" Y="58" Text="Server URL" />
-                <Control Type="Text" Id="label_realm" Width="44" Height="25" X="38" Y="98" Text="Realm (optional)" />
+                <Control Type="Text" Id="label_url" Width="65" Height="15" X="38" Y="58" Text="privacyIDEA URL" />
+                <Control Type="Text" Id="label_realm" Width="44" Height="25" X="38" Y="105" Text="Realm (optional)" />
                 <Control Type="Text" Id="label_user" Width="26" Height="10" X="38" Y="180" Text="User:" />
                 <Control Type="Text" Id="label_pass" Width="23" Height="10" X="145" Y="180" Text="Pass:" />
             </Dialog>

ADFSInstaller/Product.wxs

@@ -31,6 +31,8 @@
     <Property Id="ARPPRODUCTICON" Value="icon.ico"/>
 
     <Property Id="ARPURLINFOABOUT" Value="$(var.AppURLInfoAbout)"/>
+    <Property Id="ARPNOREPAIR" Value="yes" Secure="yes" />
+    <Property Id="ARPNOMODIFY" Value="yes" Secure="yes" />
 
     <Condition Message="You need to be an administrator to install this product.">Privileged</Condition>
 

privacyIDEAADFSProvider/Adapter.cs

@@ -308,7 +308,7 @@ public void OnAuthenticationPipelineLoad(IAuthenticationMethodConfigData configD
             RegistryReader rr = new RegistryReader(Log);
             // Read logging entry first to be able to log the reading of the rest if needed
             this.debuglog = rr.Read("debug_log") == "1";
-            
+
             // Read the other defined keys into a dict
             List<string> configKeys = new List<string>(new string[]
             { "use_upn", "url", "disable_ssl", "service_user", "service_pass", "service_realm",

privacyIDEAADFSProvider/Install.ps1

@@ -48,6 +48,6 @@ $appFullName = ([system.reflection.assembly]::loadfile($myDllFullName)).FullName
 
 $typeName = "privacyIDEAADFSProvider.Adapter, "+$appFullName
 
-Register-AdfsAuthenticationProvider -TypeName $typeName -Name "privacyIDEA-ADFSProvider"
+Register-AdfsAuthenticationProvider -TypeName $typeName -Name "privacyIDEAADFSProvider"
 
 Restart-Service adfssrv

privacyIDEAADFSProvider/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.9.0.0")]
-[assembly: AssemblyFileVersion("0.9.0.0")]
+[assembly: AssemblyVersion("0.10.0.0")]
+[assembly: AssemblyFileVersion("0.10.0.0")]

privacyIDEAADFSProvider/Uninstall.ps1

@@ -4,15 +4,15 @@
 $policy = Get-AdfsGlobalAuthenticationPolicy
 
 $primaryIntranetProviders = $policy.PrimaryIntranetAuthenticationProvider
-$primaryIntranetProviders.Remove("privacyIDEA-ADFSProvider") 
+$primaryIntranetProviders.Remove("privacyIDEAADFSProvider") 
 Set-AdfsGlobalAuthenticationPolicy -AdditionalAuthenticationProvider $primaryIntranetProviders
 
 $primaryExtranetProviders = $policy.PrimaryExtranetAuthenticationProvider
-$primaryExtranetProviders.Remove("privacyIDEA-ADFSProvider") 
+$primaryExtranetProviders.Remove("privacyIDEAADFSProvider") 
 Set-AdfsGlobalAuthenticationPolicy -AdditionalAuthenticationProvider $primaryExtranetProviders
 
 $additionalProviders = $policy.AdditionalAuthenticationProvider
-$additionalProviders.Remove("privacyIDEA-ADFSProvider") 
+$additionalProviders.Remove("privacyIDEAADFSProvider") 
 Set-AdfsGlobalAuthenticationPolicy -AdditionalAuthenticationProvider $additionalProviders
 
 # Unregister the provider and restart the AD FS service
@@ -21,7 +21,7 @@ $myPath = Get-Location
 $myDll = 'privacyIDEA-ADFSProvider.dll'
 $myDllFullName = (get-item $myDll).FullName
 
-Unregister-AdfsAuthenticationProvider -Name "privacyIDEA-ADFSProvider" -Confirm:$false -ErrorAction Stop
+Unregister-AdfsAuthenticationProvider -Name "privacyIDEAADFSProvider" -Confirm:$false -ErrorAction Stop
 [System.Reflection.Assembly]::LoadWithPartialName("System.EnterpriseServices")
 $publish = New-Object System.EnterpriseServices.Internal.Publish
 $publish.GacRemove($myDllFullName)