1 files changed, 20 insertions, 26 deletions

diff --git a/MediaBrowser.Api/StartupWizardService.cs b/MediaBrowser.Api/StartupWizardService.cs
index c6345c17f..61d9a90d6 100644
--- a/MediaBrowser.Api/StartupWizardService.cs
+++ b/MediaBrowser.Api/StartupWizardService.cs
@@ -3,7 +3,6 @@ using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Connect;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Net;
-using MediaBrowser.Model.Configuration;
 using System;
 using System.Linq;
 using System.Threading.Tasks;
@@ -14,32 +13,34 @@ using System.Threading;
 
 namespace MediaBrowser.Api
 {
-    [Route("/Startup/Complete", "POST", Summary = "Reports that the startup wizard has been completed")]
+    [Route("/Startup/Complete", "POST", Summary = "Reports that the startup wizard has been completed", IsHidden = true)]
     public class ReportStartupWizardComplete : IReturnVoid
     {
     }
 
-    [Route("/Startup/Info", "GET", Summary = "Gets initial server info")]
-    public class GetStartupInfo : IReturn<StartupInfo>
+    [Route("/Startup/Configuration", "GET", Summary = "Gets initial server configuration", IsHidden = true)]
+    public class GetStartupConfiguration : IReturn<StartupConfiguration>
     {
     }
 
-    [Route("/Startup/Configuration", "GET", Summary = "Gets initial server configuration")]
-    public class GetStartupConfiguration : IReturn<StartupConfiguration>
+    [Route("/Startup/Configuration", "POST", Summary = "Updates initial server configuration", IsHidden = true)]
+    public class UpdateStartupConfiguration : StartupConfiguration, IReturnVoid
     {
     }
 
-    [Route("/Startup/Configuration", "POST", Summary = "Updates initial server configuration")]
-    public class UpdateStartupConfiguration : StartupConfiguration, IReturnVoid
+    [Route("/Startup/RemoteAccess", "POST", Summary = "Updates initial server configuration", IsHidden = true)]
+    public class UpdateRemoteAccessConfiguration : IReturnVoid
     {
+        public bool EnableRemoteAccess { get; set; }
+        public bool EnableAutomaticPortMapping { get; set; }
     }
 
-    [Route("/Startup/User", "GET", Summary = "Gets initial user info")]
+    [Route("/Startup/User", "GET", Summary = "Gets initial user info", IsHidden = true)]
     public class GetStartupUser : IReturn<StartupUser>
     {
     }
 
-    [Route("/Startup/User", "POST", Summary = "Updates initial user info")]
+    [Route("/Startup/User", "POST", Summary = "Updates initial user info", IsHidden = true)]
     public class UpdateStartupUser : StartupUser, IReturn<UpdateStartupUserResult>
     {
     }
@@ -67,7 +68,6 @@ namespace MediaBrowser.Api
         public void Post(ReportStartupWizardComplete request)
         {
             _config.Configuration.IsStartupWizardCompleted = true;
-            _config.Configuration.AutoRunWebApp = true;
             _config.SetOptimalValues();
             _config.SaveConfiguration();
 
@@ -101,14 +101,6 @@ namespace MediaBrowser.Api
             }
         }
 
-        public object Get(GetStartupInfo request)
-        {
-            return new StartupInfo
-            {
-                HasMediaEncoder = !string.IsNullOrWhiteSpace(_mediaEncoder.EncoderPath)
-            };
-        }
-
         public object Get(GetStartupConfiguration request)
         {
             var result = new StartupConfiguration
@@ -129,6 +121,13 @@ namespace MediaBrowser.Api
             _config.SaveConfiguration();
         }
 
+        public void Post(UpdateRemoteAccessConfiguration request)
+        {
+            _config.Configuration.EnableRemoteAccess = request.EnableRemoteAccess;
+            _config.Configuration.EnableUPnP = request.EnableAutomaticPortMapping;
+            _config.SaveConfiguration();
+        }
+
         public object Get(GetStartupUser request)
         {
             var user = _userManager.Users.First();
@@ -152,11 +151,11 @@ namespace MediaBrowser.Api
             if (!string.IsNullOrWhiteSpace(user.ConnectUserName) &&
                 string.IsNullOrWhiteSpace(request.ConnectUserName))
             {
-                await _connectManager.RemoveConnect(user.Id.ToString("N")).ConfigureAwait(false);
+                await _connectManager.RemoveConnect(user).ConfigureAwait(false);
             }
             else if (!string.Equals(user.ConnectUserName, request.ConnectUserName, StringComparison.OrdinalIgnoreCase))
             {
-                result.UserLinkResult = await _connectManager.LinkUser(user.Id.ToString("N"), request.ConnectUserName).ConfigureAwait(false);
+                result.UserLinkResult = await _connectManager.LinkUser(user, request.ConnectUserName).ConfigureAwait(false);
             }
 
             return result;
@@ -170,11 +169,6 @@ namespace MediaBrowser.Api
         public string PreferredMetadataLanguage { get; set; }
     }
 
-    public class StartupInfo
-    {
-        public bool HasMediaEncoder { get; set; }
-    }
-
     public class StartupUser
     {
         public string Name { get; set; }