|
|
@ -4,6 +4,7 @@ import { catchError, finalize, map, tap } from 'rxjs/operators';
|
|
|
|
import { environment } from '../../environments/environment';
|
|
|
|
import { environment } from '../../environments/environment';
|
|
|
|
import { Observable, BehaviorSubject, of } from 'rxjs';
|
|
|
|
import { Observable, BehaviorSubject, of } from 'rxjs';
|
|
|
|
import { AuthUser } from "../models/user";
|
|
|
|
import { AuthUser } from "../models/user";
|
|
|
|
|
|
|
|
import { JsonPipe } from '@angular/common';
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Injectable({
|
|
|
|
@Injectable({
|
|
|
@ -32,6 +33,14 @@ export class AuthService {
|
|
|
|
if (value === null){
|
|
|
|
if (value === null){
|
|
|
|
value = new AuthUser();
|
|
|
|
value = new AuthUser();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (value.user != undefined){
|
|
|
|
|
|
|
|
let roles = [];
|
|
|
|
|
|
|
|
for (let role of value.user.roles){
|
|
|
|
|
|
|
|
roles.push(role.name);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
value.user.rolesString = roles.join(', ');
|
|
|
|
|
|
|
|
console.log("Getting user" + JSON.stringify(value));
|
|
|
|
|
|
|
|
}
|
|
|
|
return value;
|
|
|
|
return value;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|