From 70e717b38085cf0bc525c95ecd527fae3b1d13af Mon Sep 17 00:00:00 2001
From: Alex Wolowiecki <alwolowi@microsoft.com>
Date: Thu, 9 Nov 2017 13:09:28 -0800
Subject: [PATCH 1/4] Mobile center API token input

---
 .../Dialogs/SetAPItokenDialog.xaml            | 31 ++++++++++++
 .../Dialogs/SetAPItokenDialog.xaml.cs         | 27 ++++++++++
 .../Dialogs/SetAPItokenDialogViewModel.cs     | 39 +++++++++++++++
 .../SetAPItokenDialogViewModelProperties.cs   | 28 +++++++++++
 .../HoloLensCommander.csproj                  | 10 ++++
 .../HoloLensCommander/MainPage.xaml           |  7 +++
 .../HoloLensCommander/MainWindowViewModel.cs  |  7 +++
 .../MainWindowViewModelCommands.cs            | 21 ++++++++
 .../MainWindowViewModelProperties.cs          | 50 +++++++++++++++++++
 .../HoloLensCommander/Utilities/UserToken.cs  | 18 +++++++
 10 files changed, 238 insertions(+)
 create mode 100644 HoloLensCommander/HoloLensCommander/Dialogs/SetAPItokenDialog.xaml
 create mode 100644 HoloLensCommander/HoloLensCommander/Dialogs/SetAPItokenDialog.xaml.cs
 create mode 100644 HoloLensCommander/HoloLensCommander/Dialogs/SetAPItokenDialogViewModel.cs
 create mode 100644 HoloLensCommander/HoloLensCommander/Dialogs/SetAPItokenDialogViewModelProperties.cs
 create mode 100644 HoloLensCommander/HoloLensCommander/Utilities/UserToken.cs

diff --git a/HoloLensCommander/HoloLensCommander/Dialogs/SetAPItokenDialog.xaml b/HoloLensCommander/HoloLensCommander/Dialogs/SetAPItokenDialog.xaml
new file mode 100644
index 00000000..93c51833
--- /dev/null
+++ b/HoloLensCommander/HoloLensCommander/Dialogs/SetAPItokenDialog.xaml
@@ -0,0 +1,31 @@
+<ContentDialog
+    x:Class="HoloLensCommander.SetAPItokenDialog"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:HoloLensCommander"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d"
+    Title="Set API Token"
+    PrimaryButtonText="Ok"
+    SecondaryButtonText="Cancel"
+    PrimaryButtonClick="ContentDialog_PrimaryButtonClick"
+    SecondaryButtonClick="ContentDialog_SecondaryButtonClick">
+    
+    <StackPanel>
+        <Canvas
+            Width="350" Height="50">
+            <TextBlock 
+                x:Name="TokenLabel"
+                Text="Token"
+                FontSize="16" 
+                Canvas.Top="16" Canvas.Left="5"/>
+            <TextBox 
+                x:Name="token"
+                Text="{Binding Path= APIToken, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" 
+                ToolTipService.ToolTip="Mobile Center API Token"
+                Width="200" 
+                Canvas.Top="10" Canvas.Left="85"/>
+        </Canvas>
+    </StackPanel>
+</ContentDialog>
diff --git a/HoloLensCommander/HoloLensCommander/Dialogs/SetAPItokenDialog.xaml.cs b/HoloLensCommander/HoloLensCommander/Dialogs/SetAPItokenDialog.xaml.cs
new file mode 100644
index 00000000..b28aaf39
--- /dev/null
+++ b/HoloLensCommander/HoloLensCommander/Dialogs/SetAPItokenDialog.xaml.cs
@@ -0,0 +1,27 @@
+using Windows.UI.Xaml.Controls;
+
+// The Content Dialog item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238
+
+namespace HoloLensCommander
+{
+    public sealed partial class SetAPItokenDialog : ContentDialog
+    {
+        private UserToken apiToken;
+
+        public SetAPItokenDialog(UserToken APItoken)
+        {
+            this.apiToken = APItoken;
+            this.DataContext = new SetAPItokenDialogViewModel(APItoken);
+            this.InitializeComponent();
+        }
+
+        private void ContentDialog_PrimaryButtonClick(ContentDialog sender, ContentDialogButtonClickEventArgs args)
+        {
+            ((SetAPItokenDialogViewModel)this.DataContext).UpdateAPItoken(this.apiToken);
+        }
+
+        private void ContentDialog_SecondaryButtonClick(ContentDialog sender, ContentDialogButtonClickEventArgs args)
+        {
+        }
+    }
+}
diff --git a/HoloLensCommander/HoloLensCommander/Dialogs/SetAPItokenDialogViewModel.cs b/HoloLensCommander/HoloLensCommander/Dialogs/SetAPItokenDialogViewModel.cs
new file mode 100644
index 00000000..63b2cfa4
--- /dev/null
+++ b/HoloLensCommander/HoloLensCommander/Dialogs/SetAPItokenDialogViewModel.cs
@@ -0,0 +1,39 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Net;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace HoloLensCommander
+{
+    public partial class SetAPItokenDialogViewModel : INotifyPropertyChanged
+    {
+        /// <summary>
+        /// Event that is notified when a property value has changed.
+        /// </summary>
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        public SetAPItokenDialogViewModel(UserToken apiToken)
+        {
+            this.APIToken= apiToken.ApiToken;
+        }
+
+        /// <summary>
+        /// Sends the PropertyChanged events to registered handlers.
+        /// </summary>
+        /// <param name="propertyName">The name of property that has changed.</param>
+        private void NotifyPropertyChanged(string propertyName)
+        {
+            this.PropertyChanged?.Invoke(
+                this,
+                new PropertyChangedEventArgs(propertyName));
+        }
+
+        internal void UpdateAPItoken(UserToken apiToken)
+        {
+            apiToken.ApiToken = this.APIToken;
+        }
+    }
+}
diff --git a/HoloLensCommander/HoloLensCommander/Dialogs/SetAPItokenDialogViewModelProperties.cs b/HoloLensCommander/HoloLensCommander/Dialogs/SetAPItokenDialogViewModelProperties.cs
new file mode 100644
index 00000000..d0295fec
--- /dev/null
+++ b/HoloLensCommander/HoloLensCommander/Dialogs/SetAPItokenDialogViewModelProperties.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace HoloLensCommander
+{
+    public partial class SetAPItokenDialogViewModel
+    {
+        private string apiToken = string.Empty;
+        public string APIToken
+        {
+            get
+            {
+                return this.apiToken;
+            }
+            set
+            {
+                if (this.apiToken!=value)
+                {
+                    this.apiToken = value;
+                    this.NotifyPropertyChanged(nameof(APIToken));
+                }
+            }
+        }
+    }
+}
diff --git a/HoloLensCommander/HoloLensCommander/HoloLensCommander.csproj b/HoloLensCommander/HoloLensCommander/HoloLensCommander.csproj
index f7e966a1..5a34f318 100644
--- a/HoloLensCommander/HoloLensCommander/HoloLensCommander.csproj
+++ b/HoloLensCommander/HoloLensCommander/HoloLensCommander.csproj
@@ -131,6 +131,11 @@
     <Compile Include="Dialogs\ManageAppsDialogViewModelProperties.cs" />
     <Compile Include="Dialogs\MixedRealityViewDialogViewModel.cs" />
     <Compile Include="Dialogs\MixedRealityViewDialogViewModelProperties.cs" />
