From 5ad62d5fc7089744372675ee41dc3c1f19920021 Mon Sep 17 00:00:00 2001
From: Asir Vedamuthu Selvasingh <asirveda@microsoft.com>
Date: Sun, 7 Apr 2019 14:17:54 -0700
Subject: [PATCH 01/13] use latest version of Maven plugin

---
 dashboard-web-app/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dashboard-web-app/pom.xml b/dashboard-web-app/pom.xml
index 6f433dc..c2e81e9 100644
--- a/dashboard-web-app/pom.xml
+++ b/dashboard-web-app/pom.xml
@@ -230,7 +230,7 @@
             <plugin>
                 <groupId>com.microsoft.azure</groupId>
                 <artifactId>azure-webapp-maven-plugin</artifactId>
-                <version>1.4.0</version>
+                <version>1.5.4</version>
                 <configuration>
 
                     <!-- Web App information -->

From ab81fac26c484ea67c778d16e659394d2b93f4d7 Mon Sep 17 00:00:00 2001
From: Asir Vedamuthu Selvasingh <asirveda@microsoft.com>
Date: Sun, 7 Apr 2019 14:47:35 -0700
Subject: [PATCH 02/13] set memory size

---
 dashboard-web-app/pom.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/dashboard-web-app/pom.xml b/dashboard-web-app/pom.xml
index c2e81e9..1501ec3 100644
--- a/dashboard-web-app/pom.xml
+++ b/dashboard-web-app/pom.xml
@@ -293,6 +293,11 @@
                             <value>${NOTIFICATION_ERRORS_EVENT_HUB_NAME}</value>
                         </property>
 
+                        <property>
+                            <name>JAVA_OPTS</name>
+                            <value>-Xms2048m -Xmx2048m</value>
+                        </property>
+
                     </appSettings>
 
                 </configuration>

From e4b1d382ce864c4e6172d7a8c349b4f9eb7cd977 Mon Sep 17 00:00:00 2001
From: Asir Vedamuthu Selvasingh <asirveda@microsoft.com>
Date: Sat, 28 Sep 2019 16:41:08 -0700
Subject: [PATCH 03/13] updated about page and removed unwanted dependencies

---
 .../main/resources/static/Views/About.html    | 50 ++++++++++++++++---
 .../src/main/resources/static/Views/Home.html |  2 +-
 .../src/main/resources/static/index.html      |  2 +-
 function-apps/Point-Of-Transaction/pom.xml    |  8 +--
 4 files changed, 50 insertions(+), 12 deletions(-)

diff --git a/dashboard-web-app/src/main/resources/static/Views/About.html b/dashboard-web-app/src/main/resources/static/Views/About.html
index fae2bc6..2f24843 100644
--- a/dashboard-web-app/src/main/resources/static/Views/About.html
+++ b/dashboard-web-app/src/main/resources/static/Views/About.html
@@ -1,13 +1,51 @@
 <div class="jumbotron" style="background-color:transparent !important;">
     <h1>Inventory Hub - DASHBOARD</h1>
 
-    <p>This project uses the following -- to create a simple inventory hub real-time dashboard:<br><br>
-        -- Frameworks - Spring Boot, Azure
-        Cosmos DB Spring Boot Starter, Spring Data for Cosmos DB, Kafka Streams,
-        Spring Cloud Stream, Spring Cloud Functions and AngularJS<br><br>
+    <p><a href="https://github.com/microsoft/inventory-hub-java-on-azure"
+          style="text-decoration:underline;" target="_blank">
+        https://github.com/microsoft/inventory-hub-java-on-azure
+    </a></p>
 
-        -- Azure services - Cosmos DB, Event Hub, Functions and
-        App Service <br><br>
+    <p>This project uses the following -- to create a simple real-time dashboard:</p>
+
+    <p><b>Frameworks</b><br/>
+    <ul>
+        <li>Spring Boot</li>
+        <li>Spring Boot Starter with the Azure Cosmos DB SQL API</li>
+        <li>Spring Boot Starter for WebSocket</li>
+        <li>Spring Data for Cosmos DB</li>
+        <li>Spring Cloud Functions</li>
+        <li>Spring Cloud Stream Binder for Kafka</li>
+        <li>Spring Security</li>
+        <li>Azure Active Directory B2C Spring Boot Starter</li>
+        <li>AngularJS</li>
+    </ul>
+    </p>
+
+    <p><b>Azure Services</b><br/>
+    <ul>
+        <li>Active Directory B2C</li>
+        <li>App Service</li>
+        <li>App Configuration Service</li>
+        <li>Application Insights</li>
+        <li>Cosmos DB</li>
+        <li>Functions</li>
+        <li>Event Hubs</li>
+        <li>Key Vault</li>
+    </ul>
     </p>
 
