This commit is contained in:
@@ -12,7 +12,7 @@ export class AuthInterceptor implements HttpInterceptor {
|
|||||||
}
|
}
|
||||||
|
|
||||||
intercept(request: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {
|
intercept(request: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {
|
||||||
let token = sessionStorage.getItem("app.token");
|
let token = localStorage.getItem("app.token");
|
||||||
if (token) {
|
if (token) {
|
||||||
request = request.clone({
|
request = request.clone({
|
||||||
setHeaders: {
|
setHeaders: {
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ export class AuthService {
|
|||||||
|
|
||||||
isLoggedIn(): boolean {
|
isLoggedIn(): boolean {
|
||||||
if (!this.isBrowser) return false;
|
if (!this.isBrowser) return false;
|
||||||
return sessionStorage.getItem("app.token") != null;
|
return localStorage.getItem("app.token") != null;
|
||||||
}
|
}
|
||||||
|
|
||||||
login(username: string, password: string): Observable<string> {
|
login(username: string, password: string): Observable<string> {
|
||||||
@@ -45,14 +45,14 @@ export class AuthService {
|
|||||||
|
|
||||||
logout() {
|
logout() {
|
||||||
if (!this.isBrowser) return;
|
if (!this.isBrowser) return;
|
||||||
sessionStorage.removeItem("app.token");
|
localStorage.removeItem("app.token");
|
||||||
sessionStorage.removeItem("app.roles");
|
localStorage.removeItem("app.roles");
|
||||||
}
|
}
|
||||||
|
|
||||||
isUserInRole(roleFromRoute: string) {
|
isUserInRole(roleFromRoute: string) {
|
||||||
if (!this.isBrowser) return false;
|
if (!this.isBrowser) return false;
|
||||||
|
|
||||||
const roles = sessionStorage.getItem("app.roles");
|
const roles = localStorage.getItem("app.roles");
|
||||||
|
|
||||||
if (roles!.includes(",")) {
|
if (roles!.includes(",")) {
|
||||||
if (roles === roleFromRoute) {
|
if (roles === roleFromRoute) {
|
||||||
@@ -72,7 +72,7 @@ export class AuthService {
|
|||||||
getUsername(): string | null {
|
getUsername(): string | null {
|
||||||
if (!this.isBrowser) return null;
|
if (!this.isBrowser) return null;
|
||||||
|
|
||||||
const token = sessionStorage.getItem("app.token");
|
const token = localStorage.getItem("app.token");
|
||||||
if (!token) return null;
|
if (!token) return null;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
|||||||
@@ -47,16 +47,16 @@ export class LoginComponent implements OnInit {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public login(): void {
|
public login(): void {
|
||||||
sessionStorage.removeItem("app.token");
|
localStorage.removeItem("app.token");
|
||||||
|
|
||||||
this.authService.login(this.username, this.password)
|
this.authService.login(this.username, this.password)
|
||||||
.subscribe({
|
.subscribe({
|
||||||
next: (token) => {
|
next: (token) => {
|
||||||
sessionStorage.setItem("app.token", token);
|
localStorage.setItem("app.token", token);
|
||||||
|
|
||||||
const decodedToken = jwtDecode<JwtPayload>(token);
|
const decodedToken = jwtDecode<JwtPayload>(token);
|
||||||
// @ts-ignore
|
// @ts-ignore
|
||||||
sessionStorage.setItem("app.roles", decodedToken.scope);
|
localStorage.setItem("app.roles", decodedToken.scope);
|
||||||
|
|
||||||
// this.router.navigateByUrl("/persons");
|
// this.router.navigateByUrl("/persons");
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user