Merge pull request #605 from jembi/fix-first-route-change

Fix: Redirection to login page at the first start

Author: nour-borgi

app/config/default.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.16.0",
+  "version": "1.16.1",
   "minimumCoreVersion": "5.0.0",
   "protocol": "https",
   "host": "localhost",

app/scripts/index.js

@@ -140,8 +140,18 @@ app.run(function ($rootScope, $location, $anchorScroll, Api) {
     // Retrieve the session from storage
     let consoleSession = localStorage.getItem('consoleSession')
 
+    // Initialize the route to /login if there is no consoleSession
+    if (curRoute && !consoleSession && curRoute.indexOf('login') !== 1 && curRoute.indexOf('set-password') !== 1 && curRoute.indexOf('forgot-password') !== 1) {
+      $location.path('/login')
+    }
+
     Api.Me.get(function (authDetails) {
       if (authDetails.user) {
+        // ConsoleSession was deleted but the user still have a session
+        if (curRoute && curRoute !== $location.path() && curRoute.indexOf('login') !== 1) {
+          $location.path($rootScope.referringURL)
+        }
+
         consoleSession = authDetails.user
         // set the nav menu to show
         $rootScope.navMenuVisible = true

package-lock.json

@@ -1,7 +1,7 @@
 {
 	"name": "openhim-console",
 	"description": "This application provides a web application to configure and manage the OpenHIM-core component.",
-	"version": "1.16.0",
+	"version": "1.16.1",
 	"dependencies": {
 		"@types/http-server": "^0.10.1",
 		"http-server": "^0.12.3",

package.json

@@ -3,7 +3,7 @@
 RELEASE_VERSION=$1
 if [ -z ${RELEASE_VERSION} ]
 then
-  echo "You need so specify the release version you wish to build: e.g './build-docker-centos-rpm.sh 1.16.0'"
+  echo "You need so specify the release version you wish to build: e.g './build-docker-centos-rpm.sh 1.16.1'"
   echo "https://github.com/jembi/openhim-console/releases"
   exit
 fi