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

feat(clientapi): Change signature of function to update user's system admin membership #1583

Merged
merged 2 commits into from Feb 5, 2020
Merged

feat(clientapi): Change signature of function to update user's system admin membership #1583

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
3e86a0a
feat(clientapi): Change method signature.
Jan 24, 2020
6ce3ccc
Merge branch 'develop' into wip/1579-clientapi-sysadmin
Feb 4, 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
2 changes: 1 addition & 1 deletion webapi/src/main/scala/org/knora/webapi/routing/admin/GroupsRouteADM.scala
View file
Open in desktop
Expand Up @@ -41,7 +41,7 @@ import scala.concurrent.{ExecutionContext, Future}


object GroupsRouteADM {
val GroupsBasePath = PathMatcher("admin" / "groups")
val GroupsBasePath: PathMatcher[Unit] = PathMatcher("admin" / "groups")
val GroupsBasePathString: String = "/admin/groups"
}

Expand Down
3 changes: 1 addition & 2 deletions webapi/src/main/scala/org/knora/webapi/routing/admin/ProjectsRouteADM.scala
View file
Open in desktop
Expand Up @@ -49,7 +49,7 @@ import scala.concurrent.{ExecutionContext, Future}
import scala.util.Try

object ProjectsRouteADM {
val ProjectsBasePath = PathMatcher("admin" / "projects")
val ProjectsBasePath: PathMatcher[Unit] = PathMatcher("admin" / "projects")
val ProjectsBasePathString = "/admin/projects"
}

Expand Down Expand Up @@ -82,7 +82,6 @@ class ProjectsRouteADM(routeData: KnoraRouteData) extends KnoraRoute(routeData)
// Classes used in client function definitions.

private val Project = classRef(OntologyConstants.KnoraAdminV2.ProjectClass.toSmartIri)
private val StoredProject = Project.toStoredClassRef
private val ProjectsResponse = classRef(OntologyConstants.KnoraAdminV2.ProjectsResponse.toSmartIri)
private val ProjectResponse = classRef(OntologyConstants.KnoraAdminV2.ProjectResponse.toSmartIri)
private val UpdateProjectRequest = classRef(OntologyConstants.KnoraAdminV2.UpdateProjectRequest.toSmartIri)
Expand Down
10 changes: 5 additions & 5 deletions webapi/src/main/scala/org/knora/webapi/routing/admin/UsersRouteADM.scala
View file
Open in desktop
Expand Up @@ -44,7 +44,7 @@ import scala.concurrent.{ExecutionContext, Future}


object UsersRouteADM {
val UsersBasePath = PathMatcher("admin" / "users")
val UsersBasePath: PathMatcher[Unit] = PathMatcher("admin" / "users")
val UsersBasePathString: String = "/admin/users"
}

Expand Down Expand Up @@ -85,7 +85,6 @@ class UsersRouteADM(routeData: KnoraRouteData) extends KnoraRoute(routeData) wit
private val GroupsResponse = classRef(OntologyConstants.KnoraAdminV2.GroupsResponse.toSmartIri)
private val User = classRef(OntologyConstants.KnoraAdminV2.UserClass.toSmartIri)
private val UpdateUserRequest = classRef(OntologyConstants.KnoraAdminV2.UpdateUserRequest.toSmartIri)
private val StoredUser = User.toStoredClassRef

private val anythingUser1IriEnc = URLEncoder.encode(SharedTestDataADM.anythingUser1.id, "UTF-8")
private val multiUserIriEnc = URLEncoder.encode(SharedTestDataADM.multiuserUser.id, "UTF-8")
Expand Down Expand Up @@ -554,11 +553,12 @@ class UsersRouteADM(routeData: KnoraRouteData) extends KnoraRoute(routeData) wit

private val updateUserSystemAdminMembershipFunction: ClientFunction =
"updateUserSystemAdminMembership" description "Updates a user's SystemAdmin membership." params (
"user" description "The user to be updated." paramType StoredUser
"iri" description "The IRI of the user to be updated." paramType UriDatatype,
"systemAdmin" description "True if the user should be a system admin" paramType BooleanDatatype
) doThis {
httpPut(
path = str("iri") / argMember("user", "id") / str("SystemAdmin"),
body = Some(json("systemAdmin" -> argMember("user", "systemAdmin")))
path = str("iri") / arg("iri") / str("SystemAdmin"),
body = Some(json("systemAdmin" -> arg("systemAdmin")))
)
} returns UserResponse

Expand Down