From d5a8f6499d1227d888b89a68d3f2b3e04109f3c5 Mon Sep 17 00:00:00 2001
From: Cyberboss <Cyberboss@users.noreply.github.com>
Date: Mon, 20 Aug 2018 11:16:54 -0400
Subject: [PATCH] Move default user definitions to the API

---
 src/Tgstation.Server.Api/Models/User.cs       | 10 ++++++++++
 .../Models/DatabaseSeeder.cs                  | 20 +++++--------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/Tgstation.Server.Api/Models/User.cs b/src/Tgstation.Server.Api/Models/User.cs
index a18856a366..1431dd2db9 100644
--- a/src/Tgstation.Server.Api/Models/User.cs
+++ b/src/Tgstation.Server.Api/Models/User.cs
@@ -3,6 +3,16 @@
 	/// <inheritdoc />
 	public class User : Internal.User
 	{
+		/// <summary>
+		/// The name of the default admin user
+		/// </summary>
+		public const string AdminName = "Admin";
+
+		/// <summary>
+		/// The default admin password
+		/// </summary>
+		public const string DefaultAdminPassword = "ISolemlySwearToDeleteTheDataDirectory";
+
 		/// <summary>
 		/// The <see cref="User"/> who created this <see cref="User"/>
 		/// </summary>
diff --git a/src/Tgstation.Server.Host/Models/DatabaseSeeder.cs b/src/Tgstation.Server.Host/Models/DatabaseSeeder.cs
index 4603c3e09d..5076d67cb8 100644
--- a/src/Tgstation.Server.Host/Models/DatabaseSeeder.cs
+++ b/src/Tgstation.Server.Host/Models/DatabaseSeeder.cs
@@ -11,16 +11,6 @@ namespace Tgstation.Server.Host.Models
 	/// <inheritdoc />
 	sealed class DatabaseSeeder : IDatabaseSeeder
 	{
-		/// <summary>
-		/// The name of the default admin user
-		/// </summary>
-		const string AdminName = "Admin";
-
-		/// <summary>
-		/// The default admin password
-		/// </summary>
-		const string DefaultAdminPassword = "ISolemlySwearToDeleteTheDataDirectory";
-
 		/// <summary>
 		/// The <see cref="ICryptographySuite"/> for the <see cref="DatabaseContext{TParentContext}"/>
 		/// </summary>
@@ -43,11 +33,11 @@ namespace Tgstation.Server.Host.Models
 				AdministrationRights = (AdministrationRights)~0U,
 				CreatedAt = DateTimeOffset.Now,
 				InstanceManagerRights = (InstanceManagerRights)~0U,
-				Name = AdminName,
-				CanonicalName = AdminName.ToUpperInvariant(),
+				Name = Api.Models.User.AdminName,
+				CanonicalName = Api.Models.User.AdminName.ToUpperInvariant(),
 				Enabled = true,
 			};
-			cryptographySuite.SetUserPassword(admin, DefaultAdminPassword);
+			cryptographySuite.SetUserPassword(admin, Api.Models.User.DefaultAdminPassword);
 			databaseContext.Users.Add(admin);
 		}
 
@@ -61,13 +51,13 @@ namespace Tgstation.Server.Host.Models
 		/// <inheritdoc />
 		public async Task ResetAdminPassword(IDatabaseContext databaseContext, CancellationToken cancellationToken)
 		{
-			var admin = await databaseContext.Users.Where(x => x.CanonicalName == AdminName.ToUpperInvariant()).FirstOrDefaultAsync(cancellationToken).ConfigureAwait(false);
+			var admin = await databaseContext.Users.Where(x => x.CanonicalName == Api.Models.User.AdminName.ToUpperInvariant()).FirstOrDefaultAsync(cancellationToken).ConfigureAwait(false);
 			if (admin == default)
 				SeedAdminUser(databaseContext);
 			else
 			{
 				admin.Enabled = true;
-				cryptographySuite.SetUserPassword(admin, DefaultAdminPassword);
+				cryptographySuite.SetUserPassword(admin, Api.Models.User.DefaultAdminPassword);
 			}
 
 			await databaseContext.Save(cancellationToken).ConfigureAwait(false);