From 08fc0100f80159fd190839e67b0a3970501f3494 Mon Sep 17 00:00:00 2001
From: Bruno Alves de Faria <brunoalvesdefaria@gmail.com>
Date: Fri, 24 Mar 2017 08:30:30 -0300
Subject: [PATCH] Moving the namespace and some functions from user-management
 to user package

---
 Packages/ohif-user-management/client/handlers.js      |  1 +
 Packages/ohif-user-management/client/index.js         |  1 +
 Packages/ohif-user-management/client/lib/index.js     |  2 --
 Packages/ohif-user-management/client/lib/logout.js    |  9 ---------
 Packages/ohif-user-management/package.js              |  4 +---
 Packages/ohif-user/client/index.js                    |  1 +
 .../client/lib/getName.js                             |  0
 Packages/ohif-user/client/lib/index.js                |  2 ++
 Packages/ohif-user/client/lib/logout.js               | 11 +++++++++++
 Packages/{ohif-user-management => ohif-user}/main.js  |  0
 Packages/ohif-user/package.js                         |  3 +++
 11 files changed, 20 insertions(+), 14 deletions(-)
 create mode 100644 Packages/ohif-user-management/client/handlers.js
 delete mode 100644 Packages/ohif-user-management/client/lib/logout.js
 rename Packages/{ohif-user-management => ohif-user}/client/lib/getName.js (100%)
 create mode 100644 Packages/ohif-user/client/lib/index.js
 create mode 100644 Packages/ohif-user/client/lib/logout.js
 rename Packages/{ohif-user-management => ohif-user}/main.js (100%)

diff --git a/Packages/ohif-user-management/client/handlers.js b/Packages/ohif-user-management/client/handlers.js
new file mode 100644
index 000000000..5d768fefa
--- /dev/null
+++ b/Packages/ohif-user-management/client/handlers.js
@@ -0,0 +1 @@
+import { Accounts } from 'meteor/accounts-base';
diff --git a/Packages/ohif-user-management/client/index.js b/Packages/ohif-user-management/client/index.js
index f4fc9803c..fa08377cd 100644
--- a/Packages/ohif-user-management/client/index.js
+++ b/Packages/ohif-user-management/client/index.js
@@ -1,4 +1,5 @@
 import './active-entry';
 import './components';
 import './lib';
+import './handlers';
 import './subscriptions';
diff --git a/Packages/ohif-user-management/client/lib/index.js b/Packages/ohif-user-management/client/lib/index.js
index 641dc9e03..37592a963 100644
--- a/Packages/ohif-user-management/client/lib/index.js
+++ b/Packages/ohif-user-management/client/lib/index.js
@@ -1,4 +1,2 @@
 import './audit';
 import './changePassword';
-import './getName';
-import './logout';
diff --git a/Packages/ohif-user-management/client/lib/logout.js b/Packages/ohif-user-management/client/lib/logout.js
deleted file mode 100644
index 0ac0fe7f1..000000000
--- a/Packages/ohif-user-management/client/lib/logout.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-import { Router } from 'meteor/iron:router';
-import { OHIF } from 'meteor/ohif:core';
-
-OHIF.user.logout = () => {
-    Meteor.logout(function() {
-        Router.go('/entrySignIn');
-    });
-};
diff --git a/Packages/ohif-user-management/package.js b/Packages/ohif-user-management/package.js
index 118cbbd48..c2e96cd0d 100644
--- a/Packages/ohif-user-management/package.js
+++ b/Packages/ohif-user-management/package.js
@@ -23,11 +23,9 @@ Package.onUse(function(api) {
     // Our custom packages
     api.use('ohif:design');
     api.use('ohif:core');
+    api.use('ohif:user');
     api.use('ohif:study-list');
 
-    // Main module
-    api.mainModule('main.js', ['client', 'server']);
-
     // Load icons
     api.addAssets('assets/user-menu-icons.svg', 'client');
 
diff --git a/Packages/ohif-user/client/index.js b/Packages/ohif-user/client/index.js
index be7fc3b83..8e5f5a461 100644
--- a/Packages/ohif-user/client/index.js
+++ b/Packages/ohif-user/client/index.js
@@ -1,2 +1,3 @@
 import './components';
+import './lib';
 import './routes';
diff --git a/Packages/ohif-user-management/client/lib/getName.js b/Packages/ohif-user/client/lib/getName.js
similarity index 100%
rename from Packages/ohif-user-management/client/lib/getName.js
rename to Packages/ohif-user/client/lib/getName.js
diff --git a/Packages/ohif-user/client/lib/index.js b/Packages/ohif-user/client/lib/index.js
new file mode 100644
index 000000000..c1fec9016
--- /dev/null
+++ b/Packages/ohif-user/client/lib/index.js
@@ -0,0 +1,2 @@
+import './getName';
+import './logout';
diff --git a/Packages/ohif-user/client/lib/logout.js b/Packages/ohif-user/client/lib/logout.js
new file mode 100644
index 000000000..a4715c139
--- /dev/null
+++ b/Packages/ohif-user/client/lib/logout.js
@@ -0,0 +1,11 @@
+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
+        });
+    }
+});
diff --git a/Packages/ohif-user-management/main.js b/Packages/ohif-user/main.js
similarity index 100%
rename from Packages/ohif-user-management/main.js
rename to Packages/ohif-user/main.js
diff --git a/Packages/ohif-user/package.js b/Packages/ohif-user/package.js
index d7e2a9743..f6c0d5306 100644
--- a/Packages/ohif-user/package.js
+++ b/Packages/ohif-user/package.js
@@ -24,6 +24,9 @@ Package.onUse(function(api) {
     api.use('ohif:design');
     api.use('ohif:core');
 
+    // Main module
+    api.mainModule('main.js', ['client', 'server']);
+
     // Client imports
     api.addFiles('client/index.js', 'client');
 });