Skip to content

Commit

Permalink
set final guids, better log messages
Browse files Browse the repository at this point in the history
  • Loading branch information
@nilsbehlen
nilsbehlen committed Jun 10, 2021
1 parent 4df34f9 commit e47a9da
Show file tree
Hide file tree
Showing 3 changed files with 96 additions and 109 deletions.
140 changes: 67 additions & 73 deletions ADFSInstaller/Dialogues.wxs
View file
Original file line number Diff line number Diff line change
@@ -1,79 +1,73 @@
<?xml version="1.0" encoding="utf-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Fragment>
<UI>
<TextStyle Id="Tahoma_Bold" FaceName="Tahoma" Size="8" Bold="yes"/>
<!-- 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"/>

<!-- 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">
<Publish Property="SENDEMPTYPASS" Value="{}" Order="1">TRIGGERCHALLENGES</Publish>
</Control>

<Control Type="CheckBox" Id="cbox_emptypass" Width="236" Height="17" X="38" Y="195" Text="Send empty password" CheckBoxValue="1" Property="SENDEMPTYPASS">
<Publish Property="TRIGGERCHALLENGES" Value="{}" Order="1">SENDEMPTYPASS</Publish>
</Control>
<!-- USERNAME AND PASSWORD INPUT -->
<Control Type="Edit" Id="in_serviceuser" Width="78" Height="15" X="38" Y="176" Text="Username" Property="SERVICEUSER"
Help="Username of the service account." ToolTip="Username of the the service account.">
<Condition Action="disable">TRIGGERCHALLENGES&lt;&gt;1</Condition>
<Condition Action="enable">TRIGGERCHALLENGES=1</Condition>
</Control>

<Control Type="Edit" Id="in_servicepass" Width="78" Height="15" X="131" Y="176" Text="Password" Property="SERVICEPASS"
Help="Password of the service account." ToolTip="Password of the service account.">
<Condition Action="disable" >TRIGGERCHALLENGES&lt;&gt;1</Condition>
<Condition Action="enable" >TRIGGERCHALLENGES=1</Condition>
</Control>
<!-- END TRIGGER CHALLENGE / SEND PASSWORD CONTROLS -->

<Control Type="CheckBox" Id="cbox_upn" Width="50" Height="17" X="38" Y="135" Text="Use UPN" CheckBoxValue="1" Property="USEUPN"/>

<Control Type="CheckBox" Id="cbox_debuglog" Width="116" Height="17" X="38" Y="214" Text="Activate debug log" CheckBoxValue="1" Property="DEBUGLOG"/>
<!-- END MAIN -->
<!-- Bottom Controls -->
<Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="&amp;Back">
<!-- <Publish Event="NewDialog" Value="LicenseAgreementDlg">1</Publish>-->
</Control>
<Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="&amp;Next">
<Publish Event="NewDialog" Value="VerifyReadyDlg">URL</Publish>
<Publish Event="SpawnDialog" Value="NoServerURLMessageDlg">URL="Server URL"</Publish>
</Control>
<Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="Cancel">
<Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
</Control>
<Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="WixUI_Bmp_Banner"/>
<Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes">
<Text>Configure server URL and other properties.</Text>
</Control>
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0"/>
<Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes">
<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)"/>
</Dialog>
<!-- END PAGE 1-->
<Dialog Id="NoServerURLMessageDlg" Width="260" Height="85" Title="[ProductName] Setup" NoMinimize="yes">
<!-- <Control Id="Icon" Type="Icon" X="15" Y="15" Width="24" Height="24"
<Fragment>
<UI>
<TextStyle Id="Tahoma_Bold" FaceName="Tahoma" Size="8" Bold="yes" />
<!-- 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" />
<!-- 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">
<Publish Property="SENDEMPTYPASS" Value="{}" Order="1">TRIGGERCHALLENGES</Publish>
</Control>
<Control Type="CheckBox" Id="cbox_emptypass" Width="236" Height="17" X="38" Y="195" Text="Send empty password" CheckBoxValue="1" Property="SENDEMPTYPASS">
<Publish Property="TRIGGERCHALLENGES" Value="{}" Order="1">SENDEMPTYPASS</Publish>
</Control>
<!-- USERNAME AND PASSWORD INPUT -->
<Control Type="Edit" Id="in_serviceuser" Width="78" Height="15" X="65" Y="178" Text="Username" Property="SERVICEUSER" Help="Username of the service account." ToolTip="Username of the the service account.">
<Condition Action="disable">TRIGGERCHALLENGES&lt;&gt;1</Condition>
<Condition Action="enable">TRIGGERCHALLENGES=1</Condition>
</Control>
<Control Type="Edit" Id="in_servicepass" Width="78" Height="15" X="170" Y="178" Text="Password" Property="SERVICEPASS" Help="Password of the service account." ToolTip="Password of the service account.">
<Condition Action="disable">TRIGGERCHALLENGES&lt;&gt;1</Condition>
<Condition Action="enable">TRIGGERCHALLENGES=1</Condition>
</Control>
<!-- END TRIGGER CHALLENGE / SEND PASSWORD CONTROLS -->
<Control Type="CheckBox" Id="cbox_upn" Width="50" Height="17" X="38" Y="135" Text="Use UPN" CheckBoxValue="1" Property="USEUPN" />
<Control Type="CheckBox" Id="cbox_debuglog" Width="116" Height="17" X="38" Y="214" Text="Activate debug log" CheckBoxValue="1" Property="DEBUGLOG" />
<!-- END MAIN -->
<!-- Bottom Controls -->
<Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="&amp;Back">
<!-- <Publish Event="NewDialog" Value="LicenseAgreementDlg">1</Publish>-->
</Control>
<Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="&amp;Next">
<Publish Event="NewDialog" Value="VerifyReadyDlg">URL</Publish>
<Publish Event="SpawnDialog" Value="NoServerURLMessageDlg">URL="Server URL"</Publish>
</Control>
<Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="Cancel">
<Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
</Control>
<Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="WixUI_Bmp_Banner" />
<Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes">
<Text>Configure server URL and other properties.</Text>
</Control>
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
<Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes">
<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_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>
<!-- END PAGE 1-->
<Dialog Id="NoServerURLMessageDlg" Width="260" Height="85" Title="[ProductName] Setup" NoMinimize="yes">
<!-- <Control Id="Icon" Type="Icon" X="15" Y="15" Width="24" Height="24"
ToolTip="Information icon" FixedSize="yes" IconSize="32" Text="ExclamIcon"/>-->
<Control Id="Return" Type="PushButton" X="100" Y="57" Width="56" Height="17" Default="yes" Cancel="yes" Text="&amp;Return">
<Publish Event="EndDialog" Value="Return">1</Publish>
</Control>
<Control Id="Text" Type="Text" X="48" Y="15" Width="194" Height="30" TabSkip="no">
<Text>
<Control Id="Return" Type="PushButton" X="100" Y="57" Width="56" Height="17" Default="yes" Cancel="yes" Text="&amp;Return">
<Publish Event="EndDialog" Value="Return">1</Publish>
</Control>
<Control Id="Text" Type="Text" X="48" Y="15" Width="194" Height="30" TabSkip="no">
<Text>
The Server URL is mandatory!
</Text>
</Control>
</Dialog>
</UI>
</Fragment>
</Control>
</Dialog>
</UI>
</Fragment>
</Wix>
14 changes: 7 additions & 7 deletions ADFSInstaller/Product.wxs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
<CustomAction Id="RunPowerShellUninstall"
BinaryKey="WixCA"
DllEntry="CAQuietExec"
Execute="commit"
Execute="deferred"
Return="check"
Impersonate="no"/>
<!-- END Custom action definitions-->
Expand Down Expand Up @@ -112,7 +112,7 @@
<Custom Action="RunPowerShellInstall" After="InstallInitialize">NOT Installed</Custom>

