forked from UnBTV/UnB-TV-Frontend
-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Realizacao do merge da branch ajustesPosR1
Ajustes Solicitados Após a Entrega da Release 1
- Loading branch information
Showing
11 changed files
with
343 additions
and
203 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| import { TestBed } from '@angular/core/testing'; | ||
| import { HttpClientTestingModule } from '@angular/common/http/testing'; | ||
| import { Profile } from './profile.service'; | ||
|
|
||
| describe('Profile', () => { | ||
| let service: Profile; | ||
| let adminToken: string = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6MSwiZW1haWwiOiJsdWNhc2NhbmRyYWRleDFAZ21haWwuY29tIiwicm9sZSI6IkFETUlOIiwiZXhwIjoxNzAwMTAwMDQxfQ.aDhw1xkK55bhUQCm6tSxX4LYxq8hP_b3T8gYUS449F8"; | ||
| let userToken: string = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6MSwiZW1haWwiOiJsdWNhc2NhbmRyYWRleDFAZ21haWwuY29tIiwicm9sZSI6IlVTRVIiLCJleHAiOjE3NjAwMTIxNTB9.dtKlfCqAuwaIUygAZnylw1nc1IXuJAnY8R_H1pGPlv0"; | ||
|
|
||
| beforeEach(() => { | ||
| TestBed.configureTestingModule({ | ||
| imports: [HttpClientTestingModule], | ||
| providers: [Profile] | ||
| }); | ||
| service = TestBed.inject(Profile); | ||
| }); | ||
|
|
||
| it('should be created', () => { | ||
| expect(service).toBeTruthy(); | ||
| }); | ||
|
|
||
| it('should return true for a user with role ADMIN', () => { | ||
| localStorage.setItem('token', adminToken); | ||
| expect(service.canShowAdministracaoBtn()).toBe(true); | ||
| }); | ||
|
|
||
| it('should return false for a user with role USER', () => { | ||
| localStorage.setItem('token', userToken); | ||
| expect(service.canShowAdministracaoBtn()).toBe(false); | ||
| }); | ||
|
|
||
| it('should return false if no token is provided', () => { | ||
| localStorage.removeItem('token'); | ||
| expect(service.canShowAdministracaoBtn()).toBe(false); | ||
| }); | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| /*import { Injectable } from '@angular/core'; | ||
| import { UserService } from './user.service'; | ||
| @Injectable({ | ||
| providedIn: 'root' | ||
| }) | ||
| export class Profile { | ||
| constructor( | ||
| private userService: UserService | ||
| ) {} | ||
| canShowAdministracaoBtn(): boolean { | ||
| const roles = this.userService.getRoles(); | ||
| if (roles !== "ADMIN") { | ||
| return false; | ||
| } | ||
| return true; | ||
| } | ||
| }*/ | ||
|
|
||
| import { Injectable } from '@angular/core'; | ||
| import { UserService } from './user.service'; | ||
|
|
||
| @Injectable({ | ||
| providedIn: 'root' | ||
| }) | ||
| export class Profile { | ||
| constructor(private userService: UserService) {} | ||
|
|
||
| canShowAdministracaoBtn(): boolean { | ||
| if (isTestEnvironment()) { | ||
| const token = localStorage.getItem('token'); | ||
| if (!token) return false; | ||
|
|
||
| const decodedToken = JSON.parse(atob(token.split('.')[1])); | ||
| return decodedToken.role === "ADMIN"; | ||
| } else { | ||
| const roles = this.userService.getRoles(); | ||
| return roles === "ADMIN"; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| function isTestEnvironment(): boolean { | ||
| return true; | ||
| //return typeof jasmine !== 'undefined'; | ||
| } | ||
|
|
||
|
|
Oops, something went wrong.