From 94997e7af136e9f27f84c54d5e45a9dbc98cada7 Mon Sep 17 00:00:00 2001
From: Luka Skukan <luka.skukan@infinum.hr>
Date: Tue, 7 Feb 2017 11:38:15 +0100
Subject: [PATCH 1/2] Add support for idSite email verification

---
 lib/config.yml   | 1 +
 lib/stormpath.js | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/config.yml b/lib/config.yml
index 4e8e77a2..0dc52fc4 100644
--- a/lib/config.yml
+++ b/lib/config.yml
@@ -207,6 +207,7 @@ web:
     loginUri: ""
     forgotUri: "/#/forgot"
     registerUri: "/#/register"
+    verifyUri: "/#/verify"
 
   # Social login configuration.  This defines the callback URIs for OAuth
   # flows, and the scope that is requested of each provider.  Some providers
diff --git a/lib/stormpath.js b/lib/stormpath.js
index 4b6f50d7..97eb0122 100644
--- a/lib/stormpath.js
+++ b/lib/stormpath.js
@@ -210,8 +210,12 @@ module.exports.init = function (app, opts) {
     }
 
     if (web.verifyEmail.enabled) {
-      addGetRoute(web.verifyEmail.uri, controllers.verifyEmail);
-      addPostRoute(web.verifyEmail.uri, controllers.verifyEmail);
+      if (web.idSite.enabled) {
+        addGetRoute(web.verifyEmail.uri, controllers.idSiteRedirect({ path: web.idSite.verifyUri }));
+      } else {
+        addGetRoute(web.verifyEmail.uri, controllers.verifyEmail);
+        addPostRoute(web.verifyEmail.uri, controllers.verifyEmail);
+      }
     }
 
     if (web.me.enabled) {

From 7519f778364fe5402b4b5af724e03cbb4923123b Mon Sep 17 00:00:00 2001
From: Luka Skukan <luka.skukan@infinum.hr>
Date: Tue, 7 Feb 2017 11:41:41 +0100
Subject: [PATCH 2/2] Add note to config.yml

---
 lib/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/config.yml b/lib/config.yml
index 0dc52fc4..dc8af365 100644
--- a/lib/config.yml
+++ b/lib/config.yml
@@ -198,8 +198,8 @@ web:
     errorUri: "/forgot?status=invalid_sptoken"
 
   # If idSite.enabled is true, the user should be redirected to ID site for
-  # login, registration, and password reset.  They should also be redirected
-  # through ID Site on logout.
+  # login, registration, and password reset/verification.  They should also be
+  # redirected through ID Site on logout.
   idSite:
     enabled: false
     uri: "/idSiteResult"