+    <p><b>References</b>
+    <ul>
+        <li><a href="https://cloud.spring.io/spring-cloud-azure/"
+               style="text-decoration:underline;"
+               target="_blank" >Spring Cloud Azure</a></li>
+        <li><a href="https://docs.microsoft.com/en-us/azure/java/spring-framework/"
+               style="text-decoration:underline;" target="_blank" >Spring on Azure</a></li>
+        <li><a href="https://docs.microsoft.com/en-us/azure/java/" style="text-decoration:underline;"
+               target="_blank" >Azure for Java cloud developers</a></li>
+    </ul>
+    </p>
+
+
 </div>
diff --git a/dashboard-web-app/src/main/resources/static/Views/Home.html b/dashboard-web-app/src/main/resources/static/Views/Home.html
index 35691a6..40a9f80 100644
--- a/dashboard-web-app/src/main/resources/static/Views/Home.html
+++ b/dashboard-web-app/src/main/resources/static/Views/Home.html
@@ -27,7 +27,7 @@
                     -->
                     <tr>
                         <th></th>
-                        <th ng-repeat="(key, value) in locations | orderBy:key:true">{{key}}</th>
+                        <th ng-repeat="(key, value) in locations | orderBy:key:true">  {{key}}  </th>
                     </tr>
                     <tr ng-repeat="item in products">
                         <td>{{ item.description }}</td>
diff --git a/dashboard-web-app/src/main/resources/static/index.html b/dashboard-web-app/src/main/resources/static/index.html
index 8a92b3d..5e523d8 100644
--- a/dashboard-web-app/src/main/resources/static/index.html
+++ b/dashboard-web-app/src/main/resources/static/index.html
@@ -8,7 +8,7 @@
     <meta http-equiv="refresh" content="5" >
     -->
     <title>Inventory Hub - DASHBOARD</title>
-    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/css/bootstrap.min.css" />
+    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" />
     <style>
         .list-group-item { word-wrap: break-word; }
         #todolist button { margin-left: 5px; }
diff --git a/function-apps/Point-Of-Transaction/pom.xml b/function-apps/Point-Of-Transaction/pom.xml
index d5d89d7..365db40 100644
--- a/function-apps/Point-Of-Transaction/pom.xml
+++ b/function-apps/Point-Of-Transaction/pom.xml
@@ -56,7 +56,7 @@
             <artifactId>gson</artifactId>
             <version>2.8.2</version>
         </dependency>
-        <dependency>
+        <!--<dependency>
             <groupId>com.microsoft.azure</groupId>
             <artifactId>azure-eventhubs</artifactId>
             <version>1.0.0</version>
@@ -65,7 +65,7 @@
             <groupId>com.microsoft.azure</groupId>
             <artifactId>azure-documentdb</artifactId>
             <version>LATEST</version>
-        </dependency>
+        </dependency>-->
 
         <!-- Test -->
         <dependency>
@@ -85,11 +85,11 @@
             <artifactId>json</artifactId>
             <version>20171018</version>
         </dependency>
-        <dependency>
+        <!--<dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
             <version>2.8.2</version>
-        </dependency>
+        </dependency>-->
     </dependencies>
 
     <build>

From e916758700681dd8852eafc1578c03b221f345cf Mon Sep 17 00:00:00 2001
From: Asir Vedamuthu Selvasingh <asirveda@microsoft.com>
Date: Sat, 28 Sep 2019 16:46:17 -0700
Subject: [PATCH 04/13] rolled back to old css

---
 dashboard-web-app/src/main/resources/static/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dashboard-web-app/src/main/resources/static/index.html b/dashboard-web-app/src/main/resources/static/index.html