+    <Compile Include="Dialogs\SetAPItokenDialog.xaml.cs">
+      <DependentUpon>SetAPItokenDialog.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Dialogs\SetAPItokenDialogViewModel.cs" />
+    <Compile Include="Dialogs\SetAPItokenDialogViewModelProperties.cs" />
     <Compile Include="Dialogs\SetCredentialsDialogViewModel.cs" />
     <Compile Include="Dialogs\SetCredentialsDialogViewModelProperties.cs" />
     <Compile Include="Dialogs\SetIpdDialog.xaml.cs">
@@ -174,6 +179,7 @@
     <Compile Include="Utilities\Settings.cs" />
     <Compile Include="Utilities\TagInformation.cs" />
     <Compile Include="Utilities\UserInformation.cs" />
+    <Compile Include="Utilities\UserToken.cs" />
     <Compile Include="Utilities\Utilities.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -212,6 +218,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Dialogs\SetAPItokenDialog.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Dialogs\SetIpdDialog.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
diff --git a/HoloLensCommander/HoloLensCommander/MainPage.xaml b/HoloLensCommander/HoloLensCommander/MainPage.xaml
index 6952a6c3..6515ef19 100644
--- a/HoloLensCommander/HoloLensCommander/MainPage.xaml
+++ b/HoloLensCommander/HoloLensCommander/MainPage.xaml
@@ -315,6 +315,13 @@
                     Command="{Binding Path=UseDesktopFilterCommand}"
                     HorizontalAlignment="Left" Width="130" 
                     Canvas.Left="545" Canvas.Top="8"/>
+            <Button 
+                Content="&#xEE57;" 
+                ToolTipService.ToolTip="Enter API token"
+                Command="{Binding Path=ShowSetAPItokenCommand}"
+                FontFamily="Segoe MDL2 Assets"
+                Width="50" Height="40"
+                Canvas.Top="5" Canvas.Left="675"/>
         </Canvas>
         <ScrollViewer Grid.Column="1" Grid.Row="1"
             VerticalScrollBarVisibility="Auto" VerticalScrollMode="Auto">
diff --git a/HoloLensCommander/HoloLensCommander/MainWindowViewModel.cs b/HoloLensCommander/HoloLensCommander/MainWindowViewModel.cs
index 67a19c48..def8b272 100644
--- a/HoloLensCommander/HoloLensCommander/MainWindowViewModel.cs
+++ b/HoloLensCommander/HoloLensCommander/MainWindowViewModel.cs
@@ -20,6 +20,7 @@ partial class MainWindowViewModel : INotifyPropertyChanged, IDisposable
         /// Values used to store and retrieve settings data.
         /// </summary>
         private static readonly string AutoReconnectKey = "autoReconnect";
+        private static readonly string DefaultAPItokenKey = "defaultAPItokenKey";
         private static readonly string DefaultNetworkKeyKey = "defaultNetworkKey";
         private static readonly string DefaultPasswordKey = "defaultPassword";
         private static readonly string DefaultSsidKey = "defaultSsid";
@@ -375,6 +376,12 @@ await this.ConnectToDeviceAsync(
                     this.SelectAllDevices();
                 });
 
+            this.ShowSetAPItokenCommand = new Command(
+                async (parameter) =>
+                {
+                    await this.ShowSetAPItoken();
+                });
+
             this.ShowSetCredentialsCommand = new Command(
                 async (parameter) =>
                 {
diff --git a/HoloLensCommander/HoloLensCommander/MainWindowViewModelCommands.cs b/HoloLensCommander/HoloLensCommander/MainWindowViewModelCommands.cs
index 1cdbf170..d57e5e71 100644
--- a/HoloLensCommander/HoloLensCommander/MainWindowViewModelCommands.cs
+++ b/HoloLensCommander/HoloLensCommander/MainWindowViewModelCommands.cs
@@ -586,6 +586,23 @@ private async Task ShowSetCredentials()
             }
         }
 
+        public ICommand ShowSetAPItokenCommand
+        { get; private set; }
+
+        private async Task ShowSetAPItoken()
+        {
+            UserToken apiToken = new UserToken(this.ApiToken);
+
+            SetAPItokenDialog apiTokenDialogs = new SetAPItokenDialog(apiToken);
+            ContentDialogResult dialogResult = await apiTokenDialogs.ShowAsync();
+
+            if (dialogResult==ContentDialogResult.Primary)
+            {
+                this.ApiToken = apiToken.ApiToken;
+                this.SaveApplicationSettings();
+            }
+        }
+
         /// <summary>
         /// Command used to display the settings dialog.
         /// </summary>
@@ -860,6 +877,8 @@ private void LoadApplicationSettings()
             this.UserName = this.appSettings.Values[DefaultUserNameKey] as string;
             this.Password = this.appSettings.Values[DefaultPasswordKey] as string;
 
+            this.ApiToken = this.appSettings.Values[DefaultAPItokenKey] as string;
+
             this.defaultSsid = this.appSettings.Values[DefaultSsidKey] as string;
             this.defaultNetworkKey = this.appSettings.Values[DefaultNetworkKeyKey] as string;
 
@@ -983,6 +1002,8 @@ private void SaveApplicationSettings()
             this.appSettings.Values[DefaultUserNameKey] = this.UserName;
             this.appSettings.Values[DefaultPasswordKey] = this.Password;
 
+            this.appSettings.Values[DefaultAPItokenKey] = this.ApiToken;
+
             this.appSettings.Values[DefaultSsidKey] = this.defaultSsid;
             this.appSettings.Values[DefaultNetworkKeyKey] = this.defaultNetworkKey;
 
diff --git a/HoloLensCommander/HoloLensCommander/MainWindowViewModelProperties.cs b/HoloLensCommander/HoloLensCommander/MainWindowViewModelProperties.cs
index 110516e3..700833b1 100644
--- a/HoloLensCommander/HoloLensCommander/MainWindowViewModelProperties.cs
+++ b/HoloLensCommander/HoloLensCommander/MainWindowViewModelProperties.cs
@@ -33,6 +33,44 @@ private set
             }
         }
 
+        /// <summary>
+        /// Gets or sets the API Token to be used when connecting to mobile center.
+        /// </summary>
+        private string apiToken = string.Empty;
+        public string ApiToken
+        {
+            get
+            {
+                return this.apiToken;
+            }
+
+            set
+            {
+                if (this.apiToken != value)
+                {
+                    this.apiToken = value;
+                    this.UpdateAPItoken();
+                }
+            }
+        }
+
+        private bool apiTokenSet = false;
+        public bool ApiTokenSet
+        {
+            get
+            {
+                return this.apiTokenSet;
+            }
+            set
+            {
+                if (apiTokenSet!=value)
+                {
+                    apiTokenSet = value;
+                    this.NotifyPropertyChanged("APItokenSet");
+                }
+            }
+        }
+
         /// <summary>
         /// Gets a value indicating whether or not the application management controls are to be enabled.
         /// </summary>
@@ -238,6 +276,18 @@ private set
             }
         }
 
