diff --git a/grails-app/controllers/io/xh/toolbox/admin/FetchTestController.groovy b/grails-app/controllers/io/xh/toolbox/admin/FetchTestController.groovy index 7b296905f..b331fd3cc 100755 --- a/grails-app/controllers/io/xh/toolbox/admin/FetchTestController.groovy +++ b/grails-app/controllers/io/xh/toolbox/admin/FetchTestController.groovy @@ -1,10 +1,10 @@ package io.xh.toolbox.admin +import io.xh.hoist.security.AccessRequiresRole import io.xh.toolbox.BaseController -import io.xh.hoist.security.Access -@Access(['HOIST_ADMIN_READER']) +@AccessRequiresRole('HOIST_ADMIN_READER') class FetchTestController extends BaseController { def index() { @@ -16,7 +16,7 @@ class FetchTestController extends BaseController { if (sleep) { Thread.sleep(sleep) } - + response.status = statusInt switch(status[0]) { diff --git a/grails-app/controllers/io/xh/toolbox/admin/PhaseRestController.groovy b/grails-app/controllers/io/xh/toolbox/admin/PhaseRestController.groovy index 36587478c..7630d1fec 100644 --- a/grails-app/controllers/io/xh/toolbox/admin/PhaseRestController.groovy +++ b/grails-app/controllers/io/xh/toolbox/admin/PhaseRestController.groovy @@ -1,10 +1,10 @@ package io.xh.toolbox.admin import io.xh.hoist.admin.AdminRestController -import io.xh.hoist.security.Access +import io.xh.hoist.security.AccessRequiresRole import io.xh.toolbox.roadmap.Phase -@Access(['HOIST_ADMIN_READER']) +@AccessRequiresRole('HOIST_ADMIN_READER') class PhaseRestController extends AdminRestController { static restTarget = Phase diff --git a/grails-app/controllers/io/xh/toolbox/admin/ProjectRestController.groovy b/grails-app/controllers/io/xh/toolbox/admin/ProjectRestController.groovy index c79a99a1e..0e41a362e 100644 --- a/grails-app/controllers/io/xh/toolbox/admin/ProjectRestController.groovy +++ b/grails-app/controllers/io/xh/toolbox/admin/ProjectRestController.groovy @@ -1,11 +1,12 @@ package io.xh.toolbox.admin import io.xh.hoist.admin.AdminRestController -import io.xh.hoist.security.Access +import io.xh.hoist.security.AccessRequiresRole import io.xh.toolbox.roadmap.Project import io.xh.toolbox.roadmap.Phase -@Access(['HOIST_ADMIN_READER']) + +@AccessRequiresRole('HOIST_ADMIN_READER') class ProjectRestController extends AdminRestController { static restTarget = Project diff --git a/grails-app/controllers/io/xh/toolbox/admin/UserController.groovy b/grails-app/controllers/io/xh/toolbox/admin/UserController.groovy index fa352ee6d..6e050e9e7 100755 --- a/grails-app/controllers/io/xh/toolbox/admin/UserController.groovy +++ b/grails-app/controllers/io/xh/toolbox/admin/UserController.groovy @@ -1,10 +1,10 @@ package io.xh.toolbox.admin import io.xh.hoist.admin.AdminRestController -import io.xh.hoist.security.Access +import io.xh.hoist.security.AccessRequiresRole import io.xh.toolbox.user.User -@Access(['HOIST_ADMIN_READER']) +@AccessRequiresRole('HOIST_ADMIN_READER') class UserController extends AdminRestController { static restTarget = User diff --git a/grails-app/controllers/io/xh/toolbox/files/FileManagerController.groovy b/grails-app/controllers/io/xh/toolbox/files/FileManagerController.groovy index 3cc45eb6c..bdd479c5c 100644 --- a/grails-app/controllers/io/xh/toolbox/files/FileManagerController.groovy +++ b/grails-app/controllers/io/xh/toolbox/files/FileManagerController.groovy @@ -1,14 +1,15 @@ package io.xh.toolbox.files -import io.xh.hoist.security.Access +import io.xh.hoist.security.AccessRequiresRole import io.xh.toolbox.BaseController -@Access(['HOIST_ADMIN_READER']) + +@AccessRequiresRole('HOIST_ADMIN_READER') class FileManagerController extends BaseController { def fileManagerService - @Access(['HOIST_ADMIN']) + @AccessRequiresRole('HOIST_ADMIN') def upload() { fileManagerService.saveFromRequest(request) renderJSON(success: true) @@ -34,13 +35,13 @@ class FileManagerController extends BaseController { ) } - @Access(['HOIST_ADMIN']) + @AccessRequiresRole('HOIST_ADMIN') def delete(String filename) { def success = fileManagerService.delete(filename) renderJSON(success: success) } - @Access(['HOIST_ADMIN']) + @AccessRequiresRole('HOIST_ADMIN') def deleteAll() { def ret = fileManagerService.deleteAll() renderJSON(ret)