Merge remote-tracking branch 'origin/dev' into dev

Author: James Cori

config.json

@@ -42,8 +42,8 @@
     "ADMIN_TOOL_URL": "https://api.topcoder-dev.com/v2",
     "API_VERSION_PATH": "v3",
     "COOKIES_SECURE": false,
-    "AUTH_URL": "https://accounts.topcoder-dev.com/member",
-    "ACCOUNTS_CONNECTOR_URL": "https://accounts.topcoder-dev.com/connector.html",
+    "AUTH_URL": "https://accounts-auth0.topcoder-dev.com",
+    "ACCOUNTS_CONNECTOR_URL": "https://accounts-auth0.topcoder-dev.com",
     "JWT_V3_NAME": "v3jwt",
     "JWT_V2_NAME": "tcjwt",
     "OAUTH2_TOKEN_NAME": "oa2spigit",
@@ -118,8 +118,8 @@
     "ADMIN_TOOL_URL": "https://api.topcoder.com/v2",
     "API_VERSION_PATH": "v3",
     "COOKIES_SECURE": false,
-    "AUTH_URL": "https://accounts.topcoder.com/member",
-    "ACCOUNTS_CONNECTOR_URL": "https://accounts.topcoder.com/connector.html",
+    "AUTH_URL": "https://accounts-auth0.topcoder.com",
+    "ACCOUNTS_CONNECTOR_URL": "https://accounts-auth0.topcoder.com",
     "JWT_V3_NAME": "v3jwt",
     "JWT_V2_NAME": "tcjwt",
     "OAUTH2_TOKEN_NAME": "oa2spigit",

src/app/auth/auth.service.js

@@ -148,7 +148,7 @@ angular.module('supportAdminApp')
        *
        * @return {Promise} promise which is resolved when user is logged out on the server
        */
-      AuthService.logout = function() {
+      /* AuthService.logout = function() {
         // send request to the server that we want to log out
         // save logginOut promise to be accessed any time
         AuthService.logginOut = proxyCall(LOGOUT_REQUEST, LOGOUT_SUCCESS, LOGOUT_FAILURE).then(function() {
@@ -159,6 +159,10 @@ angular.module('supportAdminApp')
         $cookies.remove(JWT_V3_NAME);
 
         return AuthService.logginOut;
+      } */
+ 
+      AuthService.logout = function () {
+        $window.location.href = AUTH_URL + '?logout=true&retUrl=' + encodeURIComponent($window.location.href);
       }
 
       AuthService.login = function() {
@@ -229,7 +233,7 @@ angular.module('supportAdminApp')
        * @return {Boolean} true if token V3 is expired
        */
       AuthService.isTokenV3Expired = function() {
-        return !AuthService.getTokenV3() || jwtHelper.isTokenExpired(AuthService.getTokenV3(), 300);
+        return !AuthService.getTokenV3() || jwtHelper.isTokenExpired(AuthService.getTokenV3(), 10);
       }
 
       /**