+        private void UpdateAPItoken()
+        {
+            bool haveAPItoken = false;
+
+            if (!string.IsNullOrWhiteSpace(this.ApiToken))
+            {
+                haveAPItoken = true;
+            }
+
+            this.ApiTokenSet = haveAPItoken;
+        }
+
         /// <summary>
         /// Updates whether or not connections are safe to be restored.
         /// </summary>
diff --git a/HoloLensCommander/HoloLensCommander/Utilities/UserToken.cs b/HoloLensCommander/HoloLensCommander/Utilities/UserToken.cs
new file mode 100644
index 00000000..cd286c23
--- /dev/null
+++ b/HoloLensCommander/HoloLensCommander/Utilities/UserToken.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace HoloLensCommander
+{
+    public class UserToken
+    {
+        public UserToken(string apiToken)
+        {
+            ApiToken = apiToken;
+        }
+
+        public string ApiToken { get; set; }
+    }
+}

From e3b3f9dc8b3a7f7509dc06ef8188f7f4e6990b63 Mon Sep 17 00:00:00 2001
From: Alex Wolowiecki <alwolowi@microsoft.com>
Date: Fri, 17 Nov 2017 14:02:15 -0800
Subject: [PATCH 2/4] Display app list dialog box

---
 .../Dialogs/MobileCenterAppsDialog.xaml       | 56 +++++++++++++++++++
 .../Dialogs/MobileCenterAppsDialog.xaml.cs    | 44 +++++++++++++++
 .../MobileCenterAppsDialogViewModel.cs        | 26 +++++++++
 ...bileCenterAppsDialogViewModelProperties.cs | 24 ++++++++
 .../HoloLensCommander.csproj                  | 11 ++++
 .../HoloLensCommander/MainPage.xaml           |  7 +++
 .../HoloLensCommander/MainWindowViewModel.cs  |  6 ++
 .../MainWindowViewModelCommands.cs            | 16 ++++++
 .../Utilities/AppResponse.cs                  | 16 ++++++
 .../HoloLensCommander/Utilities/WebRequest.cs | 40 +++++++++++++
 .../HoloLensCommander/project.json            |  1 +
 11 files changed, 247 insertions(+)
 create mode 100644 HoloLensCommander/HoloLensCommander/Dialogs/MobileCenterAppsDialog.xaml
 create mode 100644 HoloLensCommander/HoloLensCommander/Dialogs/MobileCenterAppsDialog.xaml.cs
 create mode 100644 HoloLensCommander/HoloLensCommander/Dialogs/MobileCenterAppsDialogViewModel.cs
 create mode 100644 HoloLensCommander/HoloLensCommander/Dialogs/MobileCenterAppsDialogViewModelProperties.cs
 create mode 100644 HoloLensCommander/HoloLensCommander/Utilities/AppResponse.cs
 create mode 100644 HoloLensCommander/HoloLensCommander/Utilities/WebRequest.cs

