Logging out now properly redirects to login page
continuous-integration/drone/push Build was killed Details
continuous-integration/drone Build is passing Details

master
Garrett Mills 3 years ago
parent 2284c84897
commit 7be3bf5259
Signed by: garrettmills
GPG Key ID: D2BF5FBA8298F246

@ -697,7 +697,9 @@ export class AppComponent implements OnInit {
return;
}
this.initializeApp();
this.initializeApp().then(() => {
this.router.navigate(['/login']);
});
});
}

@ -8,13 +8,13 @@ import {Router} from '@angular/router';
templateUrl: 'home.page.html',
styleUrls: ['home.page.scss'],
})
export class HomePage implements OnInit {
export class HomePage {
constructor(
public readonly api: ApiService,
public readonly router: Router,
) {}
ngOnInit() {
ionViewDidEnter() {
if ( !this.api.isAuthenticated || this.api.isPublicUser ) {
if ( isDebug() ) {
debug('Forcing authentication...');

@ -23,6 +23,7 @@
[(ngModel)]="username"
[disabled]="step !== 'username'"
placeholder="Username"
(keyup.enter)="advance()"
></ion-input>
</ion-item>
<ion-item *ngIf="step === 'password'" style="padding-top: 10px;">
@ -31,6 +32,7 @@
[(ngModel)]="password"
placeholder="Password"
type="password"
(keyup.enter)="advance()"
></ion-input>
</ion-item>
<ion-item *ngIf="step === 'create-account'" style="padding-top: 10px;">
@ -53,6 +55,7 @@
[(ngModel)]="passwordConfirm"
placeholder="Confirm Password"
type="password"
(keyup.enter)="advance()"
></ion-input>
</ion-item>
<div class="buttons" style="text-align: right;">
@ -91,4 +94,4 @@
</ion-col>
</ion-row>
</ion-grid>
</div>
</div>

@ -1,4 +1,4 @@
import {Component, ElementRef, OnInit, ViewChild} from '@angular/core';
import {Component, ElementRef, HostListener, OnInit, ViewChild} from '@angular/core';
import {ActivatedRoute, Router} from '@angular/router';
import {AlertController, IonInput, LoadingController, ModalController, PopoverController} from '@ionic/angular';
import {EditorService} from '../../service/editor.service';

@ -51,9 +51,10 @@ export class AuthService implements CanActivate {
await this.db.purge();
await this.api.endSession();
await this.router.navigate(['/login']);
await loader.dismiss();
this.nav.requestInitialization();
await this.router.navigate(['/login']);
}
}

Loading…
Cancel
Save