index 5e523d8..8a92b3d 100644
--- a/dashboard-web-app/src/main/resources/static/index.html
+++ b/dashboard-web-app/src/main/resources/static/index.html
@@ -8,7 +8,7 @@
     <meta http-equiv="refresh" content="5" >
     -->
     <title>Inventory Hub - DASHBOARD</title>
-    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" />
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/css/bootstrap.min.css" />
     <style>
         .list-group-item { word-wrap: break-word; }
         #todolist button { margin-left: 5px; }

From 987c54140c059aacf16792c32c2ff480d9f36740 Mon Sep 17 00:00:00 2001
From: Asir Vedamuthu Selvasingh <asirveda@microsoft.com>
Date: Mon, 30 Sep 2019 12:10:42 -0700
Subject: [PATCH 05/13] fixed splitting messages across consumers

---
 dashboard-web-app/pom.xml                             |  2 +-
 .../src/main/java/org/inventory/hub/InventoryHub.java |  3 +++
 .../inventory/hub/SetupKafkaConsumerGroupName.java    | 11 +++++++++--
 .../src/main/resources/static/index.html              |  2 +-
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/dashboard-web-app/pom.xml b/dashboard-web-app/pom.xml
index b411686..103b10f 100644
--- a/dashboard-web-app/pom.xml
+++ b/dashboard-web-app/pom.xml
@@ -305,7 +305,7 @@
 
                         <property>
                             <name>JAVA_OPTS</name>
-                            <value>-Xms2048m -Xmx2048m</value>
+                            <value>-Xms2048m -Xmx2048m -DNOTIFICATIONS_EVENT_HUB_CONSUMER_GROUP_NAME=${DOLLAR}{COMPUTERNAME}</value>
                         </property>
 
                     </appSettings>