diff --git a/HoloLensCommander/HoloLensCommander/Dialogs/MobileCenterAppsDialog.xaml b/HoloLensCommander/HoloLensCommander/Dialogs/MobileCenterAppsDialog.xaml
new file mode 100644
index 00000000..7b6f23c9
--- /dev/null
+++ b/HoloLensCommander/HoloLensCommander/Dialogs/MobileCenterAppsDialog.xaml
@@ -0,0 +1,56 @@
+<ContentDialog
+    x:Class="HoloLensCommander.MobileCenterAppsDialog"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:HoloLensCommander"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d"
+    Title="Mobile Center Apps"
+    PrimaryButtonText="Close"
+    PrimaryButtonClick="ContentDialog_PrimaryButtonClick"
+    MaxHeight="800">
+
+    <StackPanel>
+        <Canvas 
+            Width="450" Height="40">
+            <TextBlock 
+                x:Name="UserDisplayNameLabel"
+                Text="Display Name"
+                FontSize="16" 
+                Canvas.Top="10"/>
+            <TextBlock 
+                x:Name="UserDisplayName"
+                Text="{Binding Path=DeviceAddress}"
+                ToolTipService.ToolTip="The address of the target device"
+                FontSize="16"
+                Width="347"
+                Canvas.Left="103" Canvas.Top="10"/>
+        </Canvas>
+        <Canvas
+            Width="450" Height="440">
+            <TextBlock 
+                x:Name="UserEmailLabel"
+                Text="Email"
+                FontSize="16"/>
+            <ListBox 
+                x:Name="MobileCenterAppsList"
+                ItemsSource="{Binding MobileCenterApps}"
+                SelectedItem="{Binding SelectedMobileCenterApp, Mode=TwoWay}"
+                ToolTipService.ToolTip="Mobile Center apps from your organization"
+                Width="395" Height= "400"  
+                BorderThickness="1" 
+                ScrollViewer.HorizontalScrollMode="Auto"
+                ScrollViewer.HorizontalScrollBarVisibility="Auto"
+                Canvas.Top="26"/>
+            <Button 
+                x:Name="downloadSelectedApp"
+                Content="&#xE896;"
+                Command="{Binding RefreshInstalledAppsCommand}"
+                ToolTipService.ToolTip="Download selected app from the Mobile Center"
+                FontFamily="Segoe MDL2 Assets" FontSize="24" 
+                Width="50" Height="40" 
+                Canvas.Left="400" Canvas.Top="25"/>
+        </Canvas>
+    </StackPanel>
+</ContentDialog>
diff --git a/HoloLensCommander/HoloLensCommander/Dialogs/MobileCenterAppsDialog.xaml.cs b/HoloLensCommander/HoloLensCommander/Dialogs/MobileCenterAppsDialog.xaml.cs
new file mode 100644
index 00000000..6c1f22d6
--- /dev/null
+++ b/HoloLensCommander/HoloLensCommander/Dialogs/MobileCenterAppsDialog.xaml.cs
@@ -0,0 +1,44 @@
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using System.Threading.Tasks;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Controls.Primitives;
+using Windows.UI.Xaml.Data;
+using Windows.UI.Xaml.Input;
+using Windows.UI.Xaml.Media;
+using Windows.UI.Xaml.Navigation;
+using Windows.Web.Http;
+using Windows.Web.Http.Headers;
+using Windows.Web.Http.Filters;
+
+// The Content Dialog item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238
+
+namespace HoloLensCommander
+{
+    public sealed partial class MobileCenterAppsDialog : ContentDialog
+    {
+       
+
+        public MobileCenterAppsDialog()
+        {
+            jsonParse();
+            this.InitializeComponent();
+        }
+
+        private void ContentDialog_PrimaryButtonClick(ContentDialog sender, ContentDialogButtonClickEventArgs args)
+        {
+            //close the dialog
+        }
+
+        private void ContentDialog_SecondaryButtonClick(ContentDialog sender, ContentDialogButtonClickEventArgs args)
+        {
+        }
+    }
+}
diff --git a/HoloLensCommander/HoloLensCommander/Dialogs/MobileCenterAppsDialogViewModel.cs b/HoloLensCommander/HoloLensCommander/Dialogs/MobileCenterAppsDialogViewModel.cs
new file mode 100644
index 00000000..5520e2fd
--- /dev/null
+++ b/HoloLensCommander/HoloLensCommander/Dialogs/MobileCenterAppsDialogViewModel.cs
@@ -0,0 +1,26 @@
+using Newtonsoft.Json;
+using System.ComponentModel;
+using System.Net;
+
+namespace HoloLensCommander
+{
+    public partial class MobileCenterAppsDialogViewModel : INotifyPropertyChanged
+    {
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        public MobileCenterAppsDialogViewModel (AppResponse[] appResponseList)
+        {
+            for (int i = 0; i < appResponseList.Length; i++)
+            {
+                this.MobileCenterApps.Add(appResponseList[i].name);
+            }
+            
+        }
+        private void NotifyPropertyChanged(string propertyName)
+        {
+            this.PropertyChanged?.Invoke(
+                this,
+                new PropertyChangedEventArgs(propertyName));
+        }
+    }
+}
\ No newline at end of file
diff --git a/HoloLensCommander/HoloLensCommander/Dialogs/MobileCenterAppsDialogViewModelProperties.cs b/HoloLensCommander/HoloLensCommander/Dialogs/MobileCenterAppsDialogViewModelProperties.cs
new file mode 100644
index 00000000..7041dabe
--- /dev/null
+++ b/HoloLensCommander/HoloLensCommander/Dialogs/MobileCenterAppsDialogViewModelProperties.cs
@@ -0,0 +1,24 @@
+using System.Collections.Generic;
+
+namespace HoloLensCommander
+{
+    public partial class MobileCenterAppsDialogViewModel
+    {
+        private List<string> mobileCenterApps = new List<string>();
+        public List<string> MobileCenterApps
+        {
+            get
+            {
+                return this.mobileCenterApps;
+            }
+            set
+            {
+                if (this.mobileCenterApps != value)
+                {
+                    this.mobileCenterApps = value;
+                    this.NotifyPropertyChanged(nameof(MobileCenterApps));
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/HoloLensCommander/HoloLensCommander/HoloLensCommander.csproj b/HoloLensCommander/HoloLensCommander/HoloLensCommander.csproj
index 5a34f318..373483d3 100644
--- a/HoloLensCommander/HoloLensCommander/HoloLensCommander.csproj
+++ b/HoloLensCommander/HoloLensCommander/HoloLensCommander.csproj
@@ -131,6 +131,11 @@
     <Compile Include="Dialogs\ManageAppsDialogViewModelProperties.cs" />
     <Compile Include="Dialogs\MixedRealityViewDialogViewModel.cs" />
     <Compile Include="Dialogs\MixedRealityViewDialogViewModelProperties.cs" />
+    <Compile Include="Dialogs\MobileCenterAppsDialog.xaml.cs">
+      <DependentUpon>MobileCenterAppsDialog.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Dialogs\MobileCenterAppsDialogViewModel.cs" />
+    <Compile Include="Dialogs\MobileCenterAppsDialogViewModelProperties.cs" />
     <Compile Include="Dialogs\SetAPItokenDialog.xaml.cs">
       <DependentUpon>SetAPItokenDialog.xaml</DependentUpon>
     </Compile>
@@ -170,6 +175,7 @@
       <DependentUpon>SettingsDialog.xaml</DependentUpon>
     </Compile>
     <Compile Include="Utilities\AppInstallFiles.cs" />
+    <Compile Include="Utilities\AppResponse.cs" />
     <Compile Include="Utilities\ConnectionInformation.cs" />
     <Compile Include="Utilities\ConnectOptions.cs" />
     <Compile Include="Utilities\DeviceMonitorControlComparer.cs" />
@@ -181,6 +187,7 @@
     <Compile Include="Utilities\UserInformation.cs" />
     <Compile Include="Utilities\UserToken.cs" />
     <Compile Include="Utilities\Utilities.cs" />
+    <Compile Include="Utilities\WebRequest.cs" />
   </ItemGroup>
   <ItemGroup>
     <AppxManifest Include="Package.appxmanifest">
@@ -218,6 +225,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Dialogs\MobileCenterAppsDialog.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Dialogs\SetAPItokenDialog.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/HoloLensCommander/HoloLensCommander/MainPage.xaml b/HoloLensCommander/HoloLensCommander/MainPage.xaml
index 6515ef19..1d3beac0 100644
--- a/HoloLensCommander/HoloLensCommander/MainPage.xaml
+++ b/HoloLensCommander/HoloLensCommander/MainPage.xaml
@@ -322,6 +322,13 @@
                 FontFamily="Segoe MDL2 Assets"
                 Width="50" Height="40"
                 Canvas.Top="5" Canvas.Left="675"/>
+            <Button 
+                Content="&#xE71D;" 
+                ToolTipService.ToolTip="Display Mobile Center app list"
+                Command="{Binding Path=ShowMobileCenterAppsCommand}"
+                FontFamily="Segoe MDL2 Assets"
+                Width="50" Height="40"
+                Canvas.Top="5" Canvas.Left="730"/>
         </Canvas>
         <ScrollViewer Grid.Column="1" Grid.Row="1"
             VerticalScrollBarVisibility="Auto" VerticalScrollMode="Auto">
diff --git a/HoloLensCommander/HoloLensCommander/MainWindowViewModel.cs b/HoloLensCommander/HoloLensCommander/MainWindowViewModel.cs
index def8b272..a24e30d4 100644
--- a/HoloLensCommander/HoloLensCommander/MainWindowViewModel.cs
+++ b/HoloLensCommander/HoloLensCommander/MainWindowViewModel.cs
@@ -376,6 +376,12 @@ await this.ConnectToDeviceAsync(
                     this.SelectAllDevices();
                 });
 
+            this.ShowMobileCenterAppsCommand = new Command(
+                async (parameter) =>
+                {
+                    await this.ShowMobileCenterApps();
+                });
+
             this.ShowSetAPItokenCommand = new Command(
                 async (parameter) =>
                 {
diff --git a/HoloLensCommander/HoloLensCommander/MainWindowViewModelCommands.cs b/HoloLensCommander/HoloLensCommander/MainWindowViewModelCommands.cs
index d57e5e71..502dc9f0 100644
--- a/HoloLensCommander/HoloLensCommander/MainWindowViewModelCommands.cs
+++ b/HoloLensCommander/HoloLensCommander/MainWindowViewModelCommands.cs
@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
+using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -586,6 +587,21 @@ private async Task ShowSetCredentials()
             }
         }
 
+        public ICommand ShowMobileCenterAppsCommand
+        { get; private set; }
+
+        private async Task ShowMobileCenterApps()
+        {
+            AppCenterWebRequest appCenterWebRequest = new AppCenterWebRequest();
+            string requestResponseJson = await appCenterWebRequest.HttpWebRequest();
+
+            AppResponse[] appResponse;
+            appResponse = JsonConvert.DeserializeObject<AppResponse[]>(requestResponseJson);
+
+            ContentDialog mobileCenterAppsDialog = new MobileCenterAppsDialog(appResponse);
+            await mobileCenterAppsDialog.ShowAsync();
+        }
+
         public ICommand ShowSetAPItokenCommand
         { get; private set; }
 
diff --git a/HoloLensCommander/HoloLensCommander/Utilities/AppResponse.cs b/HoloLensCommander/HoloLensCommander/Utilities/AppResponse.cs
new file mode 100644
index 00000000..6a27b8f2
--- /dev/null
+++ b/HoloLensCommander/HoloLensCommander/Utilities/AppResponse.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace HoloLensCommander
+{
+    public class AppResponse
+    {
+        public string display_name;
+        public string name;
+        public string app_secret;
+        public string id;
+    }
+}
diff --git a/HoloLensCommander/HoloLensCommander/Utilities/WebRequest.cs b/HoloLensCommander/HoloLensCommander/Utilities/WebRequest.cs
new file mode 100644
index 00000000..fd8c72e6
--- /dev/null
+++ b/HoloLensCommander/HoloLensCommander/Utilities/WebRequest.cs
@@ -0,0 +1,40 @@
+using System;
+using System.Threading.Tasks;
+using Windows.Web.Http;
+using Windows.Web.Http.Headers;
+
+namespace HoloLensCommander
+{
+    public class AppCenterWebRequest
+    {
+        public async Task<string> HttpWebRequest()
+        {
+            HttpClient httpClient = new HttpClient();
+
+            var request = new HttpRequestMessage();
+
+            request.Headers.Accept.Add(new HttpMediaTypeWithQualityHeaderValue("application/json"));
+            request.Headers.Append("X-API-Token", "9b8e356d29f80de93d88fac0252e48f8fbe22e96");
+
+            Uri uri = new Uri("https://api.appcenter.ms/v0.1/apps");
+            request.RequestUri = uri;
+
+
+            HttpResponseMessage httpResponseMessage = new HttpResponseMessage();
+            string httpResponseBody = "";
+
+            try
+            {
+                httpResponseMessage = await httpClient.SendRequestAsync(request);
+                httpResponseMessage.EnsureSuccessStatusCode();
+                httpResponseBody = await httpResponseMessage.Content.ReadAsStringAsync();
+            }
+            catch (Exception ex)
+            {
+                httpResponseBody = "Error: " + ex.HResult.ToString("X") + " Message: " + ex.Message;
+            }
+
+            return httpResponseBody;
+        }
+    }
+}
\ No newline at end of file
diff --git a/HoloLensCommander/HoloLensCommander/project.json b/HoloLensCommander/HoloLensCommander/project.json
index e0d00f0f..3d8189e6 100644
--- a/HoloLensCommander/HoloLensCommander/project.json
+++ b/HoloLensCommander/HoloLensCommander/project.json
@@ -2,6 +2,7 @@
   "dependencies": {
     "Microsoft.NETCore.UniversalWindowsPlatform": "5.1.0",
 	"WindowsDevicePortalWrapper": "0.9.4"
+    "Newtonsoft.Json": "10.0.3",
   },
   "frameworks": {
     "uap10.0": {}

From 7bfdaa0d22169fbffa37d722e2d6fc6f302566a4 Mon Sep 17 00:00:00 2001
From: Alex Wolowiecki <alwolowi@microsoft.com>
Date: Tue, 9 Jan 2018 13:54:53 -0800
Subject: [PATCH 3/4] Downloads specific app from list to localcache

---
 .../Dialogs/MobileCenterAppsDialog.xaml       |  4 +-
 .../Dialogs/MobileCenterAppsDialog.xaml.cs    |  6 +-
 .../MobileCenterAppsDialogViewModel.cs        |  8 +-
 ...MobileCenterAppsDialogViewModelCommands.cs | 34 +++++++
 ...bileCenterAppsDialogViewModelProperties.cs | 17 ++++
 .../HoloLensCommander.csproj                  |  1 +
 .../HoloLensCommander/MainPage.xaml           |  1 +
 .../Utilities/AppResponse.cs                  | 11 +++
 .../HoloLensCommander/Utilities/WebRequest.cs | 98 +++++++++++++++++++
 9 files changed, 173 insertions(+), 7 deletions(-)
 create mode 100644 HoloLensCommander/HoloLensCommander/Dialogs/MobileCenterAppsDialogViewModelCommands.cs

diff --git a/HoloLensCommander/HoloLensCommander/Dialogs/MobileCenterAppsDialog.xaml b/HoloLensCommander/HoloLensCommander/Dialogs/MobileCenterAppsDialog.xaml
index 7b6f23c9..8f95c19f 100644
--- a/HoloLensCommander/HoloLensCommander/Dialogs/MobileCenterAppsDialog.xaml
+++ b/HoloLensCommander/HoloLensCommander/Dialogs/MobileCenterAppsDialog.xaml
@@ -46,8 +46,8 @@
             <Button 
                 x:Name="downloadSelectedApp"
                 Content="&#xE896;"
-                Command="{Binding RefreshInstalledAppsCommand}"
-                ToolTipService.ToolTip="Download selected app from the Mobile Center"
+                Command="{Binding DownloadInstallMobileAppsCommand}"
+                ToolTipService.ToolTip="Download and install selected app from the Mobile Center"
                 FontFamily="Segoe MDL2 Assets" FontSize="24" 
                 Width="50" Height="40" 
                 Canvas.Left="400" Canvas.Top="25"/>
diff --git a/HoloLensCommander/HoloLensCommander/Dialogs/MobileCenterAppsDialog.xaml.cs b/HoloLensCommander/HoloLensCommander/Dialogs/MobileCenterAppsDialog.xaml.cs
index 6c1f22d6..490da9d1 100644
--- a/HoloLensCommander/HoloLensCommander/Dialogs/MobileCenterAppsDialog.xaml.cs
+++ b/HoloLensCommander/HoloLensCommander/Dialogs/MobileCenterAppsDialog.xaml.cs
@@ -24,11 +24,9 @@ namespace HoloLensCommander
 {
     public sealed partial class MobileCenterAppsDialog : ContentDialog
     {
-       
-
-        public MobileCenterAppsDialog()
+        public MobileCenterAppsDialog(AppResponse[] appResponse)
         {
-            jsonParse();
+            this.DataContext = new MobileCenterAppsDialogViewModel(appResponse);
             this.InitializeComponent();
         }
 
diff --git a/HoloLensCommander/HoloLensCommander/Dialogs/MobileCenterAppsDialogViewModel.cs b/HoloLensCommander/HoloLensCommander/Dialogs/MobileCenterAppsDialogViewModel.cs
index 5520e2fd..b4d29d77 100644
--- a/HoloLensCommander/HoloLensCommander/Dialogs/MobileCenterAppsDialogViewModel.cs
+++ b/HoloLensCommander/HoloLensCommander/Dialogs/MobileCenterAppsDialogViewModel.cs
@@ -14,7 +14,13 @@ public MobileCenterAppsDialogViewModel (AppResponse[] appResponseList)
             {
                 this.MobileCenterApps.Add(appResponseList[i].name);
             }
-            
+
+            //Register the commands for the mobile center apps dialog
+            this.DownloadInstallMobileAppsCommand = new Command(
+                async (parameter) =>
+                {
+                    await this.DownloadInstallMobileAppsAsync(appResponseList);
+                });
         }
         private void NotifyPropertyChanged(string propertyName)
         {
diff --git a/HoloLensCommander/HoloLensCommander/Dialogs/MobileCenterAppsDialogViewModelCommands.cs b/HoloLensCommander/HoloLensCommander/Dialogs/MobileCenterAppsDialogViewModelCommands.cs
new file mode 100644
index 00000000..4f298c8d
--- /dev/null
+++ b/HoloLensCommander/HoloLensCommander/Dialogs/MobileCenterAppsDialogViewModelCommands.cs
@@ -0,0 +1,34 @@
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Input;
+
+namespace HoloLensCommander
+{
+    public partial class MobileCenterAppsDialogViewModel
+    {
+        AppCenterWebRequest appCenterWebRequest = new AppCenterWebRequest();
+        public ICommand DownloadInstallMobileAppsCommand
+        { get; private set; }
+
+        private async Task DownloadInstallMobileAppsAsync(AppResponse[] appList)
+        {
+            string selectedApp = this.SelectedMobileCenterApp as string;
+            DownloadResponse downloadResponse;
+
+            for (int i = 0; i < appList.Length; i++)
+            {
+                if (selectedApp == appList[i].name || selectedApp == appList[i].display_name)
+                {
+                    string requestResponseJson = await appCenterWebRequest.HttpReleaseRequest(appList[i].app_secret);
+                    downloadResponse = JsonConvert.DeserializeObject<DownloadResponse>(requestResponseJson);
+                    appCenterWebRequest.HttpDownloadRequest(downloadResponse.download_url, selectedApp);
+                    break;  
+                }  
+            } 
+        }
+    }
+}
diff --git a/HoloLensCommander/HoloLensCommander/Dialogs/MobileCenterAppsDialogViewModelProperties.cs b/HoloLensCommander/HoloLensCommander/Dialogs/MobileCenterAppsDialogViewModelProperties.cs
index 7041dabe..4f2af9ea 100644
--- a/HoloLensCommander/HoloLensCommander/Dialogs/MobileCenterAppsDialogViewModelProperties.cs
+++ b/HoloLensCommander/HoloLensCommander/Dialogs/MobileCenterAppsDialogViewModelProperties.cs
@@ -20,5 +20,22 @@ public List<string> MobileCenterApps
                 }
             }
         }
+
+        private string selectedMobileCenterApp = string.Empty;
+        public string SelectedMobileCenterApp
+        {
+            get
+            {
+                return this.selectedMobileCenterApp;
+            }
+            set
+            {
+                if (this.selectedMobileCenterApp!=value)
+                {
+                    this.selectedMobileCenterApp = value;
+                    this.NotifyPropertyChanged(nameof(SelectedMobileCenterApp));
+                }
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/HoloLensCommander/HoloLensCommander/HoloLensCommander.csproj b/HoloLensCommander/HoloLensCommander/HoloLensCommander.csproj
index 373483d3..2e17604e 100644
--- a/HoloLensCommander/HoloLensCommander/HoloLensCommander.csproj
+++ b/HoloLensCommander/HoloLensCommander/HoloLensCommander.csproj
@@ -135,6 +135,7 @@
       <DependentUpon>MobileCenterAppsDialog.xaml</DependentUpon>
     </Compile>
     <Compile Include="Dialogs\MobileCenterAppsDialogViewModel.cs" />
+    <Compile Include="Dialogs\MobileCenterAppsDialogViewModelCommands.cs" />
     <Compile Include="Dialogs\MobileCenterAppsDialogViewModelProperties.cs" />
     <Compile Include="Dialogs\SetAPItokenDialog.xaml.cs">
       <DependentUpon>SetAPItokenDialog.xaml</DependentUpon>
diff --git a/HoloLensCommander/HoloLensCommander/MainPage.xaml b/HoloLensCommander/HoloLensCommander/MainPage.xaml
index 1d3beac0..ce856f77 100644
--- a/HoloLensCommander/HoloLensCommander/MainPage.xaml
+++ b/HoloLensCommander/HoloLensCommander/MainPage.xaml
@@ -326,6 +326,7 @@
                 Content="&#xE71D;" 
                 ToolTipService.ToolTip="Display Mobile Center app list"
                 Command="{Binding Path=ShowMobileCenterAppsCommand}"
+                IsEnabled="{Binding Path=ApiTokenSet}"
                 FontFamily="Segoe MDL2 Assets"
                 Width="50" Height="40"
                 Canvas.Top="5" Canvas.Left="730"/>
diff --git a/HoloLensCommander/HoloLensCommander/Utilities/AppResponse.cs b/HoloLensCommander/HoloLensCommander/Utilities/AppResponse.cs
index 6a27b8f2..973e7f2f 100644
--- a/HoloLensCommander/HoloLensCommander/Utilities/AppResponse.cs
+++ b/HoloLensCommander/HoloLensCommander/Utilities/AppResponse.cs
@@ -6,6 +6,9 @@
 
 namespace HoloLensCommander
 {
+    /// <summary>
+    /// Class to create an object that saves app metadata for each application returned from enumerated JSON response.
+    /// </summary>
     public class AppResponse
     {
         public string display_name;
@@ -13,4 +16,12 @@ public class AppResponse
         public string app_secret;
         public string id;
     }
+
+    /// <summary>
+    ///  Class to create an object that saves download URL for a specific application returned from enumerated JSON response.
+    /// </summary>
+    public class DownloadResponse
+    {
+        public string download_url;
+    }
 }
diff --git a/HoloLensCommander/HoloLensCommander/Utilities/WebRequest.cs b/HoloLensCommander/HoloLensCommander/Utilities/WebRequest.cs
index fd8c72e6..0f141c57 100644
--- a/HoloLensCommander/HoloLensCommander/Utilities/WebRequest.cs
+++ b/HoloLensCommander/HoloLensCommander/Utilities/WebRequest.cs
@@ -1,5 +1,10 @@
 using System;
+using System.IO.Compression;
 using System.Threading.Tasks;
+using Windows.Foundation;
+using Windows.Networking.BackgroundTransfer;
+using Windows.Storage;
+using Windows.Storage.Streams;
 using Windows.Web.Http;
 using Windows.Web.Http.Headers;
 
@@ -36,5 +41,98 @@ public async Task<string> HttpWebRequest()
 
             return httpResponseBody;
         }
+
+        /// <summary>
+        /// A web request for latest App Center release of the selected app. Release information includes download URL. 
+        /// </summary>
+        /// <param name="appSecret"></param>
+        /// <returns></returns>
+        public async Task<string> HttpReleaseRequest(string appSecret)
+        {
+            HttpClient httpClient = new HttpClient();
+
+            var request = new HttpRequestMessage();
+
+            request.Headers.Accept.Add(new HttpMediaTypeWithQualityHeaderValue("application/json"));
+            request.Headers.Append("X-API-Token", "9b8e356d29f80de93d88fac0252e48f8fbe22e96"); //TODO remove hardcoded API Token 
+
+            Uri uri = new Uri("https://api.appcenter.ms/v0.1/sdk/apps/"+ appSecret+"/releases/latest"); //how do I format this?
+            request.RequestUri = uri;
+
+            HttpResponseMessage httpResponseMessage = new HttpResponseMessage();
+            string httpResponseBody = "";
+
+            try
+            {
+                httpResponseMessage = await httpClient.SendRequestAsync(request);
+                httpResponseMessage.EnsureSuccessStatusCode();
+                httpResponseBody = await httpResponseMessage.Content.ReadAsStringAsync();
+            }
+            catch (Exception ex)
+            {
+                httpResponseBody = "Error: " + ex.HResult.ToString("X") + " Message: " + ex.Message;
+            }
+
+            return httpResponseBody;
+        }
+
+        /// <summary>
+        /// A web request to download a release of an app.
+        /// </summary>
+        /// <param name="downloadUrl"></param>
+        /// <param name="appName"></param>
+        public async void HttpDownloadRequest(string downloadUrl, string appName)
+        {
+            try
+            {
+                Uri uri = new Uri(downloadUrl);
+                HttpClient httpClient = new HttpClient();
+
+                IInputStream content = await httpClient.GetInputStreamAsync(uri);
+
+                HttpStreamContent httpStream = new HttpStreamContent(content);
+                IBuffer buffer = await httpStream.ReadAsBufferAsync();
+
+                StorageFolder cacheFolder = ApplicationData.Current.LocalCacheFolder;
+                StorageFile file = await cacheFolder.CreateFileAsync(appName+".appxbundle", CreationCollisionOption.GenerateUniqueName);
+
+                IRandomAccessStream stream = await file.OpenAsync(FileAccessMode.ReadWrite);
+
+                using (var outputStream = stream.GetOutputStreamAt(0))
+                {
+                    using (var dataWriter = new DataWriter(outputStream))
+                    {
+                        dataWriter.WriteBuffer(buffer);
+                        await dataWriter.StoreAsync();
+                        await outputStream.FlushAsync();
+                    }
+                }
+                stream.Dispose();
+                httpStream.Dispose();
+
+                //Unzipping the download
+
+                //var archive = await cacheFolder.GetFileAsync(appName + ".zip");
+                //ZipFile.ExtractToDirectory(archive.Path, cacheFolder.Path);
+
+
+                //Background downloader 
+
+                //BackgroundDownloader backgroundDownloader = new BackgroundDownloader();
+                ////DownloadOperation downloadOperation = await backgroundDownloader.CreateDownloadAsync(uri, downloadedAppx, inputStream);
+                //DownloadOperation downloadOperation = backgroundDownloader.CreateDownload(uri, downloadedAppx);
+                ////operation = await Task.Run(() => { return downloadOperation.StartAsync(); });
+
+
+            }
+            catch (Exception)
+            {
+                throw;
+            }
+            finally
+            {
+                await Windows.System.Launcher.LaunchFolderAsync(ApplicationData.Current.LocalCacheFolder);
+            }
+        }
     }
 }
\ No newline at end of file

From 858b06991e5866767b450ca50a59b98a23186d3c Mon Sep 17 00:00:00 2001
From: Alex Wolowiecki <alwolowi@microsoft.com>
Date: Tue, 9 Jan 2018 16:56:03 -0800
Subject: [PATCH 4/4] Username and password support for app center auth

---
 .../Dialogs/SetAPItokenDialog.xaml            | 28 ++++++++++
 .../Dialogs/SetAPItokenDialog.xaml.cs         | 10 +++-
 .../Dialogs/SetAPItokenDialogViewModel.cs     | 10 +++-
 .../SetAPItokenDialogViewModelProperties.cs   | 33 +++++++++++
 .../HoloLensCommander/MainWindowViewModel.cs  |  2 +
 .../MainWindowViewModelCommands.cs            |  4 ++
 .../MainWindowViewModelProperties.cs          | 56 +++++++++++++++++++
 7 files changed, 139 insertions(+), 4 deletions(-)

diff --git a/HoloLensCommander/HoloLensCommander/Dialogs/SetAPItokenDialog.xaml b/HoloLensCommander/HoloLensCommander/Dialogs/SetAPItokenDialog.xaml
index 93c51833..05ba6e04 100644
--- a/HoloLensCommander/HoloLensCommander/Dialogs/SetAPItokenDialog.xaml
+++ b/HoloLensCommander/HoloLensCommander/Dialogs/SetAPItokenDialog.xaml
@@ -27,5 +27,33 @@
                 Width="200" 
                 Canvas.Top="10" Canvas.Left="85"/>
         </Canvas>
+        <Canvas
+            Width="350" Height="50">
+            <TextBlock 
+                x:Name="Password"
+                Text="Password"
+                FontSize="16" 
+                Canvas.Top="16" Canvas.Left="5"/>
+            <TextBox 
+                x:Name="password"
+                Text="{Binding Path= AppCenterPassword, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" 
+                ToolTipService.ToolTip="Mobile Center API Token"
+                Width="200" 
+                Canvas.Top="10" Canvas.Left="85"/>
+        </Canvas>
+        <Canvas
+            Width="350" Height="50">
+            <TextBlock 
+                x:Name="UserName"
+                Text="User"
+                FontSize="16" 
+                Canvas.Top="16" Canvas.Left="5"/>
+            <TextBox 
+                x:Name="username"
+                Text="{Binding Path= AppCenterUserName, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" 
+                ToolTipService.ToolTip="Mobile Center UserName"
+                Width="200" 
+                Canvas.Top="10" Canvas.Left="85"/>
+        </Canvas>
     </StackPanel>
 </ContentDialog>
diff --git a/HoloLensCommander/HoloLensCommander/Dialogs/SetAPItokenDialog.xaml.cs b/HoloLensCommander/HoloLensCommander/Dialogs/SetAPItokenDialog.xaml.cs
index b28aaf39..5c5591c2 100644
--- a/HoloLensCommander/HoloLensCommander/Dialogs/SetAPItokenDialog.xaml.cs
+++ b/HoloLensCommander/HoloLensCommander/Dialogs/SetAPItokenDialog.xaml.cs
@@ -1,4 +1,5 @@
-using Windows.UI.Xaml.Controls;
+using System.Net;
+using Windows.UI.Xaml.Controls;
 
 // The Content Dialog item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238
 
@@ -7,17 +8,20 @@ namespace HoloLensCommander
     public sealed partial class SetAPItokenDialog : ContentDialog
     {
         private UserToken apiToken;
+        private NetworkCredential appCenterCredentials;
 
-        public SetAPItokenDialog(UserToken APItoken)
+        public SetAPItokenDialog(UserToken APItoken, NetworkCredential AppCenterCredentials)
         {
             this.apiToken = APItoken;
-            this.DataContext = new SetAPItokenDialogViewModel(APItoken);
+            this.appCenterCredentials = AppCenterCredentials;
+            this.DataContext = new SetAPItokenDialogViewModel(APItoken, AppCenterCredentials);
             this.InitializeComponent();
         }
 
         private void ContentDialog_PrimaryButtonClick(ContentDialog sender, ContentDialogButtonClickEventArgs args)
         {
             ((SetAPItokenDialogViewModel)this.DataContext).UpdateAPItoken(this.apiToken);
+            ((SetAPItokenDialogViewModel)this.DataContext).UpdateAppCenterCredentials(this.appCenterCredentials);
         }
 
         private void ContentDialog_SecondaryButtonClick(ContentDialog sender, ContentDialogButtonClickEventArgs args)
diff --git a/HoloLensCommander/HoloLensCommander/Dialogs/SetAPItokenDialogViewModel.cs b/HoloLensCommander/HoloLensCommander/Dialogs/SetAPItokenDialogViewModel.cs
index 63b2cfa4..93d49c48 100644
--- a/HoloLensCommander/HoloLensCommander/Dialogs/SetAPItokenDialogViewModel.cs
+++ b/HoloLensCommander/HoloLensCommander/Dialogs/SetAPItokenDialogViewModel.cs
@@ -15,9 +15,11 @@ public partial class SetAPItokenDialogViewModel : INotifyPropertyChanged
         /// </summary>
         public event PropertyChangedEventHandler PropertyChanged;
 
-        public SetAPItokenDialogViewModel(UserToken apiToken)
+        public SetAPItokenDialogViewModel(UserToken apiToken, NetworkCredential appCenterCredentials)
         {
             this.APIToken= apiToken.ApiToken;
+            this.AppCenterUserName = appCenterCredentials.UserName;
+            this.AppCenterPassword = appCenterCredentials.Password;
         }
 
         /// <summary>
@@ -35,5 +37,11 @@ internal void UpdateAPItoken(UserToken apiToken)
         {
             apiToken.ApiToken = this.APIToken;
         }
+
+        internal void UpdateAppCenterCredentials(NetworkCredential appCenterCredentials)
+        {
+            appCenterCredentials.UserName = this.AppCenterUserName;
+            appCenterCredentials.Password = this.AppCenterPassword;
+        }
     }
 }
diff --git a/HoloLensCommander/HoloLensCommander/Dialogs/SetAPItokenDialogViewModelProperties.cs b/HoloLensCommander/HoloLensCommander/Dialogs/SetAPItokenDialogViewModelProperties.cs
index d0295fec..ac4e70d5 100644
--- a/HoloLensCommander/HoloLensCommander/Dialogs/SetAPItokenDialogViewModelProperties.cs
+++ b/HoloLensCommander/HoloLensCommander/Dialogs/SetAPItokenDialogViewModelProperties.cs
@@ -24,5 +24,38 @@ public string APIToken
                 }
             }
         }
