Skip to content

fix: TT-483 consume new endpoint from be v2 #786

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 30, 2021
Merged

fix: TT-483 consume new endpoint from be v2 #786

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/app/modules/users/components/users-list/users-list.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<td class="col-3 text-center">
<ui-switch
size="small"
(change)="switchGroup('time-tracker-admin', user); updateRole(ROLES.admin, user, $event);"
(change)="!isDevelopment?switchGroup('time-tracker-admin', user):null; updateRole(ROLES.admin, user, $event);"
[checked]="user.groups.includes('time-tracker-admin')"></ui-switch>
admin
<span *ngIf="!isDevelopment">
Expand Down
24 changes: 24 additions & 0 deletions src/app/modules/users/services/users.service.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,23 +35,47 @@ describe('UsersService', () => {
it('grant role to a User', () => {
const userId = 'userId';
const roleId = 'admin';
service.isProduction = true;

service.grantRole(userId, roleId).subscribe();

const grantRoleRequest = httpMock.expectOne(`${service.baseUrl}/${userId}/roles/${roleId}/grant`);
expect(grantRoleRequest.request.method).toBe('POST');
});

it('grant role to a User locally', () => {
const userId = 'userId';
const roleId = 'admin';
service.isProduction = false;

service.grantRole(userId, roleId).subscribe();

const grantRoleRequest = httpMock.expectOne(`${service.baseUrl}/${userId}/${roleId}/grant`);
expect(grantRoleRequest.request.method).toBe('POST');
});

it('revoke role to a User', () => {
const userId = 'userId';
const roleId = 'admin';
service.isProduction = true;

service.revokeRole(userId, roleId).subscribe();

const grantRoleRequest = httpMock.expectOne(`${service.baseUrl}/${userId}/roles/${roleId}/revoke`);
expect(grantRoleRequest.request.method).toBe('POST');
});

it('revoke role to a User locally', () => {
const userId = 'userId';
const roleId = 'admin';
service.isProduction = false;

service.revokeRole(userId, roleId).subscribe();

const grantRoleRequest = httpMock.expectOne(`${service.baseUrl}/${userId}/${roleId}/revoke`);
expect(grantRoleRequest.request.method).toBe('POST');
});

it('add user to group', () => {
const userId = 'userId';
const group = 'admin';
Expand Down
7 changes: 5 additions & 2 deletions src/app/modules/users/services/users.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { environment } from './../../../../environments/environment';
providedIn: 'root',
})
export class UsersService {
isProduction = environment.production;
constructor(private http: HttpClient) {}

baseUrl = `${environment.timeTrackerApiUrl}/users`;
Expand All @@ -16,12 +17,14 @@ export class UsersService {
}

grantRole(userId: string, roleId: string): Observable<any> {
const url = `${this.baseUrl}/${userId}/roles/${roleId}/grant`;
const url = this.isProduction ? `${this.baseUrl}/${userId}/roles/${roleId}/grant`
: `${this.baseUrl}/${userId}/${roleId}/grant`;
return this.http.post(url, null);
}

revokeRole(userId: string, roleId: string): Observable<any> {
const url = `${this.baseUrl}/${userId}/roles/${roleId}/revoke`;
const url = this.isProduction ? `${this.baseUrl}/${userId}/roles/${roleId}/revoke`
: `${this.baseUrl}/${userId}/${roleId}/revoke`;
return this.http.post(url, null);
}

Expand Down