Merge pull request #183 from crupest/auth

Refactor auth module to enable more flexiable permission control.

3 files changed, 5 insertions, 20 deletions

diff --git a/BackEnd/Timeline.Tests/Helpers/TestApplication.cs b/BackEnd/Timeline.Tests/Helpers/TestApplication.cs
index 684ffe2c..33d8b318 100644
--- a/BackEnd/Timeline.Tests/Helpers/TestApplication.cs
+++ b/BackEnd/Timeline.Tests/Helpers/TestApplication.cs
@@ -1,6 +1,5 @@
 using Microsoft.AspNetCore.Hosting;

 using Microsoft.AspNetCore.TestHost;

-using Microsoft.Data.Sqlite;

 using Microsoft.EntityFrameworkCore;

 using Microsoft.Extensions.Configuration;

 using Microsoft.Extensions.DependencyInjection;

diff --git a/BackEnd/Timeline.Tests/Helpers/TestClock.cs b/BackEnd/Timeline.Tests/Helpers/TestClock.cs
index 34adb245..a04a3eb6 100644
--- a/BackEnd/Timeline.Tests/Helpers/TestClock.cs
+++ b/BackEnd/Timeline.Tests/Helpers/TestClock.cs
@@ -1,7 +1,4 @@
 using System;

-using System.Collections.Generic;

-using System.Linq;

-using System.Threading.Tasks;

 using Timeline.Services;

 

 namespace Timeline.Tests.Helpers

diff --git a/BackEnd/Timeline.Tests/Helpers/TestDatabase.cs b/BackEnd/Timeline.Tests/Helpers/TestDatabase.cs
index f0c26180..74db74aa 100644
--- a/BackEnd/Timeline.Tests/Helpers/TestDatabase.cs
+++ b/BackEnd/Timeline.Tests/Helpers/TestDatabase.cs
@@ -4,7 +4,6 @@ using Microsoft.Extensions.Logging.Abstractions;
 using System.Threading.Tasks;

 using Timeline.Entities;

 using Timeline.Migrations;

-using Timeline.Models;

 using Timeline.Services;

 using Xunit;

 

@@ -36,23 +35,13 @@ namespace Timeline.Tests.Helpers
                 if (_createUser)

                 {

                     var passwordService = new PasswordService();

-                    var userService = new UserService(NullLogger<UserService>.Instance, context, passwordService, new Clock());

+                    var userService = new UserService(NullLogger<UserService>.Instance, context, passwordService, new Clock(), new UserPermissionService(context));

 

-                    await userService.CreateUser(new User

-                    {

-                        Username = "admin",

-                        Password = "adminpw",

-                        Administrator = true,

-                        Nickname = "administrator"

-                    });

+                    var admin = await userService.CreateUser("admin", "adminpw");

+                    await userService.ModifyUser(admin.Id, new ModifyUserParams() { Nickname = "administrator" });

 

-                    await userService.CreateUser(new User

-                    {

-                        Username = "user",

-                        Password = "userpw",

-                        Administrator = false,

-                        Nickname = "imuser"

-                    });

+                    var user = await userService.CreateUser("user", "userpw");

+                    await userService.ModifyUser(user.Id, new ModifyUserParams() { Nickname = "imuser" });

                 }

             }

         }