+
+        private string appCenterUserName = string.Empty;
+        public string AppCenterUserName
+        {
+            get
+            {
+                return this.appCenterUserName;
+            }
+            set
+            {
+                if (this.appCenterUserName!=value)
+                {
+                    this.appCenterUserName = value;
+                    this.NotifyPropertyChanged(nameof(AppCenterUserName));
+                }
+            }
+        }
+        private string appCenterPassword = string.Empty;
+        public string AppCenterPassword
+        {
+            get
+            {
+                return this.appCenterPassword;
+            }
+            set
+            {
+                if (this.appCenterPassword != value)
+                {
+                    this.appCenterPassword = value;
+                    this.NotifyPropertyChanged(nameof(AppCenterPassword));
+                }
+            }
+        }
     }
 }
diff --git a/HoloLensCommander/HoloLensCommander/MainWindowViewModel.cs b/HoloLensCommander/HoloLensCommander/MainWindowViewModel.cs
index a24e30d4..0db5f746 100644
--- a/HoloLensCommander/HoloLensCommander/MainWindowViewModel.cs
+++ b/HoloLensCommander/HoloLensCommander/MainWindowViewModel.cs
@@ -21,6 +21,8 @@ partial class MainWindowViewModel : INotifyPropertyChanged, IDisposable
         /// </summary>
         private static readonly string AutoReconnectKey = "autoReconnect";
         private static readonly string DefaultAPItokenKey = "defaultAPItokenKey";
