#1284

removed location bookmark action out of CAS

Author: temi

grails-app/conf/application.yml

@@ -58,7 +58,7 @@ app:
 security:
    cas:
       casProperties: "casServerLoginUrl,serverName,centralServer,casServerName,uriFilterPattern,uriExclusionFilter,uriExclusionFilterPattern,casServerLoginUrlPrefix,gateway,casServerUrlPrefix,contextPath,gatewayStorageClass"
-      uriExclusionFilterPattern: "/assets/.*,/images.*,/css.*,/js.*,/less.*,/ajax/bulkLookupQuestions,/uploads/.*"
+      uriExclusionFilterPattern: "/assets/.*,/images.*,/css.*,/js.*,/less.*,/ajax/(bulkLookupQuestions|saveBookmarkLocation|getBookmarkLocations),/uploads/.*"
       authenticateOnlyIfLoggedInPattern: ".*"
       uriFilterPattern: ".*/user/.*,.*/site/(?!(index|list|elasticsearch|getImages|getPoiImages|ajaxUpdate|checkSiteName|ajaxList|checkPointInsideProjectAreaAndAddress)).*,.*/project/(?!(index|search|citizenScience|listRecordImages|projectSummaryReportCallback)).*,.*/activity/(?!index).*,.*/output/(?!index).*,.*/image/(?!index).*,.*/admin/.*,i.*/proxy/speciesListPost,.*/proxy/documentUpdate,.*/proxy/deleteDocument,.*/home/advanced,.*/organisation/(?!index).*,.*/organisation/(?!list).*,.*/bioActivity/create/.*,.*/bioActivity/edit/.*,.*/bioActivity/list,/sight/.*"
       readOnlyOfficerRole: "ROLE_FC_READ_ONLY"

grails-app/controllers/au/org/ala/biocollect/merit/AjaxController.groovy

@@ -5,8 +5,8 @@ import org.grails.web.json.JSONObject
 
 class AjaxController {
 
-    def authService
     def locationService
+    def userInfoService
 
     /**
      * Simple action that can be called by long running pages periodically to keep the container session alive.
@@ -18,7 +18,7 @@ class AjaxController {
     }
 
     def getBookmarkLocations() {
-        def userId = authService.userId
+        def userId = userInfoService.getCurrentUser()?.userId
         def result = locationService.getBookmarkLocationsForUser(userId)
 
         if (result.hasProperty("error")) {
@@ -29,7 +29,7 @@ class AjaxController {
     }
 
     def saveBookmarkLocation() {
-        def userId = authService.userId
+        def userId = userInfoService.getCurrentUser()?.userId
         JSONObject bookmark = request.JSON
         bookmark.put("userId", userId)
         log.debug "post json = ${request.JSON}"

grails-app/views/layouts/mobile.gsp

@@ -33,20 +33,18 @@
     <g:layoutBody/>
 </div>
 
-<asset:script type="text/javascript">
-    $(function() {
-        $.ajaxSetup({
-            cache: false,
-            xhrFields: {
-                withCredentials: true
-            },
-            beforeSend: function(xhr){
-                xhr.setRequestHeader('authKey', "${authKey}");
+<script type="text/javascript">
+    $.ajaxSetup({
+        cache: false,
+        xhrFields: {
+            withCredentials: true
+        },
+        beforeSend: function(xhr){
+            xhr.setRequestHeader('authKey', "${authKey}");
                 xhr.setRequestHeader('userName', "${userName}");
             }
-        });
     });
-</asset:script>
+</script>
 <asset:deferredScripts/>
 </body>
 </html>