Changeset 71 for branches

Timestamp:

Mar 10, 2009, 3:00:59 AM (16 years ago)

Author:

gav

Message:

Start changing roles to AppAdmin? and AppUser?.
Add Options view, start code for user changeable passwords.
Repair home and admin bean error variables.

Location:

branches/TaskRewrite/src/grails-app

Files:

• conf/BootStrap.groovy (modified) (1 diff)
• conf/SecurityConfig.groovy (modified) (1 diff)
• controllers/AppCoreController.groovy (modified) (2 diffs)
• controllers/AuthorityController.groovy (modified) (1 diff)
• controllers/BaseController.groovy (modified) (1 diff)
• views/_adminmenubar.gsp (modified) (2 diffs)
• views/appCore/admin.gsp (modified) (1 diff)
• views/appCore/home.gsp (modified) (1 diff)
• views/appCore/options.gsp (added)

branches/TaskRewrite/src/grails-app/conf/BootStrap.groovy

@@ -63 +63 @@
         def authInstance
 
-        authInstance = new Authority(description:"Application Admin",
-                                        authority:"ROLE_ADMIN")
+        authInstance = new Authority(description:"Application Admin, grants full admin access to the application.",
+                                        authority:"ROLE_AppAdmin")
         BootStrapSaveAndTest(authInstance)
 
-        authInstance = new Authority(description:"Application Admin",
-                                        authority:"ROLE_USER")
+        authInstance = new Authority(description:"Application User, all application users need this base role.",
+                                        authority:"ROLE_AppUser")
         BootStrapSaveAndTest(authInstance)
             

branches/TaskRewrite/src/grails-app/conf/SecurityConfig.groovy

@@ -20 +20 @@
 
     //Set true especially if used across the internet.
-    forceHttps = 'true'
+    forceHttps = 'false'
 
     //Pessimistic locking, deny access to all URLs that don't 

branches/TaskRewrite/src/grails-app/controllers/AppCoreController.groovy

@@ -2 +2 @@
 
 class AppCoreController extends BaseController {
+
+    def authenticateService
 
     def index = { redirect(action:home,params:params) }
@@ -12 +14 @@
     }
 
-    @Secured(['ROLE_ADMIN'])   
+    def options = {
+        def principal = authenticateService.principal()
+        println principal.getUsername()//get username
+        println principal.getAuthorities()//get authorities()
+    }
+
+    @Secured(['ROLE_AppAdmin'])   
     def admin = {
     }

branches/TaskRewrite/src/grails-app/controllers/AuthorityController.groovy

@@ -1 +1 @@
 import org.codehaus.groovy.grails.plugins.springsecurity.Secured
 
-@Secured(['ROLE_ADMIN'])
+@Secured(['ROLE_AppAdmin'])
 class AuthorityController {
 

branches/TaskRewrite/src/grails-app/controllers/BaseController.groovy

@@ -1 +1 @@
 import org.codehaus.groovy.grails.plugins.springsecurity.Secured
 
-@Secured(['ROLE_USER'])
+@Secured(['ROLE_AppUser'])
 abstract class BaseController {
     def whatsit() {

branches/TaskRewrite/src/grails-app/views/_adminmenubar.gsp

@@ -1 +1 @@
 <g:isLoggedIn>
-    <g:ifAnyGranted role="ROLE_ADMIN">
+    <g:ifAnyGranted role="ROLE_AppAdmin">
         <span class="appControlButton">
             <g:link controller="appCore" action="admin">
@@ -8 +8 @@
     </g:ifAnyGranted>
     <span class="appControlButton">
+        <g:link controller="appCore" action="options">
+                Options
+        </g:link>
+    </span>
+    <span class="appControlButton">
         <g:link controller="logout">
                 Log out

branches/TaskRewrite/src/grails-app/views/appCore/admin.gsp

@@ -16 +16 @@
                 <ul>
                 <g:each var="c" in="${grailsApplication.controllerClasses}">
-                        <li class="controller"><g:link
-    controller="${c.logicalPropertyName}">${c.fullName}</g:link></li>
+                        <li class="controller"><g:link controller="${c.logicalPropertyName}">${c.fullName}</g:link></li>
                 </g:each>
                 </ul>

branches/TaskRewrite/src/grails-app/views/appCore/home.gsp

@@ -15 +15 @@
                 <div class="message">${flash.message}</div>
             </g:if>
-            <g:hasErrors bean="${person}">
+            <g:hasErrors bean="${appCoreInstance}">
                 <div class="errors">
-                    <g:renderErrors bean="${person}" as="list" />
+                    <g:renderErrors bean="${appCoreInstance}" as="list" />
                 </div>
             </g:hasErrors>