From 25fef2d826cdecbce7f195b7e1ea1a535e062822 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Fri, 21 Oct 2016 23:00:12 -0400 Subject: [PATCH] key not required in order to be considered logged in --- src/services/userService.js | 30 ++++++++---------------------- 1 file changed, 8 insertions(+), 22 deletions(-) diff --git a/src/services/userService.js b/src/services/userService.js index 548e5982042..415141c36b0 100644 --- a/src/services/userService.js +++ b/src/services/userService.js @@ -103,20 +103,13 @@ function initUserService() { } var self = this; - self.cryptoService.getKey(false, function (key) { - if (!key) { + self.tokenService.getToken(function (token) { + if (!token) { callback(false); } else { - self.tokenService.getToken(function (token) { - if (!token) { - callback(false); - } - else { - self.getUserId(function (userId) { - callback(userId !== null); - }); - } + self.getUserId(function (userId) { + callback(userId !== null); }); } }); @@ -128,20 +121,13 @@ function initUserService() { } var self = this; - self.cryptoService.getKey(false, function (key) { - if (!key) { + self.tokenService.getToken(function (token) { + if (!token) { callback(false); } else { - self.tokenService.getToken(function (token) { - if (!token) { - callback(false); - } - else { - self.getUserId(function (userId) { - callback(userId === null); - }); - } + self.getUserId(function (userId) { + callback(userId === null); }); } });