+        private static readonly string DefaultAppCenterUserNameKey = "defaultAppCenterUserName";
+        private static readonly string DefaultAppCenterPasswordKey = "defaultAppCenterPassword";
         private static readonly string DefaultNetworkKeyKey = "defaultNetworkKey";
         private static readonly string DefaultPasswordKey = "defaultPassword";
         private static readonly string DefaultSsidKey = "defaultSsid";
diff --git a/HoloLensCommander/HoloLensCommander/MainWindowViewModelCommands.cs b/HoloLensCommander/HoloLensCommander/MainWindowViewModelCommands.cs
index 502dc9f0..c0633265 100644
--- a/HoloLensCommander/HoloLensCommander/MainWindowViewModelCommands.cs
+++ b/HoloLensCommander/HoloLensCommander/MainWindowViewModelCommands.cs
@@ -894,6 +894,8 @@ private void LoadApplicationSettings()
             this.Password = this.appSettings.Values[DefaultPasswordKey] as string;
 
             this.ApiToken = this.appSettings.Values[DefaultAPItokenKey] as string;
+            this.AppCenterUserName = this.appSettings.Values[DefaultAppCenterUserNameKey] as string;
+            this.AppCenterPassword = this.appSettings.Values[DefaultAppCenterPasswordKey] as string;
 
             this.defaultSsid = this.appSettings.Values[DefaultSsidKey] as string;
             this.defaultNetworkKey = this.appSettings.Values[DefaultNetworkKeyKey] as string;
