From 0d81db52f1629b3d1929dd7f33744ca96ccdfdef Mon Sep 17 00:00:00 2001
From: Paulo Gustavo Veiga <pveiga@wisemapping.com>
Date: Sun, 17 Mar 2013 23:40:39 -0300
Subject: [PATCH] Add alter table scripts.

---
 config/database/mysql/v2.0-to-v3.0.sql                       | 3 +--
 config/database/mysql/v3.0-to-v3.1.sql                       | 5 +++++
 .../main/java/com/wisemapping/webmvc/UsersController.java    | 5 ++++-
 3 files changed, 10 insertions(+), 3 deletions(-)
 create mode 100644 config/database/mysql/v3.0-to-v3.1.sql

diff --git a/config/database/mysql/v2.0-to-v3.0.sql b/config/database/mysql/v2.0-to-v3.0.sql
index fb4fca28..5d7cf10d 100644
--- a/config/database/mysql/v2.0-to-v3.0.sql
+++ b/config/database/mysql/v2.0-to-v3.0.sql
@@ -35,8 +35,7 @@ CREATE TABLE ACCESS_AUDITORY (
 #  ON UPDATE NO ACTION
 #, ADD INDEX `user_id` () ;
 
-ALTER TABLE `MINDMAP_HISTORY` DROP COLUMN `creator_user`, ADD COLUMN `editor_id` INT(11) NULL DEFAULT NULL
-AFTER `creation_date`;
+ALTER TABLE `MINDMAP_HISTORY` DROP COLUMN `creator_user`, ADD COLUMN `editor_id` INT(11) NULL DEFAULT NULL AFTER `creation_date`;
 
 ALTER TABLE `USER` ADD COLUMN `locale` VARCHAR(5) NULL
 AFTER `allowSendEmail`;
diff --git a/config/database/mysql/v3.0-to-v3.1.sql b/config/database/mysql/v3.0-to-v3.1.sql
new file mode 100644
index 00000000..4f7b822a
--- /dev/null
+++ b/config/database/mysql/v3.0-to-v3.1.sql
@@ -0,0 +1,5 @@
+ALTER TABLE `USER` ADD COLUMN `authentication_type` CHAR(1) CHARACTER SET utf8 NOT NULL DEFAULT 'D'
+AFTER `colaborator_id`;
+
+ALTER TABLE `USER` ADD COLUMN `authenticator_uri` VARCHAR(255) CHARACTER SET utf8
+AFTER `authentication_type`;
\ No newline at end of file
diff --git a/wise-webapp/src/main/java/com/wisemapping/webmvc/UsersController.java b/wise-webapp/src/main/java/com/wisemapping/webmvc/UsersController.java
index 7673a3a3..20104c2f 100644
--- a/wise-webapp/src/main/java/com/wisemapping/webmvc/UsersController.java
+++ b/wise-webapp/src/main/java/com/wisemapping/webmvc/UsersController.java
@@ -74,7 +74,10 @@ public class UsersController {
             userService.resetPassword(email);
             result = new ModelAndView("forgotPasswordSuccess");
 
-        } catch (InvalidUserEmailException|InvalidAuthSchemaException e) {
+        } catch (InvalidUserEmailException e) {
+            result = new ModelAndView("forgotPasswordError");
+        }
+        catch (InvalidAuthSchemaException e) {
             result = new ModelAndView("forgotPasswordError");
         }
         return result;