Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/app/app.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,6 @@ export class AppComponent implements OnInit, AfterViewInit {
}

ngOnInit(): void {
this.authService.autoLogin();
this.authService.isLogged.subscribe((status) => {
this.isLogged = status;
if (status) {
Expand Down
25 changes: 3 additions & 22 deletions src/app/core/_services/app-init.service.ts
Original file line number Diff line number Diff line change
@@ -1,34 +1,15 @@
import { firstValueFrom } from 'rxjs';
import { take } from 'rxjs/operators';

import { Injectable } from '@angular/core';

import { AuthService } from '@services/access/auth.service';
import { PermissionService } from '@services/permission/permission.service';
import { AlertService } from '@services/shared/alert.service';

@Injectable({ providedIn: 'root' })
export class AppInitService {
constructor(
private permissionService: PermissionService,
private auth: AuthService,
private alertService: AlertService
) {}
constructor(private auth: AuthService) {}

/**
* Call this on app start to ensure permissions are loaded, if user is already logged in
*/
async initializeApp(): Promise<void> {
try {
const isLoggedIn = this.auth.token !== 'notoken';

if (isLoggedIn) {
await firstValueFrom(this.permissionService.loadPermissions().pipe(take(1)));
}
} catch (err) {
console.error('Error during app initialization:', err);
this.alertService.showErrorMessage('Failed to initialize application permissions.');
throw err;
}
initializeApp() {
this.auth.autoLogin();
}
}