Named routes & basic login framework

src/auth/basic-ui/BasicLoginFormRequest.ts

@@ -0,0 +1,24 @@
+import {FormRequest, ValidationRules} from '../../forms'
+import {Is, Str} from '../../forms/rules/rules'
+import {Singleton} from '../../di'
+
+export interface BasicLoginCredentials {
+    username: string,
+    password: string,
+}
+
+@Singleton()
+export class BasicLoginFormRequest extends FormRequest<BasicLoginCredentials> {
+    protected getRules(): ValidationRules {
+        return {
+            username: [
+                Is.required,
+                Str.lengthMin(1),
+            ],
+            password: [
+                Is.required,
+                Str.lengthMin(1),
+            ],
+        }
+    }
+}

src/auth/index.ts

@@ -19,3 +19,5 @@ export * from './middleware/SessionAuthMiddleware'
 export * from './Authentication'
 
 export * from './config'
+
+export * from './basic-ui/BasicLoginFormRequest'

src/auth/middleware/AuthRequiredMiddleware.ts

@@ -5,15 +5,30 @@ import {ResponseObject} from '../../http/routing/Route'
 import {error} from '../../http/response/ErrorResponseFactory'
 import {NotAuthorizedError} from '../NotAuthorizedError'
 import {HTTPStatus} from '../../util'
+import {redirect} from '../../http/response/RedirectResponseFactory'
+import {Routing} from '../../service/Routing'
+import {Session} from '../../http/session/Session'
 
 @Injectable()
 export class AuthRequiredMiddleware extends Middleware {
     @Inject()
     protected readonly security!: SecurityContext
 
+    @Inject()
+    protected readonly routing!: Routing
+
+    @Inject()
+    protected readonly session!: Session
+
     async apply(): Promise<ResponseObject> {
         if ( !this.security.hasUser() ) {
-            return error(new NotAuthorizedError(), HTTPStatus.FORBIDDEN)
+            this.session.set('auth.intention', this.request.url)
+
+            if ( this.routing.hasNamedRoute('@auth.login') ) {
+                return redirect(this.routing.getNamedPath('@auth.login').toRemote)
+            } else {
+                return error(new NotAuthorizedError(), HTTPStatus.FORBIDDEN)
+            }
         }
     }
 }

src/auth/middleware/GuestRequiredMiddleware.ts

@@ -5,15 +5,24 @@ import {ResponseObject} from '../../http/routing/Route'
 import {error} from '../../http/response/ErrorResponseFactory'
 import {NotAuthorizedError} from '../NotAuthorizedError'
 import {HTTPStatus} from '../../util'
+import {Routing} from '../../service/Routing'
+import {redirect} from '../../http/response/RedirectResponseFactory'
 
 @Injectable()
 export class GuestRequiredMiddleware extends Middleware {
     @Inject()
     protected readonly security!: SecurityContext
 
+    @Inject()
+    protected readonly routing!: Routing
+
     async apply(): Promise<ResponseObject> {
         if ( this.security.hasUser() ) {
-            return error(new NotAuthorizedError(), HTTPStatus.FORBIDDEN)
+            if ( this.routing.hasNamedRoute('@auth.redirectFromGuest') ) {
+                return redirect(this.routing.getNamedPath('@auth.redirectFromGuest').toRemote)
+            } else {
+                return error(new NotAuthorizedError(), HTTPStatus.FORBIDDEN)
+            }
         }
     }
 }