Overriding NimblePluginResources.groovy

.gitignore

@@ -1,26 +1,29 @@
-
-grails-app/conf/NimbleBootStrap.groovy
-grails-app/domain/intient/test/*
-
-.DS_Store
-.sass-cache
-classes
-stacktrace.log
-docs.tar.gz 
-
-*~
-*.ipr
-*.iml
-*.iws
-*.war
-web-app/plugins/*
-target/
-test/reports/*
-unzipped/*
-docs/*
-*.zip
-plugin.xml
-
-src/docs
-
-grails-app/i18n/shiro.properties
+
+grails-app/conf/NimbleBootStrap.groovy
+grails-app/domain/intient/test/*
+
+.DS_Store
+.sass-cache
+classes
+stacktrace.log
+docs.tar.gz 
+
+*~
+*.ipr
+*.iml
+*.iws
+*.war
+web-app/plugins/*
+web-app/css/*
+web-app/images/*
+web-app/js/*
+target/
+test/reports/*
+unzipped/*
+docs/*
+*.zip
+plugin.xml
+
+src/docs
+
+grails-app/i18n/shiro.properties

NimbleGrailsPlugin.groovy

@@ -27,7 +27,7 @@ import grails.plugins.nimble.core.UserBase
 class NimbleGrailsPlugin {
 
     // the plugin version
-    def version = "0.4-SNAPSHOT"
+    def version = "1.0-SNAPSHOT"
 
     // the version or versions of Grails the plugin is designed for
     def grailsVersion = "1.1 > *"
@@ -45,7 +45,7 @@ class NimbleGrailsPlugin {
                       'grails-app/conf/NimbleBootStrap.groovy',
     ]
 
-    def author = "Bradley Beddoes and  open source contributors"
+    def author = "Bradley Beddoes, Chris Doty, Mike Wille and open source contributors"
     def authorEmail = "[email protected]"
     def title = "Nimble"
     def description = '''\\
@@ -55,7 +55,7 @@ class NimbleGrailsPlugin {
     // URL to the plugin's documentation
     def documentation = "http://sites.google.com/site/nimbledoc/"
 
-    def observe = ['controllers']
+    def observe = ['controllers', 'services', 'filters']
 
     def doWithSpring = {
         loadNimbleConfig(application)
@@ -119,23 +119,28 @@ class NimbleGrailsPlugin {
     }
 
     def onChange = { event ->
-        doWithDynamicMethods()
+		if(event.source) {
+        	injectAuthn(event.source, event.application)
+		}
     }
 
     def onConfigChange = { event ->
 
     }
 
-    private void injectAuthn(def clazz, def application) {
+    private void injectAuthn(def clazz, GrailsApplication grailsApplication) {
+		def config = grailsApplication.config
+        GroovyClassLoader classLoader = new GroovyClassLoader(getClass().classLoader)
+
 		clazz.metaClass.getAuthenticatedSubject = {
         	def subject = SecurityUtils.getSubject()
         }
         clazz.metaClass.getAuthenticatedUser = {
         	def principal = SecurityUtils.getSubject()?.getPrincipal()		
 			def authUser
 
-            if(application.config?.nimble?.implementation?.user)
-    			authUser = grailsApplication.classLoader.loadClass(application.config.nimble.implementation.user).get(principal)
+            if(config.nimble?.implementation?.user)
+    			authUser = classLoader.loadClass(config.nimble.implementation.user).get(principal)
     		else
     			authUser = UserBase.get(principal)
 
@@ -155,6 +160,13 @@ class NimbleGrailsPlugin {
         // Merging default Nimble config into main application config
         config.merge(new ConfigSlurper(GrailsUtil.environment).parse(classLoader.loadClass('DefaultNimbleConfig')))
 
+		// Merging default Nimble Social config into main application config if social is used.
+        try {
+            config.merge(new ConfigSlurper(GrailsUtil.environment).parse(classLoader.loadClass('DefaultNimbleSocialConfig')))
+        } catch (Exception ignored) {
+            // ignore, just use the defaults
+        }
+
         // Merging user-defined Nimble config into main application config if provided
         try {
             config.merge(new ConfigSlurper(GrailsUtil.environment).parse(classLoader.loadClass('NimbleConfig')))

application.properties

@@ -1,10 +1,10 @@
-#Grails Metadata file
-#Thu Feb 11 07:30:26 EST 2010
-app.grails.version=1.2.1
-app.name=nimble
-app.servlet.version=2.4
-app.version=0.4
-plugins.hibernate=1.2.1
-plugins.mail=0.6
-plugins.shiro=1.0.1
-plugins.tomcat=1.2.1
+#Grails Metadata file
+#Wed Apr 21 20:59:53 CDT 2010
+app.grails.version=1.3.0.RC1
+app.name=nimble
+app.servlet.version=2.4
+app.version=0.4
+plugins.hibernate=1.3.0.RC1
+plugins.mail=0.6
+plugins.shiro=1.0.1
+plugins.tomcat=1.3.0.RC1

grails-app/conf/BuildConfig.groovy

@@ -0,0 +1,25 @@
+grails.project.class.dir = "target/classes"
+grails.project.test.class.dir = "target/test-classes"
+grails.project.test.reports.dir	= "target/test-reports"
+grails.project.dependency.resolution = {
+    inherits "global" // inherit Grails' default dependencies
+    log "warn" // log level of Ivy resolver, either 'error', 'warn', 'info', 'debug' or 'verbose'
+    repositories {
+        grailsHome()
+        // grailsCentral()
+    }
+    dependencies {
+        // specify dependencies here under either 'build', 'compile', 'runtime', 'test' or 'provided' scopes eg.
+        // runtime 'com.mysql:mysql-connector-java:5.1.5'
+    }
+
+}
+
+nimble {
+  resources {
+    nomodcheck = false
+    nocompilesass = false
+    nocompress = false
+    noclean = false
+  }
+}

grails-app/conf/DefaultNimbleConfig.groovy

@@ -15,6 +15,10 @@
  *  limitations under the License.
  */
 
