Skip to content

Commit

Permalink
Merge 71ce982 into 04d9a6d
Browse files Browse the repository at this point in the history
  • Loading branch information
@nathandunn
nathandunn committed Mar 19, 2018
2 parents 04d9a6d + 71ce982 commit eebd55b
Show file tree
Hide file tree
Showing 13 changed files with 83 additions and 52 deletions.
3 changes: 2 additions & 1 deletion grails-app/controllers/org/bbop/apollo/AnnotatorController.groovy
View file
Expand Up @@ -6,6 +6,7 @@ import grails.transaction.Transactional
import org.bbop.apollo.event.AnnotationEvent
import org.bbop.apollo.gwt.shared.ClientTokenGenerator
import org.bbop.apollo.gwt.shared.FeatureStringEnum
import org.bbop.apollo.gwt.shared.GlobalPermissionEnum
import org.bbop.apollo.gwt.shared.PermissionEnum
import org.bbop.apollo.report.AnnotatorSummary
import org.codehaus.groovy.grails.web.json.JSONArray
Expand Down Expand Up @@ -598,7 +599,7 @@ class AnnotatorController {
)
def getAnnotatorsReportForGroup(){
JSONObject dataObject = permissionService.handleInput(request, params)
if (!permissionService.hasGlobalPermissions(dataObject, PermissionEnum.ADMINISTRATE)) {
if (!permissionService.hasGlobalPermissions(dataObject, GlobalPermissionEnum.ADMIN)) {
render status: HttpStatus.UNAUTHORIZED.value()
return
}
Expand Down
9 changes: 5 additions & 4 deletions grails-app/controllers/org/bbop/apollo/AvailableStatusController.groovy
View file
Expand Up @@ -3,6 +3,7 @@ package org.bbop.apollo

import grails.converters.JSON
import org.bbop.apollo.gwt.shared.FeatureStringEnum
import org.bbop.apollo.gwt.shared.GlobalPermissionEnum

import static org.springframework.http.HttpStatus.*
import grails.transaction.Transactional
Expand Down Expand Up @@ -171,7 +172,7 @@ class AvailableStatusController {
def createStatus() {
JSONObject statusJson = permissionService.handleInput(request, params)
try {
if (permissionService.isUserAdmin(permissionService.getCurrentUser(statusJson))) {
if (permissionService.isUserGlobalAdmin(permissionService.getCurrentUser(statusJson))) {
if (!statusJson.value) {
throw new Exception('empty fields detected')
}
Expand Down Expand Up @@ -209,7 +210,7 @@ class AvailableStatusController {
try {
JSONObject statusJson = permissionService.handleInput(request, params)
log.debug "Updating status ${statusJson}"
if (permissionService.isUserAdmin(permissionService.getCurrentUser(statusJson))) {
if (permissionService.isUserGlobalAdmin(permissionService.getCurrentUser(statusJson))) {
if (!statusJson.new_value) {
throw new Exception('empty fields detected')
}
Expand Down Expand Up @@ -254,7 +255,7 @@ class AvailableStatusController {
try {
JSONObject statusJson = permissionService.handleInput(request, params)
log.debug "Deleting status ${statusJson}"
if (permissionService.isUserAdmin(permissionService.getCurrentUser(statusJson))) {
if (permissionService.isUserGlobalAdmin(permissionService.getCurrentUser(statusJson))) {

AvailableStatus status = AvailableStatus.findById(statusJson.id) ?: AvailableStatus.findByValue(statusJson.value)

Expand Down Expand Up @@ -294,7 +295,7 @@ class AvailableStatusController {
try {
JSONObject statusJson = permissionService.handleInput(request, params)
log.debug "Showing status ${statusJson}"
if (!permissionService.hasGlobalPermissions(statusJson, PermissionEnum.ADMINISTRATE)) {
if (!permissionService.hasGlobalPermissions(statusJson, GlobalPermissionEnum.ADMIN)) {
render status: UNAUTHORIZED
return
}
Expand Down
9 changes: 5 additions & 4 deletions grails-app/controllers/org/bbop/apollo/CannedCommentController.groovy
View file
Expand Up @@ -3,6 +3,7 @@ package org.bbop.apollo
import grails.converters.JSON
import grails.transaction.Transactional
import org.bbop.apollo.gwt.shared.FeatureStringEnum
import org.bbop.apollo.gwt.shared.GlobalPermissionEnum
import org.bbop.apollo.gwt.shared.PermissionEnum
import org.codehaus.groovy.grails.web.json.JSONObject
import org.restapidoc.annotation.RestApi
Expand Down Expand Up @@ -171,7 +172,7 @@ class CannedCommentController {
def createComment() {
JSONObject commentJson = permissionService.handleInput(request, params)
try {
if (permissionService.isUserAdmin(permissionService.getCurrentUser(commentJson))) {
if (permissionService.isUserGlobalAdmin(permissionService.getCurrentUser(commentJson))) {
if (!commentJson.comment) {
throw new Exception('empty fields detected')
}
Expand Down Expand Up @@ -215,7 +216,7 @@ class CannedCommentController {
try {
JSONObject commentJson = permissionService.handleInput(request, params)
log.debug "Updating canned comment ${commentJson}"
if (permissionService.isUserAdmin(permissionService.getCurrentUser(commentJson))) {
if (permissionService.isUserGlobalAdmin(permissionService.getCurrentUser(commentJson))) {

log.debug "Canned comment ID: ${commentJson.id}"
CannedComment comment = CannedComment.findById(commentJson.id) ?: CannedComment.findByComment(commentJson.old_comment)
Expand Down Expand Up @@ -262,7 +263,7 @@ class CannedCommentController {
try {
JSONObject commentJson = permissionService.handleInput(request, params)
log.debug "Deleting canned comment ${commentJson}"
if (permissionService.isUserAdmin(permissionService.getCurrentUser(commentJson))) {
if (permissionService.isUserGlobalAdmin(permissionService.getCurrentUser(commentJson))) {

CannedComment comment = CannedComment.findById(commentJson.id) ?: CannedComment.findByComment(commentJson.comment)

Expand Down Expand Up @@ -302,7 +303,7 @@ class CannedCommentController {
try {
JSONObject commentJson = permissionService.handleInput(request, params)
log.debug "Showing canned comment ${commentJson}"
if (!permissionService.hasGlobalPermissions(commentJson, PermissionEnum.ADMINISTRATE)) {
if (!permissionService.hasGlobalPermissions(commentJson, GlobalPermissionEnum.ADMIN)) {
render status: UNAUTHORIZED
return
}
Expand Down
9 changes: 5 additions & 4 deletions grails-app/controllers/org/bbop/apollo/CannedKeyController.groovy
View file
Expand Up @@ -3,6 +3,7 @@ package org.bbop.apollo

import grails.converters.JSON
import org.bbop.apollo.gwt.shared.FeatureStringEnum
import org.bbop.apollo.gwt.shared.GlobalPermissionEnum

import static org.springframework.http.HttpStatus.*
import grails.transaction.Transactional
Expand Down Expand Up @@ -172,7 +173,7 @@ class CannedKeyController {
def createKey() {
JSONObject keyJson = permissionService.handleInput(request, params)
try {
if (permissionService.isUserAdmin(permissionService.getCurrentUser(keyJson))) {
if (permissionService.isUserGlobalAdmin(permissionService.getCurrentUser(keyJson))) {
if (!keyJson.key) {
throw new Exception('empty fields detected')
}
Expand Down Expand Up @@ -216,7 +217,7 @@ class CannedKeyController {
try {
JSONObject keyJson = permissionService.handleInput(request, params)
log.debug "Updating canned key ${keyJson}"
if (permissionService.isUserAdmin(permissionService.getCurrentUser(keyJson))) {
if (permissionService.isUserGlobalAdmin(permissionService.getCurrentUser(keyJson))) {

log.debug "Canned key ID: ${keyJson.id}"
CannedKey key = CannedKey.findById(keyJson.id) ?: CannedKey.findByLabel(keyJson.old_key)
Expand Down Expand Up @@ -263,7 +264,7 @@ class CannedKeyController {
try {
JSONObject keyJson = permissionService.handleInput(request, params)
log.debug "Deleting canned key ${keyJson}"
if (permissionService.isUserAdmin(permissionService.getCurrentUser(keyJson))) {
if (permissionService.isUserGlobalAdmin(permissionService.getCurrentUser(keyJson))) {

CannedKey key = CannedKey.findById(keyJson.id) ?: CannedKey.findByLabel(keyJson.key)

Expand Down Expand Up @@ -303,7 +304,7 @@ class CannedKeyController {
try {
JSONObject keyJson = permissionService.handleInput(request, params)
log.debug "Showing canned key ${keyJson}"
if (!permissionService.hasGlobalPermissions(keyJson, PermissionEnum.ADMINISTRATE)) {
if (!permissionService.hasGlobalPermissions(keyJson, GlobalPermissionEnum.ADMIN)) {
render status: UNAUTHORIZED
return
}
Expand Down
11 changes: 7 additions & 4 deletions grails-app/controllers/org/bbop/apollo/CannedValueController.groovy
View file
Expand Up @@ -2,6 +2,9 @@ package org.bbop.apollo


import grails.converters.JSON
import org.bbop.apollo.gwt.shared.FeatureStringEnum
import org.bbop.apollo.gwt.shared.GlobalPermissionEnum

import static org.springframework.http.HttpStatus.*
import grails.transaction.Transactional
import org.bbop.apollo.gwt.shared.PermissionEnum
Expand Down Expand Up @@ -169,7 +172,7 @@ class CannedValueController {
def createValue() {
JSONObject valueJson = permissionService.handleInput(request, params)
try {
if (permissionService.isUserAdmin(permissionService.getCurrentUser(valueJson))) {
if (permissionService.isUserGlobalAdmin(permissionService.getCurrentUser(valueJson))) {
if (!valueJson.value) {
throw new Exception('empty fields detected')
}
Expand Down Expand Up @@ -213,7 +216,7 @@ class CannedValueController {
try {
JSONObject valueJson = permissionService.handleInput(request, params)
log.debug "Updating canned value ${valueJson}"
if (permissionService.isUserAdmin(permissionService.getCurrentUser(valueJson))) {
if (permissionService.isUserGlobalAdmin(permissionService.getCurrentUser(valueJson))) {

log.debug "Canned value ID: ${valueJson.id}"
CannedValue value = CannedValue.findById(valueJson.id) ?: CannedValue.findByLabel(valueJson.old_value)
Expand Down Expand Up @@ -260,7 +263,7 @@ class CannedValueController {
try {
JSONObject valueJson = permissionService.handleInput(request, params)
log.debug "Deleting canned value ${valueJson}"
if (permissionService.isUserAdmin(permissionService.getCurrentUser(valueJson))) {
if (permissionService.isUserGlobalAdmin(permissionService.getCurrentUser(valueJson))) {

CannedValue value = CannedValue.findById(valueJson.id) ?: CannedValue.findByLabel(valueJson.value)

Expand Down Expand Up @@ -300,7 +303,7 @@ class CannedValueController {
try {
JSONObject valueJson = permissionService.handleInput(request, params)
log.debug "Showing canned value ${valueJson}"
if (!permissionService.hasGlobalPermissions(valueJson, PermissionEnum.ADMINISTRATE)) {
if (!permissionService.hasGlobalPermissions(valueJson, GlobalPermissionEnum.ADMIN)) {
render status: UNAUTHORIZED
return
}
Expand Down
2 changes: 1 addition & 1 deletion grails-app/controllers/org/bbop/apollo/FeatureEventController.groovy
View file
Expand Up @@ -45,7 +45,7 @@ class FeatureEventController {
])
def findChanges() {
JSONObject inputObject = permissionService.handleInput(request, params)
if (!permissionService.hasGlobalPermissions(inputObject, org.bbop.apollo.gwt.shared.PermissionEnum.ADMINISTRATE)) {
if (!permissionService.hasGlobalPermissions(inputObject, org.bbop.apollo.gwt.shared.GlobalPermissionEnum.ADMIN)) {
render status: org.springframework.http.HttpStatus.UNAUTHORIZED
return
}
Expand Down
11 changes: 6 additions & 5 deletions grails-app/controllers/org/bbop/apollo/GroupController.groovy
View file
Expand Up @@ -3,6 +3,7 @@ package org.bbop.apollo
import grails.converters.JSON
import grails.transaction.Transactional
import org.bbop.apollo.gwt.shared.FeatureStringEnum
import org.bbop.apollo.gwt.shared.GlobalPermissionEnum
import org.bbop.apollo.gwt.shared.PermissionEnum
import org.codehaus.groovy.grails.web.json.JSONArray
import org.codehaus.groovy.grails.web.json.JSONObject
Expand Down Expand Up @@ -168,7 +169,7 @@ class GroupController {
@Transactional
def createGroup() {
JSONObject dataObject = permissionService.handleInput(request, params)
if (!permissionService.hasGlobalPermissions(dataObject, PermissionEnum.ADMINISTRATE)) {
if (!permissionService.hasGlobalPermissions(dataObject, GlobalPermissionEnum.ADMIN)) {
render status: HttpStatus.UNAUTHORIZED
return
}
Expand Down Expand Up @@ -199,7 +200,7 @@ class GroupController {
@Transactional
def deleteGroup() {
JSONObject dataObject = permissionService.handleInput(request, params)
if (!permissionService.hasGlobalPermissions(dataObject, PermissionEnum.ADMINISTRATE)) {
if (!permissionService.hasGlobalPermissions(dataObject, GlobalPermissionEnum.ADMIN)) {
render status: HttpStatus.UNAUTHORIZED.value()
return
}
Expand Down Expand Up @@ -244,7 +245,7 @@ class GroupController {
def updateGroup() {
log.info "Updating group"
JSONObject dataObject = permissionService.handleInput(request, params)
if (!permissionService.hasGlobalPermissions(dataObject, PermissionEnum.ADMINISTRATE)) {
if (!permissionService.hasGlobalPermissions(dataObject, GlobalPermissionEnum.ADMIN)) {
render status: HttpStatus.UNAUTHORIZED.value()
return
}
Expand Down Expand Up @@ -366,7 +367,7 @@ class GroupController {
JSONObject dataObject = permissionService.handleInput(request, params)
UserGroup groupInstance = UserGroup.findById(dataObject.groupId)

if (!permissionService.hasGlobalPermissions(dataObject, PermissionEnum.ADMINISTRATE) && !permissionService.isGroupAdmin(groupInstance, permissionService.currentUser)) {
if (!permissionService.hasGlobalPermissions(dataObject, GlobalPermissionEnum.ADMIN) && !permissionService.isGroupAdmin(groupInstance, permissionService.currentUser)) {

render status: HttpStatus.UNAUTHORIZED.value()
return
Expand Down Expand Up @@ -411,7 +412,7 @@ class GroupController {
JSONObject dataObject = permissionService.handleInput(request, params)
UserGroup groupInstance = UserGroup.findById(dataObject.groupId)

if (!permissionService.hasGlobalPermissions(dataObject, PermissionEnum.ADMINISTRATE) && !permissionService.isGroupAdmin(groupInstance, permissionService.currentUser)) {
if (!permissionService.hasGlobalPermissions(dataObject, GlobalPermissionEnum.ADMIN) && !permissionService.isGroupAdmin(groupInstance, permissionService.currentUser)) {
render status: HttpStatus.UNAUTHORIZED.value()
return
}
Expand Down
4 changes: 2 additions & 2 deletions grails-app/controllers/org/bbop/apollo/OrganismController.groovy
View file
Expand Up @@ -102,7 +102,7 @@ class OrganismController {
log.debug "deleteOrganism ${requestObject}"

try {
if (permissionService.isUserAdmin(permissionService.getCurrentUser(requestObject))) {
if (permissionService.isUserGlobalAdmin(permissionService.getCurrentUser(requestObject))) {
Organism organism = preferenceService.getOrganismForTokenInDB(requestObject.organism)
if (organism) {
boolean dataAddedViaWebServices = organism.dataAddedViaWebServices == null ? false : organism.dataAddedViaWebServices
Expand Down Expand Up @@ -236,7 +236,7 @@ class OrganismController {
}

try {
if (permissionService.isUserAdmin(permissionService.getCurrentUser(requestObject))) {
if (permissionService.isUserGlobalAdmin(permissionService.getCurrentUser(requestObject))) {
log.debug "User is admin"
def organism = new Organism(
commonName: requestObject.get(FeatureStringEnum.ORGANISM_NAME.value),
Expand Down
12 changes: 6 additions & 6 deletions grails-app/controllers/org/bbop/apollo/UserController.groovy
View file
Expand Up @@ -42,7 +42,7 @@ class UserController {
try {
JSONObject dataObject = permissionService.handleInput(request, params)
JSONArray returnArray = new JSONArray()
if (!permissionService.hasGlobalPermissions(dataObject, PermissionEnum.ADMINISTRATE)) {
if (!permissionService.hasGlobalPermissions(dataObject, GlobalPermissionEnum.ADMIN)) {
render status: HttpStatus.UNAUTHORIZED
return
}
Expand Down Expand Up @@ -297,7 +297,7 @@ class UserController {
@Transactional
def addUserToGroup() {
JSONObject dataObject = permissionService.handleInput(request, params)
if (!permissionService.hasGlobalPermissions(dataObject, PermissionEnum.ADMINISTRATE)) {
if (!permissionService.hasGlobalPermissions(dataObject, GlobalPermissionEnum.ADMIN)) {
render status: HttpStatus.UNAUTHORIZED
return
}
Expand All @@ -321,7 +321,7 @@ class UserController {
@Transactional
def removeUserFromGroup() {
JSONObject dataObject = permissionService.handleInput(request, params)
if (!permissionService.hasGlobalPermissions(dataObject, PermissionEnum.ADMINISTRATE)) {
if (!permissionService.hasGlobalPermissions(dataObject, GlobalPermissionEnum.ADMIN)) {
render status: HttpStatus.UNAUTHORIZED
return
}
Expand Down Expand Up @@ -350,7 +350,7 @@ class UserController {
try {
log.info "Creating user"
JSONObject dataObject = permissionService.handleInput(request, params)
if (!permissionService.hasGlobalPermissions(dataObject, PermissionEnum.ADMINISTRATE)) {
if (!permissionService.hasGlobalPermissions(dataObject, GlobalPermissionEnum.ADMIN)) {
render status: HttpStatus.UNAUTHORIZED
return
}
Expand Down Expand Up @@ -408,7 +408,7 @@ class UserController {
log.info "Removing user"
JSONObject dataObject = permissionService.handleInput(request, params)

if (!permissionService.hasGlobalPermissions(dataObject, PermissionEnum.ADMINISTRATE)) {
if (!permissionService.hasGlobalPermissions(dataObject, GlobalPermissionEnum.ADMIN)) {
render status: HttpStatus.UNAUTHORIZED
return
}
Expand Down Expand Up @@ -475,7 +475,7 @@ class UserController {
try {
log.info "Updating user"
JSONObject dataObject = permissionService.handleInput(request, params)
if (!permissionService.sameUser(dataObject, request) && !permissionService.hasGlobalPermissions(dataObject, PermissionEnum.ADMINISTRATE)) {
if (!permissionService.sameUser(dataObject, request) && !permissionService.hasGlobalPermissions(dataObject, GlobalPermissionEnum.ADMIN)) {
render status: HttpStatus.UNAUTHORIZED
return
}
Expand Down

0 comments on commit eebd55b

Please sign in to comment.