cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-28 07:27:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move default user definitions to the API

Browse Source
This commit is contained in:
Cyberboss
2018-08-20 11:16:54 -04:00
parent 88fb2596e0
commit d5a8f6499d
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Tgstation.Server.Api/Models/User.cs
+10
View File
@@ -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>
src/Tgstation.Server.Host/Models/DatabaseSeeder.cs
+5 -15
View File
@@ -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);