Skip to content
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

Jump to bottom

test (admin): adapt test for updateUserSystemAdminMembership #138

Merged
merged 2 commits into from
Feb 5, 2020
Merged

test (admin): adapt test for updateUserSystemAdminMembership #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
55b1603
test (admin): adapt test for updateUserSystemAdminMembership
Jan 27, 2020
2bc0e6b
Merge branch 'master' into wip/137-admin-update-user
tobiasschweizer Feb 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 1 addition & 6 deletions src/api/admin/users/users-endpoint.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -618,12 +618,7 @@ describe("UsersEndpoint", () => {

it("should update a user's project admin membership", done => {

const storedUser = new StoredUser();

storedUser.id = "http://rdfh.ch/users/9XBCrDV3SRa7kS1WwynB4Q";
storedUser.systemAdmin = true;

knoraApiConnection.admin.usersEndpoint.updateUserSystemAdminMembership(storedUser).subscribe(
knoraApiConnection.admin.usersEndpoint.updateUserSystemAdminMembership("http://rdfh.ch/users/9XBCrDV3SRa7kS1WwynB4Q", true).subscribe(
(response: ApiResponseData<UserResponse> | ApiResponseError) => {
done();
});
Expand Down
10 changes: 5 additions & 5 deletions src/api/admin/users/users-endpoint.ts
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import { Endpoint } from "../../endpoint";

import { GroupsResponse } from "../../../models/admin/groups-response";
import { ProjectsResponse } from "../../../models/admin/projects-response";
import { StoredUser } from "../../../models/admin/stored-user";
import { UpdateUserRequest } from "../../../models/admin/update-user-request";
import { User } from "../../../models/admin/user";
import { UserResponse } from "../../../models/admin/user-response";
Expand Down Expand Up @@ -274,11 +273,12 @@ export class UsersEndpoint extends Endpoint {
/**
* Updates a user's SystemAdmin membership.
*
* @param user The user to be updated.
* @param iri The IRI of the user to be updated.
* @param systemAdmin True if the user should be a system admin
*/
updateUserSystemAdminMembership(user: StoredUser): Observable<ApiResponseData<UserResponse> | ApiResponseError> {
updateUserSystemAdminMembership(iri: string, systemAdmin: boolean): Observable<ApiResponseData<UserResponse> | ApiResponseError> {

return this.httpPut("/iri/" + encodeURIComponent(user.id) + "/SystemAdmin", { systemAdmin: user.systemAdmin }).pipe(
return this.httpPut("/iri/" + encodeURIComponent(iri) + "/SystemAdmin", { systemAdmin: systemAdmin }).pipe(
map(ajaxResponse => ApiResponseData.fromAjaxResponse(ajaxResponse, UserResponse, this.jsonConvert)),
catchError(error => this.handleError(error))
);
Expand All @@ -299,4 +299,4 @@ export class UsersEndpoint extends Endpoint {

}

}
}