Desktop: move Authorization to tab under Certificate

Author: webprofusion-chrisc

src/Certify.UI.Shared/Controls/ManagedCertificate/CertificateIdentifiers.xaml

@@ -350,6 +350,14 @@
 
             </TabItem>
 
+            <TabItem
+    MinWidth="100"
+    Controls:HeaderedControlHelper.HeaderFontSize="12"
+    Header="Authorization"
+    IsSelected="False">
+                <managedcertificate:IdentifierAuthorization />
+            </TabItem>
+
             <TabItem
                 MinWidth="100"
                 Controls:HeaderedControlHelper.HeaderFontSize="12"

src/Certify.UI.Shared/Controls/ManagedCertificate/IdentifiersAuthorization.xaml

@@ -31,10 +31,9 @@
             </StackPanel.Resources>
 
             <!--  Authorization Types  -->
-            <StackPanel>
-                <TextBlock Style="{StaticResource Subheading}">Domain Authorization</TextBlock>
-                <TextBlock Style="{StaticResource Instructions}" Text="For a certificate to be issued you must prove control of the domains/identifiers in your request. If any included domain fails authorization the certificate request cannot be completed." />
-                <TextBlock Style="{StaticResource Instructions}" Text="For domains you can choose to validate using HTTP (port 80), or via DNS." />
+            <StackPanel Margin="0,0,0,16">
+                <TextBlock Style="{StaticResource Subheading}">Identifier Authorization</TextBlock>
+                <TextBlock Style="{StaticResource Instructions}" Text="For a certificate to be issued you must prove control of the domains or other identifiers in your certificate request. For domains, you can choose to validate using HTTP (port 80), or via DNS. If any included identifier fails validation the certificate request cannot be completed." />
             </StackPanel>
 
             <ItemsControl
@@ -45,7 +44,7 @@
                     <DataTemplate>
                         <StackPanel>
                             <StackPanel Orientation="Horizontal">
-                                <TextBlock Style="{StaticResource Subheading}">Authorization Settings</TextBlock>
+                                <TextBlock Style="{StaticResource Subheading}">Challenge Response Configuration</TextBlock>
                                 <TextBlock
                                     Margin="8,0,0,0"
                                     Style="{StaticResource Subheading}"

src/Certify.UI.Shared/Controls/ManagedCertificate/ManagedCertificateSettings.xaml

@@ -263,20 +263,6 @@
                     <managedcertificate:CertificateIdentifiers Margin="0,8,0,0" />
                 </TabItem>
 
-                <TabItem
-                    x:Name="TabAuthorization"
-                    MinWidth="100"
-                    Controls:HeaderedControlHelper.HeaderFontSize="12"
-                    AutomationProperties.Name="Authorization">
-                    <TabItem.HeaderTemplate>
-                        <DataTemplate>
-                            <managedcertificate:TabHeader HeaderText="Authorization" IconName="Lock" />
-                        </DataTemplate>
-                    </TabItem.HeaderTemplate>
-
-                    <managedcertificate:IdentifierAuthorization Margin="0,8,0,0" />
-                </TabItem>
-
                 <TabItem
                     x:Name="TabDeployment"
                     MinWidth="100"

src/Certify.UI.Shared/Controls/ManagedCertificate/ManagedCertificateSettings.xaml.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Linq;
 using System.Threading.Tasks;
 using System.Windows;
@@ -70,7 +70,6 @@ private void MainViewModel_PropertyChanged(object sender, System.ComponentModel.
                 {
                     TabDeployment.Visibility = Visibility.Collapsed;
                     TabDomains.Visibility = Visibility.Collapsed;
-                    TabAuthorization.Visibility = Visibility.Collapsed;
                     TabTasks.Visibility = Visibility.Collapsed;
                     TabPreview.Visibility = Visibility.Collapsed;
 
@@ -79,7 +78,6 @@ private void MainViewModel_PropertyChanged(object sender, System.ComponentModel.
                 {
                     TabDeployment.Visibility = Visibility.Visible;
                     TabDomains.Visibility = Visibility.Visible;
-                    TabAuthorization.Visibility = Visibility.Visible;
                     TabTasks.Visibility = Visibility.Visible;
                     TabPreview.Visibility = Visibility.Visible;
                 }