From 44fa8f0e21d16c84ded9e27f4a0ec0d60867595f Mon Sep 17 00:00:00 2001
From: Bruno Alves de Faria <brunoalvesdefaria@gmail.com>
Date: Wed, 27 Sep 2017 14:10:10 -0300
Subject: [PATCH] Returning a promise on logout and delegating login
 redireciton

---
 .../client/components/login/userLogin.js          | 10 +---------
 Packages/ohif-user/client/lib/logout.js           | 15 ++++++++-------
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/Packages/ohif-user/client/components/login/userLogin.js b/Packages/ohif-user/client/components/login/userLogin.js
index 9feea178b..7fea96dd8 100644
--- a/Packages/ohif-user/client/components/login/userLogin.js
+++ b/Packages/ohif-user/client/components/login/userLogin.js
@@ -26,16 +26,8 @@ Template.userLogin.onCreated(() => {
                 Meteor.defer(() => displayComponent.$element.focus());
             };
 
-            // Handle success and redirect the user
-            const successHandler = () => {
-                const currentRoute = Router.current();
-                const redirect = currentRoute.params.query.redirect;
-                const path = redirect ? decodeURI(redirect) : '/';
-                return Router.go(path);
-            };
-
             // Call the login method
-            return OHIF.user.login(formData).then(successHandler).catch(errorHandler);
+            return OHIF.user.login(formData).catch(errorHandler);
         }
     };
 
diff --git a/Packages/ohif-user/client/lib/logout.js b/Packages/ohif-user/client/lib/logout.js
index a4715c139..5a9ef4c18 100644
--- a/Packages/ohif-user/client/lib/logout.js
+++ b/Packages/ohif-user/client/lib/logout.js
@@ -1,11 +1,12 @@
 import { Meteor } from 'meteor/meteor';
 import { OHIF } from 'meteor/ohif:core';
 
-OHIF.user.logout = () => Meteor.logout(error => {
-    if (error) {
-        OHIF.ui.showDialog('dialogInfo', {
-            title: 'Error',
-            message: error.reason
-        });
-    }
+OHIF.user.logout = () => new Promise((resolve, reject) => {
+    Meteor.logout(error => {
+        if (error) {
+            reject(error);
+        }
+
+        resolve();
+    });
 });