+// change the JavaScript library that grails & nimble use by adjusting this value
+// valid values: jquery, mootools prototype
+grails.views.javascript.library='jquery'
+
 nimble {
 
     tablenames {
@@ -28,6 +32,8 @@ nimble {
         permission = "permission"
         levelpermission = "level_permission"
         url = "url"
+        socialmediaaccount = "social_media_account"
+        socialmediaservice = "social_media_service"
     }
 
     fieldnames {
@@ -41,6 +47,12 @@ nimble {
         customcss = ''
     }
 
+    resources {
+        jslibrary = grails.views.javascript.library
+        usejsdev = false
+        usecssdev = false
+    }
+
     localusers {
         usernames {
             minlength = 4
@@ -51,15 +63,15 @@ nimble {
 		}
     }
 
-	fields {
-		admin {
-			user['username', 'external', 'federated']
-		}
-		enduser {
-			user['username', 'pass', 'passConfirm']
-			profile['fullName', 'email']
-		}
-	}
+    fields {
+        admin {
+            user = ['username', 'external', 'federated']
+        }
+        enduser {
+            user = ['username', 'pass', 'passConfirm']
+            profile = ['fullName', 'email']
+        }
+    }
 
     passwords {
         mustcontain {

grails-app/controllers/grails/plugins/nimble/core/AccountController.groovy

@@ -103,6 +103,10 @@ class AccountController {
 
         def user = InstanceGenerator.user()
         user.profile = InstanceGenerator.profile()
+        def userFields = grailsApplication.config.nimble.fields.enduser.user
+        def profileFields = grailsApplication.config.nimble.fields.enduser.profile
+        user.properties[userFields] = params
+        user.profile.properties[profileFields] = params
 
         log.debug("Starting new user creation")
         [user: user]
@@ -117,9 +121,11 @@ class AccountController {
 
         def user = InstanceGenerator.user()
         user.profile = InstanceGenerator.profile()
+        def userFields = grailsApplication.config.nimble.fields.enduser.user
+        def profileFields = grailsApplication.config.nimble.fields.enduser.profile
+        user.properties[userFields] = params
+        user.profile.properties[profileFields] = params
         user.profile.owner = user
-        user.properties['username', 'pass', 'passConfirm'] = params
-        user.profile.properties['fullName', 'email'] = params
         user.enabled = grailsApplication.config.nimble.localusers.provision.active
         user.external = false
 
@@ -137,6 +143,10 @@ class AccountController {
         if (user.profile.email == null || user.profile.email.length() == 0)
         user.profile.email = 'invalid'
 
+		// Allow host application to do some validation, etc.
+		if(userService.events['beforeregister']) {
+			userService.events['beforeregister'](user)
+		}
 
         if (user.hasErrors()) {
             log.debug("Submitted values for new user are invalid")
@@ -170,6 +180,10 @@ class AccountController {
             return
         }
 
+		if(userService.events['afterregister']) {
+			userService.events['afterregister'](user)
+		}
+
         log.info("Sending account registration confirmation email to $user.profile.email with subject $grailsApplication.config.nimble.messaging.registration.subject")
         if(grailsApplication.config.nimble.messaging.enabled) {
 			sendMail {
@@ -303,7 +317,7 @@ class AccountController {
                 userService.setRandomPassword(user)
 
                 log.info("Sending account password reset email to $user.profile.email with subject $grailsApplication.config.nimble.messaging.passwordreset.subject")
-                if(grailsApplication.config.nimble.messaging.enabled) {
+                if(grailsApplication.config.nimble.messaging.enabled && !grailsApplication.config.nimble.provision.active) {
 					sendMail {
 	                    to user.profile.email
 						from grailsApplication.config.nimble.messaging.mail.from

grails-app/controllers/grails/plugins/nimble/core/AuthController.groovy

@@ -36,7 +36,7 @@ import grails.plugins.nimble.auth.AccountCreatedException
 class AuthController {
 
     private static String TARGET = 'grails.plugins.nimble.controller.AuthController.TARGET'
-    
+
     def shiroSecurityManager
     def facebookService
     def openIDService
@@ -88,7 +88,7 @@ class AuthController {
         catch (IncorrectCredentialsException e) {
             log.info "Credentials failure for user '${params.username}'."
             log.debug(e)
-      
+
             flash.type = 'error'
             flash.message = message(code: "nimble.login.failed.credentials")
         }
@@ -324,7 +324,7 @@ class AuthController {
             response.sendError(403)
             return
         }
-    
+
         def discovered = session.getAttribute("discovered")
         ParameterList openIDResponse = new ParameterList(request.getParameterMap());
 
@@ -356,7 +356,7 @@ class AuthController {
         }
         else {
             log.debug ("OpenID authentication failure")
-      
+
             flash.type = 'error'
             flash.message = message(code: "nimble.login.openid.${service}.internal.error.res")
             redirect(action: 'login', params: [active: service])

grails-app/controllers/grails/plugins/nimble/core/UserController.groovy

@@ -84,13 +84,15 @@ class UserController {
       redirect action: edit, id: params.id
     }
 	else {
-		def fields = grailsApplication.config.nimble.fields.admin.user
-		user.properties[fields] = params
-	    if (!user.validate()) {
-	    	log.debug("Updated details for user [$user.id]$user.username are invalid")
-		    render view: 'edit', model: [user: user]
-	    } 
-		else {
+      def fields = grailsApplication.config.nimble.fields.admin.user
+      def profileFields = grailsApplication.config.nimble.fields.enduser.profile
+      user.properties[fields] = params
+      user.profile.properties[profileFields] = params
+      if (!user.validate()) {
+            log.debug("Updated details for user [$user.id]$user.username are invalid")
+            render view: 'edit', model: [user: user]
+      }
+      else {
 	      	def updatedUser = userService.updateUser(user)
 	        log.info("Successfully updated details for user [$user.id]$user.username")
 	        flash.type = "success"
@@ -110,10 +112,10 @@ class UserController {
   def save = {
     def user = InstanceGenerator.user()
     user.profile = InstanceGenerator.profile()
-	def userFields = grailsApplication.config.nimble.fields.enduser.user
-	def profileFields = grailsApplication.config.nimble.fields.enduser.profile
-	user.properties[userFields] = params	
-	user.profile.properties[profileFields] = params
+    def userFields = grailsApplication.config.nimble.fields.enduser.user
+    def profileFields = grailsApplication.config.nimble.fields.enduser.profile
+    user.properties[userFields] = params
+    user.profile.properties[profileFields] = params
     user.enabled = false
     user.external = false
 

grails-app/i18n/messages-nimble.properties

@@ -132,6 +132,7 @@ nimble.view.account.registeraccount.complete.title=Successfully registered accou
 nimble.view.account.registeraccount.complete.heading=Successfully registered account
 nimble.view.account.registeraccount.complete.descriptive=You've successfully registered for a new account on this system.
 nimble.view.account.registeraccount.complete.sentemail=To complete the process an email has been sent to your nominated email address. Please follow the instructions to login for the first time.
+nimble.view.account.registeraccount.complete.continue=Continue
 
 nimble.view.account.forgottenpassword.initiate.title=Forgotten Password
 nimble.view.account.forgottenpassword.initiate.heading=Forgotten Password
@@ -202,6 +203,7 @@ nimble.view.user.show.extendedinformation.heading=Extended account information
 
 ##########
 # Templates
+nimble.template.sessionterminated.title=Session Terminated
 nimble.template.sessionterminated.descriptive=Unfortunately your session has expired. This usually happens when a page is left open for long periods of time without performing any action. If you're experiencing this problem often contact your helpdesk for assistance.
 
 nimble.template.logins.heading=Logins
@@ -246,7 +248,6 @@ nimble.template.passwordpolicy=<p>To ensure security passwords must meet the fol
     <li>Not previously used as a password on this account</li> \
   </ul> \
   <p>Ideally set a password that is considered to be in the category 'strongest' by the indicator bar.</p>
-
 nimble.template.accountcreationpolicy=<p>This service integrates with all of the following account providers</p> \
   <ul> \
     <li>Google</li> \
@@ -442,4 +443,4 @@ nimble.levelpermission.invalid.second.sector=The second sector is invalid. It mu
 nimble.levelpermission.invalid.third.sector=The third sector is invalid. It must not contain seperator (:) characters
 nimble.levelpermission.invalid.fourth.sector=The fourth sector is invalid. It must not contain seperator (:) characters
 nimble.levelpermission.invalid.fifth.sector=The fifth sector is invalid. It must not contain seperator (:) characters
-nimble.levelpermission.invalid.sixth.sector=The sixth sector is invalid. It must not contain seperator (:) characters
+nimble.levelpermission.invalid.sixth.sector=The sixth sector is invalid. It must not contain seperator (:) characters