<Custom Action="SetPowerShellUninstallInput" After="CostFinalize">Installed</Custom>
<Custom Action="RunPowerShellUninstall" Before="RemoveFiles">Installed</Custom>
<Custom Action="RunPowerShellUninstall" After="InstallInitialize">Installed</Custom>
</InstallExecuteSequence>
<!-- END INSTALL EXECUTE SEQUENCE -->

Expand All @@ -125,7 +125,7 @@
<UI Id="MyWixUI_FeatureTree">
<UIRef Id="WixUI_FeatureTree"/>
<DialogRef Id="ConfigurationDlg"/>

<!-- Skip the component dialog which is part of this UI set -->
<Publish Dialog="ConfigurationDlg" Control="Back" Event="NewDialog" Value="LicenseAgreementDlg">1</Publish>
<Publish Dialog="LicenseAgreementDlg" Control="Next" Event="NewDialog" Value="ConfigurationDlg">1</Publish>
<Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="ConfigurationDlg" Order="1">NOT Installed OR (WixUI_InstallMode = "Change" AND USER_IS_ADMINISTRATOR = "1" )</Publish>
Expand Down Expand Up @@ -167,15 +167,15 @@
</Component>

<!-- PROVIDER DLL COMPONENT (NO GAC) -->
<Component Id='ProviderDll' Guid='{26543458-C9DE-4A4A-95E7-AE8AE0C81522}' DiskId='1'>
<Component Id='ProviderDll' Guid='{539D96DC-692A-4BF3-B74A-31CEC8700A4B}' DiskId='1'>
<File Id="ProviderDll"
Name="$(var.privacyIDEAADFSProvider.TargetFileName)"
Source="$(var.privacyIDEAADFSProvider.TargetPath)"
KeyPath="yes"/>
</Component>

<!-- NEWTONSOFT JSON COMPONENT (GAC) -->
<Component Id='NewtonsoftJsonDll' Guid='{A9474B9F-B8B5-4076-B3E0-017AFE46A0B9}' DiskId='1'>
<Component Id='NewtonsoftJsonDll' Guid='{CC78BE32-EB49-4008-8EFC-5DE7F7F862FA}' DiskId='1'>
<File Id="NewtonsoftJsonDll"
Name="Newtonsoft.Json.dll"
Source="$(var.privacyIDEAADFSProvider.TargetDir)\Newtonsoft.Json.dll"
Expand All @@ -184,14 +184,14 @@
</Component>

<!-- INSTALL SCRIPT -->
<Component Id="InstallScript" Guid="{E29E0C5D-BF16-4C7D-98DD-9A08A59869D1}" DiskId="1">
<Component Id="InstallScript" Guid="{3F012B01-1F99-414D-86B7-A4B33372EEAD}" DiskId="1">
<File Id="InstallScript"
Name="Install.ps1"
Source ="$(var.privacyIDEAADFSProvider.ProjectDir)\Install.ps1"/>
</Component>

<!-- UNINSTALL SCRIPT -->
<Component Id="UninstallScript" Guid="{93BDFBB0-CF92-458A-A6B9-D864825CD622}" DiskId="1">
<Component Id="UninstallScript" Guid="{0E2A4A57-C01D-4652-8FBF-E128D07B36B4}" DiskId="1">
<File Id="UninstallScript"
Name="Uninstall.ps1"
Source ="$(var.privacyIDEAADFSProvider.ProjectDir)\Uninstall.ps1"/>
Expand Down
Loading

0 comments on commit e47a9da

Please sign in to comment.