mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-19 13:02:56 +00:00
merge
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user