diff --git a/dashboard-web-app/src/main/java/org/inventory/hub/InventoryHub.java b/dashboard-web-app/src/main/java/org/inventory/hub/InventoryHub.java
index 685804d..196fe49 100644
--- a/dashboard-web-app/src/main/java/org/inventory/hub/InventoryHub.java
+++ b/dashboard-web-app/src/main/java/org/inventory/hub/InventoryHub.java
@@ -30,9 +30,11 @@ public class InventoryHub extends SpringBootServletInitializer {
 
     ObjectMapper objectMapper = new ObjectMapper();
     Transaction transaction = new Transaction();
+/*
 
     @Override
     protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
+
         try {
             // Azure WEBSITE_INSTANCE_ID=3bd0b3a7eafa0e40e89ad50242c3591b222ecc564d8875c1feadd4ac6f52234a
             String webSiteInstanceId = System.getenv("WEBSITE_INSTANCE_ID");
@@ -63,6 +65,7 @@ protected SpringApplicationBuilder configure(SpringApplicationBuilder applicatio
 
         return application.sources(InventoryHub.class);
     }
+*/
 
     public static void main(String[] args) throws Exception {
         SpringApplication.run(InventoryHub.class, args);
diff --git a/dashboard-web-app/src/main/java/org/inventory/hub/SetupKafkaConsumerGroupName.java b/dashboard-web-app/src/main/java/org/inventory/hub/SetupKafkaConsumerGroupName.java
index b5f63a0..376bd77 100644
--- a/dashboard-web-app/src/main/java/org/inventory/hub/SetupKafkaConsumerGroupName.java
+++ b/dashboard-web-app/src/main/java/org/inventory/hub/SetupKafkaConsumerGroupName.java
@@ -19,8 +19,15 @@ public class SetupKafkaConsumerGroupName implements ApplicationListener<Applicat
 
 	@Override
 	public void onApplicationEvent(final ApplicationStartedEvent applicationStartedEvent) {
-		System.out.println("DEBUGGING: Found new Spring Boot App consumer group ENV settings: " + applicationStartedEvent.getApplicationContext().getEnvironment().getSystemEnvironment().get("NOTIFICATIONS_EVENT_HUB_CONSUMER_GROUP_NAME"));
-		System.out.println("DEBUGGING: Found new Spring Boot App property : " + applicationStartedEvent.getApplicationContext().getEnvironment().getProperty("spring.cloud.stream.bindings.input.group"));
+		//System.out.println("DEBUGGING: Found new Spring Boot App property : " + applicationStartedEvent.getApplicationContext().getEnvironment().getProperty("spring.cloud.stream.bindings.input.group"));
+
+		System.out.println("======= ApplicationStartingEvent ===== ");
+	    System.out.println("What is the Event Hubs Consumer Group Name?");
+		System.out.println("NOTIFICATIONS_EVENT_HUB_CONSUMER_GROUP_NAME=" +
+				applicationStartedEvent.
+						getApplicationContext().
+						getEnvironment().
+						getProperty("spring.cloud.stream.bindings.input.group"));
 	}
 	
 }
diff --git a/dashboard-web-app/src/main/resources/static/index.html b/dashboard-web-app/src/main/resources/static/index.html
index 8a92b3d..9af1e0a 100644
--- a/dashboard-web-app/src/main/resources/static/index.html
+++ b/dashboard-web-app/src/main/resources/static/index.html
@@ -24,7 +24,7 @@
             <a class="navbar-brand" href="#/Home">Inventory Hub - DASHBOARD</a>
             <ul class="navbar-nav">
                 <li ng-class="{ active: isActive('/Home') }"><a class="nav-link" href="#/Home">Home</a></li>
-                <li ng-class="{ active: isActive('/About') }"><a class="nav-link" href="#/About">About</a></li>
+                <li ng-class="{ active: isActive('/About') }"><a class="nav-link" href="#/About" target="_blank">About</a></li>
             </ul>
         </div>
     </div>

From 3d9e30c0812cbb9449ef2ee9eb7f0589aecf5977 Mon Sep 17 00:00:00 2001
From: Asir Vedamuthu Selvasingh <asirveda@microsoft.com>
Date: Mon, 30 Sep 2019 12:17:46 -0700
Subject: [PATCH 06/13] fixed doc

---
 dashboard-web-app/README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dashboard-web-app/README.md b/dashboard-web-app/README.md
index 1227551..340d7a1 100644
--- a/dashboard-web-app/README.md
+++ b/dashboard-web-app/README.md
@@ -49,7 +49,7 @@ COSMOSDB_KEY=put-your-COSMOSDB-key-here
 COSMOSDB_DBNAME=put-your-COSMOSDB-databasename-here
 
 NOTIFICATIONS_EVENT_HUB_NAME=put-your-eventhub-for-notifications
-NOTIFICATIONS_EVENT_HUB_CONSUMER_GROUP_NAME="\$Default"
+NOTIFICATIONS_EVENT_HUB_CONSUMER_GROUP_NAME=$(uuidgen)
 NOTIFICATIONS_EVENT_HUB_CONNECTION_STRING=put-your-event-hub-connection-string
 NOTIFICATIONS_STORAGE_CONTAINER_NAME=put-your-storage-container-name
 NOTIFICATIONS_STORAGE_CONNECTION_STRING=put-your-storage-connection-string
@@ -57,6 +57,8 @@ NOTIFICATIONS_STORAGE_CONNECTION_STRING=put-your-storage-connection-string
 WEBAPP_RESOURCEGROUP_NAME=put-your-resourcegroup-name-here
 WEBAPP_NAME=put-your-webapp-name-here
 WEBAPP_REGION=put-your-region-here
+
+DOLLAR=\$
 ```
 
 ## Integrate with Spring Security using Azure Active Directory B2C - OPTIONAL STEP

From 77e73d35e8a994958855e22871756b95ad53a6bf Mon Sep 17 00:00:00 2001
From: Asir Vedamuthu Selvasingh <asirveda@microsoft.com>
Date: Mon, 30 Sep 2019 19:08:58 -0700
Subject: [PATCH 07/13] removed initialization

---
 .../java/org/inventory/hub/InventoryHub.java  | 36 -------------------
 1 file changed, 36 deletions(-)

diff --git a/dashboard-web-app/src/main/java/org/inventory/hub/InventoryHub.java b/dashboard-web-app/src/main/java/org/inventory/hub/InventoryHub.java
index 196fe49..42ae8a8 100644
--- a/dashboard-web-app/src/main/java/org/inventory/hub/InventoryHub.java
+++ b/dashboard-web-app/src/main/java/org/inventory/hub/InventoryHub.java
@@ -30,42 +30,6 @@ public class InventoryHub extends SpringBootServletInitializer {
 
     ObjectMapper objectMapper = new ObjectMapper();
     Transaction transaction = new Transaction();
-/*
-
-    @Override
-    protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
-
-        try {
-            // Azure WEBSITE_INSTANCE_ID=3bd0b3a7eafa0e40e89ad50242c3591b222ecc564d8875c1feadd4ac6f52234a
-            String webSiteInstanceId = System.getenv("WEBSITE_INSTANCE_ID");
-            // Cloud Foundry CF_INSTANCE_GUID=41653aa4-3a3a-486a-4431-ef258b39f042
-            if (webSiteInstanceId == null || webSiteInstanceId.isEmpty()) {
-                webSiteInstanceId = System.getenv("CF_INSTANCE_GUID");
-            }
-            if (webSiteInstanceId == null || webSiteInstanceId.isEmpty()) {
-                webSiteInstanceId = System.getenv("NOTIFICATIONS_EVENT_HUB_CONSUMER_GROUP_NAME");
-            }
-            if (webSiteInstanceId == null || webSiteInstanceId.isEmpty()) {
-                webSiteInstanceId = UUID.randomUUID().toString();
-            }
-            if (webSiteInstanceId.length() > 49) {
-                webSiteInstanceId = webSiteInstanceId.substring(0, 49);
-            }
-
-            // This will replace System environment variable value with the newly computed value
-            Map<String, String> env = System.getenv();
-            Class<?> cl = env.getClass();
-            Field field = cl.getDeclaredField("m");
-            field.setAccessible(true);
-            Map<String, String> writableEnv = (Map<String, String>) field.get(env);
-            writableEnv.put("NOTIFICATIONS_EVENT_HUB_CONSUMER_GROUP_NAME", webSiteInstanceId);
-        } catch (Exception e) {
-            throw new IllegalStateException("Failed to set environment variable", e);
-        }
-
-        return application.sources(InventoryHub.class);
-    }
-*/
 
     public static void main(String[] args) throws Exception {
         SpringApplication.run(InventoryHub.class, args);

From b78ab70d805920a65d21eda404dd9b3a605dbca4 Mon Sep 17 00:00:00 2001
From: Asir Vedamuthu Selvasingh <asirveda@microsoft.com>
Date: Wed, 2 Oct 2019 19:42:00 -0700
Subject: [PATCH 08/13] added /api/username

---
 .../hub/controller/SecurityController.java    | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 dashboard-web-app/src/main/java/org/inventory/hub/controller/SecurityController.java

diff --git a/dashboard-web-app/src/main/java/org/inventory/hub/controller/SecurityController.java b/dashboard-web-app/src/main/java/org/inventory/hub/controller/SecurityController.java
new file mode 100644
index 0000000..370b052
--- /dev/null
+++ b/dashboard-web-app/src/main/java/org/inventory/hub/controller/SecurityController.java
@@ -0,0 +1,37 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See LICENSE in the project root for
+ * license information.
+ */
+
+package org.inventory.hub.controller;
+
+import java.security.Principal;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+@Controller
+@ResponseBody
+public class SecurityController {
+
+    public SecurityController() {
+    }
+
+    @RequestMapping(value = "/api/username", method = RequestMethod.GET)
+    public String currentUsername(final Principal principal) {
+
+        System.out.println("======= /api/username ===== ");
+        String username = new String();
+        if (principal != null)
+                username = principal.getName();
+
+        System.out.println("username=" + username);
+        System.out.println("====== success");
+
+        return username;
+    }
+
+}
\ No newline at end of file

From 150d5126b9b0ce758dc47a298eccfa76b622c08c Mon Sep 17 00:00:00 2001
From: Asir Vedamuthu Selvasingh <asirveda@microsoft.com>
Date: Wed, 2 Oct 2019 19:44:04 -0700
Subject: [PATCH 09/13] experimental

---
 .../main/resources/static/Scripts/homeCtrl.js | 11 +++++++++
 .../resources/static/Scripts/productsSvc.js   |  3 +++
 .../resources/static/Scripts/usernameCtrl.js  | 24 +++++++++++++++++++
 .../resources/static/Scripts/usernameSvc.js   | 15 ++++++++++++
 .../src/main/resources/static/index.html      |  7 ++++++
 5 files changed, 60 insertions(+)
 create mode 100644 dashboard-web-app/src/main/resources/static/Scripts/usernameCtrl.js
 create mode 100644 dashboard-web-app/src/main/resources/static/Scripts/usernameSvc.js

diff --git a/dashboard-web-app/src/main/resources/static/Scripts/homeCtrl.js b/dashboard-web-app/src/main/resources/static/Scripts/homeCtrl.js
index e3365b0..06f90a7 100644
--- a/dashboard-web-app/src/main/resources/static/Scripts/homeCtrl.js
+++ b/dashboard-web-app/src/main/resources/static/Scripts/homeCtrl.js
@@ -13,6 +13,7 @@ angular.module('inventoryHubApp')
             $scope.products = null;
             $scope.locations = null;
             $scope.transactions = null;
+            $scope.username = null;
 
             $scope.fetchProductsAndEvents = function () {
                 productsSvc.getProducts().success(function (results) {
@@ -37,4 +38,14 @@ angular.module('inventoryHubApp')
                 });
 
             };
+
+            $scope.fetchUsername = function () {
+                usernameSvc.getUsername().success(function(results) {
+                    $scope.username = results;
+                }).error(function (err){
+                    $scope.error = err;
+                    $scope.loadingMessage = '';
+                });
+            };
+
         }]);
diff --git a/dashboard-web-app/src/main/resources/static/Scripts/productsSvc.js b/dashboard-web-app/src/main/resources/static/Scripts/productsSvc.js
index b7b4660..c3e54f2 100644
--- a/dashboard-web-app/src/main/resources/static/Scripts/productsSvc.js
+++ b/dashboard-web-app/src/main/resources/static/Scripts/productsSvc.js
@@ -19,6 +19,9 @@ angular.module('inventoryHubApp')
             },
             getProduct: function (id) {
                 return $http.get('api/product/' + id);
+            },
+            getUsername: function(){
+                return $http.get('api/username');
             }
         };
     }]);
diff --git a/dashboard-web-app/src/main/resources/static/Scripts/usernameCtrl.js b/dashboard-web-app/src/main/resources/static/Scripts/usernameCtrl.js
new file mode 100644
index 0000000..8e1181a
--- /dev/null
+++ b/dashboard-web-app/src/main/resources/static/Scripts/usernameCtrl.js
@@ -0,0 +1,24 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See LICENSE in the project root for
+ * license information.
+ */
+
+'use strict';
+angular.module('inventoryHubApp')
+    .controller('usernameCtrl', ['$scope', '$location', 'usernameSvc',
+        function ($scope, $location, usernameSvc) {
+            $scope.error = '';
+            $scope.loadingMessage = '';
+            $scope.username = null;
+
+            $scope.fetchUsername = function () {
+                usernameSvc.getUsername().success(function(results) {
+                    $scope.username = results;
+                }).error(function (err){
+                    $scope.error = err;
+                    $scope.loadingMessage = '';
+
+                });
+            };
+        }]);
diff --git a/dashboard-web-app/src/main/resources/static/Scripts/usernameSvc.js b/dashboard-web-app/src/main/resources/static/Scripts/usernameSvc.js
new file mode 100644
index 0000000..68acbd4
--- /dev/null
+++ b/dashboard-web-app/src/main/resources/static/Scripts/usernameSvc.js
@@ -0,0 +1,15 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See LICENSE in the project root for
+ * license information.
+ */
+
+'use strict';
+angular.module('inventoryHubApp')
+    .factory('usernameSvc', ['$http', function ($http) {
+        return {
+            getUsername: function(){
+                return $http.get('api/username');
+            }
+        };
+    }]);
diff --git a/dashboard-web-app/src/main/resources/static/index.html b/dashboard-web-app/src/main/resources/static/index.html
index 9af1e0a..e97d3b4 100644
--- a/dashboard-web-app/src/main/resources/static/index.html
+++ b/dashboard-web-app/src/main/resources/static/index.html
@@ -25,6 +25,13 @@
             <ul class="navbar-nav">
                 <li ng-class="{ active: isActive('/Home') }"><a class="nav-link" href="#/Home">Home</a></li>
                 <li ng-class="{ active: isActive('/About') }"><a class="nav-link" href="#/About" target="_blank">About</a></li>
+                <li ng-app="inventoryHubApp" ng-controller="homeCtrl" ng-init="fetchUsername()">
+                    Welcome {{username}} - Position 0
+                    <div ng-if="username">
+                        Welcome {{username}}!
+                        <a ng-class="{ active: isActive('/Logout) }" class="nav-link" href="/logout">(Logout)</a>
+                    </div>
+                </li>
             </ul>
         </div>
     </div>

From 7f100b7765f6bdd4cffe13ae53b017b006f74444 Mon Sep 17 00:00:00 2001
From: Asir Vedamuthu Selvasingh <asirveda@microsoft.com>
Date: Thu, 3 Oct 2019 10:56:41 -0700
Subject: [PATCH 10/13] show username when logged in

---
 .../src/main/resources/static/Scripts/homeCtrl.js     | 11 -----------
 .../src/main/resources/static/Scripts/productsSvc.js  |  3 ---
 .../src/main/resources/static/index.html              |  5 +++--
 3 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/dashboard-web-app/src/main/resources/static/Scripts/homeCtrl.js b/dashboard-web-app/src/main/resources/static/Scripts/homeCtrl.js
index 06f90a7..e3365b0 100644
--- a/dashboard-web-app/src/main/resources/static/Scripts/homeCtrl.js
+++ b/dashboard-web-app/src/main/resources/static/Scripts/homeCtrl.js
@@ -13,7 +13,6 @@ angular.module('inventoryHubApp')
             $scope.products = null;
             $scope.locations = null;
             $scope.transactions = null;
-            $scope.username = null;
 
             $scope.fetchProductsAndEvents = function () {
                 productsSvc.getProducts().success(function (results) {
@@ -38,14 +37,4 @@ angular.module('inventoryHubApp')
                 });
 
             };
-
-            $scope.fetchUsername = function () {
-                usernameSvc.getUsername().success(function(results) {
-                    $scope.username = results;
-                }).error(function (err){
-                    $scope.error = err;
-                    $scope.loadingMessage = '';
-                });
-            };
-
         }]);
diff --git a/dashboard-web-app/src/main/resources/static/Scripts/productsSvc.js b/dashboard-web-app/src/main/resources/static/Scripts/productsSvc.js
index c3e54f2..b7b4660 100644
--- a/dashboard-web-app/src/main/resources/static/Scripts/productsSvc.js
+++ b/dashboard-web-app/src/main/resources/static/Scripts/productsSvc.js
@@ -19,9 +19,6 @@ angular.module('inventoryHubApp')
             },
             getProduct: function (id) {
                 return $http.get('api/product/' + id);
-            },
-            getUsername: function(){
-                return $http.get('api/username');
             }
         };
     }]);
diff --git a/dashboard-web-app/src/main/resources/static/index.html b/dashboard-web-app/src/main/resources/static/index.html
index e97d3b4..762bbff 100644
--- a/dashboard-web-app/src/main/resources/static/index.html
+++ b/dashboard-web-app/src/main/resources/static/index.html
@@ -25,8 +25,7 @@
             <ul class="navbar-nav">
                 <li ng-class="{ active: isActive('/Home') }"><a class="nav-link" href="#/Home">Home</a></li>
                 <li ng-class="{ active: isActive('/About') }"><a class="nav-link" href="#/About" target="_blank">About</a></li>
-                <li ng-app="inventoryHubApp" ng-controller="homeCtrl" ng-init="fetchUsername()">
-                    Welcome {{username}} - Position 0
+                <li ng-app="inventoryHubApp" ng-controller="usernameCtrl" ng-init="fetchUsername()">
                     <div ng-if="username">
                         Welcome {{username}}!
                         <a ng-class="{ active: isActive('/Logout) }" class="nav-link" href="/logout">(Logout)</a>
@@ -52,6 +51,8 @@
     <script src="Scripts/homeCtrl.js"></script>
     <script src="Scripts/productsSvc.js"></script>
     <script src="Scripts/aboutCtrl.js"></script>
+    <script src="Scripts/usernameSvc.js"></script>
+    <script src="Scripts/usernameCtrl.js"></script>
 
     <script src="libs/sockjs/sockjs.min.js" type="text/javascript"></script>
     <script src="libs/stomp-websocket/lib/stomp.min.js" type="text/javascript"></script>

From 0b920637429c3ea1bff3b9ec56becea574e22b28 Mon Sep 17 00:00:00 2001
From: Asir Vedamuthu Selvasingh <asirveda@microsoft.com>
Date: Thu, 3 Oct 2019 11:02:56 -0700
Subject: [PATCH 11/13] added /api/username (#64)

* added /api/username
---
 .../hub/controller/SecurityController.java    | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 dashboard-web-app/src/main/java/org/inventory/hub/controller/SecurityController.java

diff --git a/dashboard-web-app/src/main/java/org/inventory/hub/controller/SecurityController.java b/dashboard-web-app/src/main/java/org/inventory/hub/controller/SecurityController.java
new file mode 100644
index 0000000..370b052
--- /dev/null
+++ b/dashboard-web-app/src/main/java/org/inventory/hub/controller/SecurityController.java
@@ -0,0 +1,37 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See LICENSE in the project root for
+ * license information.
+ */
+
+package org.inventory.hub.controller;
+
+import java.security.Principal;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+@Controller
+@ResponseBody
+public class SecurityController {
+
+    public SecurityController() {
+    }
+
+    @RequestMapping(value = "/api/username", method = RequestMethod.GET)
+    public String currentUsername(final Principal principal) {
+
+        System.out.println("======= /api/username ===== ");
+        String username = new String();
+        if (principal != null)
+                username = principal.getName();
+
+        System.out.println("username=" + username);
+        System.out.println("====== success");
+
+        return username;
+    }
+
+}
\ No newline at end of file

From 7890518b6f53acfc63340efaf056b122c4c03b76 Mon Sep 17 00:00:00 2001
From: Asir Vedamuthu Selvasingh <asirveda@microsoft.com>
Date: Thu, 3 Oct 2019 18:07:28 -0700
Subject: [PATCH 12/13] calls api/username

---
 dashboard-web-app/src/main/resources/static/index.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dashboard-web-app/src/main/resources/static/index.html b/dashboard-web-app/src/main/resources/static/index.html
index 762bbff..67358f8 100644
--- a/dashboard-web-app/src/main/resources/static/index.html
+++ b/dashboard-web-app/src/main/resources/static/index.html
@@ -27,8 +27,7 @@
                 <li ng-class="{ active: isActive('/About') }"><a class="nav-link" href="#/About" target="_blank">About</a></li>
                 <li ng-app="inventoryHubApp" ng-controller="usernameCtrl" ng-init="fetchUsername()">
                     <div ng-if="username">
-                        Welcome {{username}}!
-                        <a ng-class="{ active: isActive('/Logout) }" class="nav-link" href="/logout">(Logout)</a>
+                        <p>Welcome {{username}}! <a ng-class="{ active: isActive('/Logout) }" class="nav-link" href="/logout">(logout)</a></p>
                     </div>
                 </li>
             </ul>

From 1c42b466faf8e9614eef1f03b8910f171a21fe30 Mon Sep 17 00:00:00 2001
From: Asir Vedamuthu Selvasingh <asirveda@microsoft.com>
Date: Thu, 3 Oct 2019 19:02:49 -0700
Subject: [PATCH 13/13] username + logout

---
 dashboard-web-app/src/main/resources/static/index.html | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dashboard-web-app/src/main/resources/static/index.html b/dashboard-web-app/src/main/resources/static/index.html
index 67358f8..a62bf6e 100644
--- a/dashboard-web-app/src/main/resources/static/index.html
+++ b/dashboard-web-app/src/main/resources/static/index.html
@@ -27,7 +27,10 @@
                 <li ng-class="{ active: isActive('/About') }"><a class="nav-link" href="#/About" target="_blank">About</a></li>
                 <li ng-app="inventoryHubApp" ng-controller="usernameCtrl" ng-init="fetchUsername()">
                     <div ng-if="username">
-                        <p>Welcome {{username}}! <a ng-class="{ active: isActive('/Logout) }" class="nav-link" href="/logout">(logout)</a></p>
+                        Welcome {{ username }}!
+                        <a ng-class="{ active: isActive('/Logout) }"
+                           class="nav-link"
+                           href="/logout">Welcome {{ username }}! (logout)</a>
                     </div>
                 </li>
             </ul>