From 5304409ea4bbe3983f49db027e3a039cad6a502f Mon Sep 17 00:00:00 2001 From: _Bastler <_Bastler@bstly.de> Date: Wed, 19 May 2021 19:26:51 +0200 Subject: [PATCH] change login to form + remember me, 2fa --- src/app/app-routing.module.ts | 6 +- .../form-login-totp.component.html | 48 ++++++------- .../form-login-totp.component.ts | 22 +++--- .../form-login/form-login.component.html | 67 +++++++++---------- .../pages/form-login/form-login.component.ts | 37 ++++++---- .../pages/services/services.component.html | 5 +- 6 files changed, 97 insertions(+), 88 deletions(-) diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index edf06fa..a269847 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -3,8 +3,6 @@ import {Routes, RouterModule} from '@angular/router'; import {AuthGuard, AuthUpdateGuard, AuthenticatedGuard, AnonymousGuard} from './auth/auth.guard'; import {ImprintComponent, PrivacyPolicyComponent, TermsOfServiceComponent} from './pages/general/general.component'; -import {LoginComponent} from './pages/login/login.component'; -import {LoginTotpComponent} from './pages/login-totp/login-totp.component'; import {FormLoginComponent} from './pages/form-login/form-login.component'; import {FormLoginTotpComponent} from './pages/form-login-totp/form-login-totp.component'; import {PasswordComponent} from './pages/password/password.component'; @@ -30,8 +28,8 @@ const routes: Routes = [ {path: 'imprint', component: ImprintComponent, canActivate: [AuthUpdateGuard]}, {path: 'privacy-policy', component: PrivacyPolicyComponent, canActivate: [AuthUpdateGuard]}, {path: 'terms-of-service', component: TermsOfServiceComponent, canActivate: [AuthUpdateGuard]}, - {path: 'login', component: LoginComponent, canActivate: [AnonymousGuard]}, - {path: 'login/totp', component: LoginTotpComponent, canActivate: [AnonymousGuard]}, + {path: 'login', component: FormLoginComponent, canActivate: [AnonymousGuard]}, + {path: 'login/totp', component: FormLoginTotpComponent, canActivate: [AnonymousGuard]}, {path: 'service-login', component: FormLoginComponent, canActivate: [AnonymousGuard]}, {path: 'service-login/totp', component: FormLoginTotpComponent, canActivate: [AnonymousGuard]}, {path: 'password', component: PasswordComponent, canActivate: [AnonymousGuard]}, diff --git a/src/app/pages/form-login-totp/form-login-totp.component.html b/src/app/pages/form-login-totp/form-login-totp.component.html index 72d4664..fa2a9d3 100644 --- a/src/app/pages/form-login-totp/form-login-totp.component.html +++ b/src/app/pages/form-login-totp/form-login-totp.component.html @@ -1,28 +1,24 @@ -
\ No newline at end of file diff --git a/src/app/pages/form-login-totp/form-login-totp.component.ts b/src/app/pages/form-login-totp/form-login-totp.component.ts index 17d070b..07b0471 100644 --- a/src/app/pages/form-login-totp/form-login-totp.component.ts +++ b/src/app/pages/form-login-totp/form-login-totp.component.ts @@ -1,7 +1,8 @@ -import { Component, OnInit } from '@angular/core'; -import { FormBuilder, FormGroup, Validators } from '@angular/forms'; +import {Component, OnInit} from '@angular/core'; +import {FormBuilder, FormGroup, Validators} from '@angular/forms'; +import {ActivatedRoute} from '@angular/router'; -import { environment } from '../../../environments/environment'; +import {environment} from '../../../environments/environment'; @Component({ selector: 'app-form-login-totp', @@ -10,16 +11,17 @@ import { environment } from '../../../environments/environment'; }) export class FormLoginTotpComponent implements OnInit { - form: FormGroup; - public loginInvalid: boolean; - public apiUrl = environment.apiUrl; + loginInvalid: boolean; + apiUrl = environment.apiUrl; - constructor(private formBuilder: FormBuilder) { } + constructor( + private route: ActivatedRoute) {} async ngOnInit() { - this.form = this.formBuilder.group({ - code: ['', Validators.required], - keep : [''] + this.route.queryParams.subscribe(params => { + if(params['error'] || params['error'] == '') { + this.loginInvalid = true; + } }); } diff --git a/src/app/pages/form-login/form-login.component.html b/src/app/pages/form-login/form-login.component.html index 3132be2..1d10fd9 100644 --- a/src/app/pages/form-login/form-login.component.html +++ b/src/app/pages/form-login/form-login.component.html @@ -1,37 +1,34 @@ -