Merge branch 'tuakiri-develop'

* tuakiri-develop:
  Version: 1.7.7 (AccountExpiry, remove MigrationController)
  fix: remove legacy account migration support
  new: add account expiry to org/group accounts view

Author: vladimir-mencl-eresearch

virtualhome/application.properties

@@ -3,4 +3,4 @@
 app.grails.version=2.5.6
 app.name=virtualhome
 app.servlet.version=3.0
-app.version=1.7.6
+app.version=1.7.7

virtualhome/grails-app/conf/UrlMappings.groovy

@@ -74,9 +74,6 @@ class UrlMappings {
     "/lostusername/$action" {
       controller="lostUsername"
     }
-    "/migration/$action" {
-      controller="migrate"
-    }
 
     "/dashboard"(controller:"dashboard", action:"dashboard")
 

virtualhome/grails-app/controllers/aaf/vhr/AccountController.groovy

@@ -5,7 +5,6 @@ import aaf.base.identity.SessionRecord
 
 import aaf.base.identity.Role
 import aaf.vhr.switchch.vho.DeprecatedSubject
-import aaf.vhr.MigrateController
 
 import aaf.vhr.crypto.GoogleAuthenticator
 
@@ -26,13 +25,6 @@ class AccountController {
   }
 
   def login(String username, String password) {
-    def deprecatedSubject = username != null ? DeprecatedSubject.findWhere(login:username, migrated:false) : null
-    if(deprecatedSubject) {
-      session.setAttribute(MigrateController.MIGRATION_USER, username)
-      redirect (controller:'migrate', action:'introduction')
-      return
-    }
-
     def managedSubjectInstance = username != null ? ManagedSubject.findWhere(login: username, [lock:true]) : null
     if(!managedSubjectInstance) {
       log.error "No such ManagedSubject for ${params.login} when attempting myaccount login"

virtualhome/grails-app/controllers/aaf/vhr/LoginController.groovy

@@ -9,7 +9,6 @@ import org.springframework.beans.factory.InitializingBean
 
 import aaf.base.identity.Role
 import aaf.vhr.switchch.vho.DeprecatedSubject
-import aaf.vhr.MigrateController
 
 import aaf.vhr.crypto.GoogleAuthenticator
 
@@ -83,13 +82,6 @@ class LoginController implements InitializingBean {
   }
 
   def login(String username, String password) {
-    def deprecatedSubject = username != null ? DeprecatedSubject.findWhere(login:username, migrated:false) : null
-    if(deprecatedSubject) {
-      session.setAttribute(MigrateController.MIGRATION_USER, username)
-      redirect (controller:'migrate', action:'introduction')
-      return
-    }
-
     def redirectURL = session.getAttribute(SSO_URL)
     if(!redirectURL) {
       log.error "No redirectURL set for login, redirecting to oops"