feat(Routes): show modal after verifying email

blockchain · Dec 18, 2015 · 9e7438c · 9e7438c
1 parent ecc6c2a
commit 9e7438c
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 18 deletions.
diff --git a/assets/js/controllers/login.controller.js b/assets/js/controllers/login.controller.js
@@ -93,17 +93,6 @@ function LoginCtrl($scope, $rootScope, $log, $http, Wallet, Alerts, $cookieStore
   if ($scope.key != null) {
     $scope.status.enterkey = true;
   }
-  if ($cookieStore.get('email-verified')) {
-    $cookieStore.remove('email-verified');
-    $translate(['SUCCESS', 'EMAIL_VERIFIED_SUCCESS', 'EMAIL_VERIFIED_SUCCESS_NO_UID']).then(translations => {
-      $scope.$emit('showNotification', {
-        type: 'verified-email',
-        icon: 'ti-email',
-        heading: translations.SUCCESS
-        // msg: $scope.uidAvailable ? translations.EMAIL_VERIFIED_SUCCESS : translations.EMAIL_VERIFIED_SUCCESS_NO_UID
-      });
-    });
-  }
   $scope.twoFactorCode = "";
   $scope.busy = false;
   $scope.isValid = false;

diff --git a/assets/js/controllers/verifyEmail.controller.js b/assets/js/controllers/verifyEmail.controller.js
@@ -2,14 +2,40 @@ angular
   .module('walletApp')
   .controller("VerifyEmailCtrl", VerifyEmailCtrl);
 
-function VerifyEmailCtrl($scope, Wallet, $stateParams, $state, Alerts) {
+function VerifyEmailCtrl($scope, Wallet, $stateParams, $state, Alerts, $translate, $rootScope) {
   const success = (uid) => {
-    $state.go("public.login-uid", {uid: uid})
+    uid = null;
+
+    if(uid) {
+      $translate(['SUCCESS', 'EMAIL_VERIFIED_SUCCESS']).then(translations => {
+        $state.go("public.login-uid", {uid: uid}).then(() =>{
+          $rootScope.$emit('showNotification', {
+            type: 'verified-email',
+            icon: 'ti-email',
+            heading: translations.SUCCESS,
+            msg: translations.EMAIL_VERIFIED_SUCCESS
+          });
+        });
+      });
+    } else {
+      $translate(['SUCCESS', 'EMAIL_VERIFIED_SUCCESS_NO_UID']).then(translations => {
+        $state.go("public.login-no-uid").then(() => {
+          $rootScope.$emit('showNotification', {
+            type: 'verified-email',
+            icon: 'ti-email',
+            heading: translations.SUCCESS,
+            msg: translations.EMAIL_VERIFIED_SUCCESS_NO_UID
+          });
+        });
+      });
+    }
+
+
   }
 
   const error = (message) => {
     $state.go("public.login-no-uid");
-    Alerts.displayError(error);
+    Alerts.displayError(message, true);
   }
 
   Wallet.verifyEmail($stateParams.token, success, error)

diff --git a/assets/js/services/wallet.service.js b/assets/js/services/wallet.service.js
@@ -1205,15 +1205,14 @@ function Wallet($http, $window, $timeout, Alerts, MyWallet, MyBlockchainApi, MyB
   };
 
   wallet.verifyEmail = (token, successCallback, errorCallback) => {
-    const success = (result) => {
-      // TODO: process result in My-Wallet-V3
-
+    const success = (guid) => {
       wallet.user.isEmailVerified = true;
-      successCallback(result.guid);
+      successCallback(guid);
       wallet.applyIfNeeded();
     }
 
     const error = (message) => {
+      console.log(message);
       errorCallback(message);
     }