Redirect straight to homepages after login

uwcse481h2016 · Feb 22, 2016 · 23bbc49 · 23bbc49
1 parent e3a7e17
commit 23bbc49
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 17 deletions.
diff --git a/grails-app/conf/application.groovy b/grails-app/conf/application.groovy
@@ -1,14 +1,16 @@
 
 
 // Added by the Spring Security Core plugin:
+grails.plugin.springsecurity.useSecurityEventListener = true
 grails.plugin.springsecurity.userLookup.userDomainClassName = 'appforliteracy.User'
 grails.plugin.springsecurity.userLookup.authorityJoinClassName = 'appforliteracy.UserRole'
 grails.plugin.springsecurity.userLookup.usernamePropertyName = 'email'
 grails.plugin.springsecurity.authority.className = 'appforliteracy.Role'
 //grails.plugin.springsecurity.rejectIfNoRule = false
 //grails.plugin.springsecurity.fii.rejectPublicInvocations = false
 grails.plugin.springsecurity.auth.loginFormUrl = '/login/auth'
-grails.plugin.springsecurity.successHandler.defaultTargetUrl = "/researcher/home"
+grails.plugin.springsecurity.successHandler.alwaysUseDefault = true
+grails.plugin.springsecurity.successHandler.defaultTargetUrl = "/user/auth"
 grails.plugin.springsecurity.failureHandler.defaultFailureUrl = '/login/auth'
 grails.plugin.springsecurity.logout.afterLogoutUrl = '/'
 grails.plugin.springsecurity.logout.alwaysUseDefaultTargetUrl = true
@@ -17,7 +19,6 @@ grails.plugin.springsecurity.controllerAnnotations.staticRules = [
 	[pattern: '/',               access: ['ROLE_RESEARCHER', 'ROLE_USER']],
 	[pattern: '/error',          access: ['permitAll']],
 	[pattern: '/index',          access: ['permitAll']],
-	[pattern: '/index.gsp',      access: ['permitAll']],
 	[pattern: '/shutdown',       access: ['permitAll']],
 	[pattern: '/assets/**',      access: ['permitAll']],
 	[pattern: '/**/js/**',       access: ['permitAll']],
@@ -31,7 +32,6 @@ grails.plugin.springsecurity.interceptUrlMap = [
    [pattern: '/',               access: ['ROLE_RESEARCHER', 'ROLE_USER']],
    [pattern: '/error',          access: ['permitAll']],
    [pattern: '/index',          access: ['permitAll']],
-   [pattern: '/index.gsp',      access: ['permitAll']],
    [pattern: '/shutdown',       access: ['permitAll']],
    [pattern: '/assets/**',      access: ['permitAll']],
    [pattern: '/**/js/**',       access: ['permitAll']],
@@ -46,7 +46,9 @@ grails.plugin.springsecurity.interceptUrlMap = [
    [pattern: '/learner/**',     access: ['IS_AUTHENTICATED_FULLY']],
    [pattern: '/fileInput/**',   access: ['ROLE_RESEARCHER']],
    [pattern: '/fileOutput/**',  access: ['ROLE_RESEARCHER']],
-   [pattern: '/firstExample/**',access: ['ROLE_USER']]
+   [pattern: '/firstExample/**',access: ['ROLE_USER']],
+   [pattern: '/user/**',        access: ['ROLE_RESEARCHER', 'ROLE_USER']]
+
 ]
 
 grails.plugin.springsecurity.filterChain.chainMap = [
@@ -61,3 +63,4 @@ grails.plugin.springsecurity.filterChain.chainMap = [
 grails.plugin.springsecurity.rememberMe.persistent = true
 grails.plugin.springsecurity.rememberMe.persistentToken.domainClassName = 'appforliteracy.PersistentLogin'
 
+
diff --git a/grails-app/conf/spring/resources.groovy b/grails-app/conf/spring/resources.groovy
@@ -1,3 +1,6 @@
+import appforliteracy.LoginSuccessHandler
+
 
 beans = {
+    loginSuccess(LoginSuccessHandler)
 }
diff --git a/grails-app/controllers/UrlMappings.groovy b/grails-app/controllers/UrlMappings.groovy
@@ -10,7 +10,7 @@ class UrlMappings {
         }
 
 
-        "/"(view:"/index")
+        "/"(view:"login/auth")
         "500"(view:'/error')
         "404"(view:'/notFound')
     }

diff --git a/grails-app/controllers/appforliteracy/AuthenticationController.groovy b/grails-app/controllers/appforliteracy/AuthenticationController.groovy
@@ -1,9 +1,10 @@
 package appforliteracy
+import grails.plugin.springsecurity.*
 
 class AuthenticationController {
 
     def auth() {
-        User r = User.findByEmail(params.email)
+        User r = springSecurityService.currentUser
         if (r.password == params.password){
             if (r instanceof Researcher) {
                 redirect(controller: "researcher", action: "home", id: r.getId())

diff --git a/grails-app/controllers/appforliteracy/UserController.groovy b/grails-app/controllers/appforliteracy/UserController.groovy
@@ -1,4 +1,16 @@
 package appforliteracy
 
 class UserController extends grails.plugin.springsecurity.ui.UserController {
+    def springSecurityService
+
+    def auth() {
+        User r = springSecurityService.currentUser
+
+        if (r instanceof Researcher) {
+            redirect(controller: "researcher", action: "home", id: r.getId())
+        } else {
+            redirect(controller: "learner", action: "home", id: r.getId())
+        }
+
+    }
 }
diff --git a/grails-app/views/index.gsp b/grails-app/views/index.gsp
diff --git a/grails-app/views/login/auth.gsp b/grails-app/views/login/auth.gsp
@@ -37,7 +37,7 @@
         </p>
 
 	<p>
-            <input type="submit" id="submit" controller="researcher" action="home" value="${message(code: 'springSecurity.login.button')}"/>
+            <input type="submit" id="submit" value="${message(code: 'springSecurity.login.button')}"/>
 	</p>
     </form>
 </div> <!-- /container -->
-Original file line number
+Diff line change
@@ Expand Up / @@ -37,7 +37,7 @@ @@
             </p>
     	<p>
-                <input type="submit" id="submit" controller="researcher" action="home" value="${message(code: 'springSecurity.login.button')}"/>
+                <input type="submit" id="submit" value="${message(code: 'springSecurity.login.button')}"/>
     	</p>
         </form>
     </div> <!-- /container -->
@@ Expand Down @@