Rework authentication system

src/auth/Authentication.ts

@@ -1,16 +1,13 @@
-import {Inject, Injectable, Instantiable, StaticClass} from '../di'
 import {Unit} from '../lifecycle/Unit'
+import {Injectable, Inject, StaticInstantiable} from '../di'
 import {Logging} from '../service/Logging'
+import {Middlewares} from '../service/Middlewares'
 import {CanonicalResolver} from '../service/Canonical'
 import {Middleware} from '../http/routing/Middleware'
-import {SessionAuthMiddleware} from './middleware/SessionAuthMiddleware'
 import {AuthRequiredMiddleware} from './middleware/AuthRequiredMiddleware'
 import {GuestRequiredMiddleware} from './middleware/GuestRequiredMiddleware'
-import {Middlewares} from '../service/Middlewares'
+import {SessionAuthMiddleware} from './middleware/SessionAuthMiddleware'
 
-/**
- * Unit class that bootstraps the authentication framework.
- */
 @Injectable()
 export class Authentication extends Unit {
     @Inject()
@@ -20,20 +17,15 @@ export class Authentication extends Unit {
     protected readonly middleware!: Middlewares
 
     async up(): Promise<void> {
-        this.container()
         this.middleware.registerNamespace('@auth', this.getMiddlewareResolver())
     }
 
-    /**
-     * Create the canonical namespace resolver for auth middleware.
-     * @protected
-     */
-    protected getMiddlewareResolver(): CanonicalResolver<StaticClass<Middleware, Instantiable<Middleware>>> {
+    protected getMiddlewareResolver(): CanonicalResolver<StaticInstantiable<Middleware>> {
         return (key: string) => {
             return ({
-                web: SessionAuthMiddleware,
                 required: AuthRequiredMiddleware,
                 guest: GuestRequiredMiddleware,
+                web: SessionAuthMiddleware,
             })[key]
         }
     }