This commit is contained in:
Peter Maquiran
2023-01-24 15:56:47 +01:00
parent 0748612054
commit fbd50137f3
153 changed files with 5997 additions and 953 deletions
+4 -2
View File
@@ -4,6 +4,7 @@ import { Observable } from 'rxjs';
import { SessionStore } from '../store/session.service';
import { Platform } from '@ionic/angular';
import { RouteService } from 'src/app/services/route.service'
import { FirstEnterService } from 'src/app/services/first-enter.service'
@Injectable({
providedIn: 'root'
@@ -12,7 +13,8 @@ export class LoginGuard implements CanActivate {
constructor(
private router:Router,
private platform: Platform,
private RouteService: RouteService ) {
private RouteService: RouteService,
private FirstEnterService: FirstEnterService ) {
}
canActivate(
@@ -24,7 +26,7 @@ export class LoginGuard implements CanActivate {
if(SessionStore.exist && SessionStore.user.Inactivity && SessionStore.user.LoginPreference != 'Pin' ) {
// enter app
this.router.navigate(['/home/events']);
this.FirstEnterService.enter()
return false
} else if(SessionStore.exist && !SessionStore.user.Inactivity && SessionStore.user.LoginPreference == 'Pin' && SessionStore.forceToLoginWithForceToLogInWithPassword && this.platform.is('mobile')) {
// login with password while has pin