From e87f1326f552ff802ddd73ddd72ac46293e9c96a Mon Sep 17 00:00:00 2001
From: Igor Kulikov <ikulikov@thingsboard.io>
Date: Mon, 16 Oct 2017 15:32:12 +0300
Subject: [PATCH] Fixed issue when publicId is invalid.

---
 ui/src/app/api/user.service.js | 1 +
 ui/src/app/app.run.js          | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ui/src/app/api/user.service.js b/ui/src/app/api/user.service.js
index 1785582790..57486b0040 100644
--- a/ui/src/app/api/user.service.js
+++ b/ui/src/app/api/user.service.js
@@ -339,6 +339,7 @@ function UserService($http, $q, $rootScope, adminService, dashboardService, logi
                     updateAndValidateToken(refreshToken, 'refresh_token', false);
                     procceedJwtTokenValidate();
                 }, function fail() {
+                    $location.search('publicId', null);
                     deferred.reject();
                 });
             } else {
diff --git a/ui/src/app/app.run.js b/ui/src/app/app.run.js
index a9250e0801..2ab5fe2bd5 100644
--- a/ui/src/app/app.run.js
+++ b/ui/src/app/app.run.js
@@ -111,7 +111,10 @@ export default function AppRun($rootScope, $window, $injector, $location, $log,
                         }
                     }
                 } else {
-                    if (to.module === 'private') {
+                    if (publicId && publicId.length > 0) {
+                        evt.preventDefault();
+                        reloadUserFromPublicId();
+                    } else if (to.module === 'private') {
                         evt.preventDefault();
                         if (to.url === '/home' || to.url === '/') {
                             $state.go('login', params);