@@ -1019,6 +1021,8 @@ private void SaveApplicationSettings()
             this.appSettings.Values[DefaultPasswordKey] = this.Password;
 
             this.appSettings.Values[DefaultAPItokenKey] = this.ApiToken;
+            this.appSettings.Values[DefaultAppCenterUserNameKey] = this.AppCenterUserName;
+            this.appSettings.Values[DefaultAppCenterPasswordKey] = this.AppCenterPassword;
 
             this.appSettings.Values[DefaultSsidKey] = this.defaultSsid;
             this.appSettings.Values[DefaultNetworkKeyKey] = this.defaultNetworkKey;
diff --git a/HoloLensCommander/HoloLensCommander/MainWindowViewModelProperties.cs b/HoloLensCommander/HoloLensCommander/MainWindowViewModelProperties.cs
index 700833b1..e12e3a25 100644
--- a/HoloLensCommander/HoloLensCommander/MainWindowViewModelProperties.cs
+++ b/HoloLensCommander/HoloLensCommander/MainWindowViewModelProperties.cs
@@ -71,6 +71,50 @@ public bool ApiTokenSet
             }
         }
 
+        private bool appCenterCredentialsSet = false;
+        public bool AppCenterCredentialsSet
+        {
+            get
+            {
+                return this.appCenterCredentialsSet;
+            }
+
+            private set
+            {
+                if (this.appCenterCredentialsSet != value)
+                {
+                    this.appCenterCredentialsSet = value;
+                    this.NotifyPropertyChanged("AppCenterCredentialsSet");
+                }
+            }
+        }
+
+        private string appCenterUserName = string.Empty;
+        public string AppCenterUserName
+        {
+            get
+            {
+                return this.appCenterUserName;
+            }
+            set
+            {
+                appCenterUserName = value;
+            }
+        }
+
+        private string appCenterPassword = string.Empty;
+        public string AppCenterPassword
+        {
+            get
+            {
+                return this.appCenterPassword;
+            }
+            set
+            {
+                appCenterPassword = value;
+            }
+        }
+
         /// <summary>
         /// Gets a value indicating whether or not the application management controls are to be enabled.
         /// </summary>
@@ -310,6 +354,18 @@ private void UpdateCanReconnect()
             }
         }
 
+        private void UpdateAppCenterCredentials()
+        {
+            bool haveAppCenterCredentials = false;
+
+            if (!string.IsNullOrWhiteSpace(this.AppCenterUserName) && !string.IsNullOrWhiteSpace(this.AppCenterPassword))
+            {
+                haveAppCenterCredentials = true;
+            }
+            this.AppCenterCredentialsSet = haveAppCenterCredentials;
+            this.UpdateCanReconnect();
+        }
+
         /// <summary>
         /// Updates whether or not credentials have been set to valid strings.
         /// </summary>