commit 23f21e317e3f9a1ea50f27500bf031e090430aff
author Simon Hunt <simon@onlab.us> Wed May 04 14:49:03 2016 -0700
committer Gerrit Code Review <gerrit@onlab.us> Wed May 04 23:58:12 2016 +0000
tree 527955b24da73cb796c082c55f9f1e26932278f3
parent 673c3e062f0b0d772a6fe81b0818a4fbe0fc9d07

GUI -- Log the name of the logged-in user to the Javascript console, at beginning of index.html.

Change-Id: I973023edbb4aa1af3af816fc59895e8ab026192d

web/gui/src/main/java/org/onosproject/ui/impl/MainIndexResource.java

diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/MainIndexResource.java b/web/gui/src/main/java/org/onosproject/ui/impl/MainIndexResource.java
index 415f2c3..8713e9e 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/MainIndexResource.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/MainIndexResource.java
@@ -57,7 +57,7 @@
     private static final String INJECT_JS_END = "<!-- {INJECTED-JAVASCRIPT-END} -->";
 
     private static final byte[] SCRIPT_START = "\n<script>\n".getBytes();
-    private static final byte[] SCRIPT_END = "\n</script>\n\n".getBytes();
+    private static final byte[] SCRIPT_END = "</script>\n\n".getBytes();
 
     @Context
     private SecurityContext ctx;
@@ -90,25 +90,31 @@
 
         StreamEnumeration streams =
                 new StreamEnumeration(of(stream(index, 0, p0s),
-                                         new ByteArrayInputStream(SCRIPT_START),
-                                         stream(auth, 0, auth.length()),
-                                         userPreferences(userName),
-                                         new ByteArrayInputStream(SCRIPT_END),
-                                         stream(index, p0e, p1s),
-                                         includeJs(service),
-                                         stream(index, p1e, p2s),
-                                         includeCss(service),
-                                         stream(index, p2e, p3s)));
+                        new ByteArrayInputStream(SCRIPT_START),
+                        stream(auth, 0, auth.length()),
+                        userPreferences(userName),
+                        userConsoleLog(userName),
+                        new ByteArrayInputStream(SCRIPT_END),
+                        stream(index, p0e, p1s),
+                        includeJs(service),
+                        stream(index, p1e, p2s),
+                        includeCss(service),
+                        stream(index, p2e, p3s)));
 
         return Response.ok(new SequenceInputStream(streams)).build();
     }
 
+    private InputStream userConsoleLog(String userName) {
+        String code = "console.log('Logging in as user >" + userName + "<');\n";
+        return new ByteArrayInputStream(code.getBytes());
+    }
+
     // Produces an input stream including user preferences.
     private InputStream userPreferences(String userName) {
         UiPreferencesService service = get(UiPreferencesService.class);
         ObjectNode prefs = mapper().createObjectNode();
         service.getPreferences(userName).forEach(prefs::set);
-        String string = "var userPrefs = " + prefs.toString() + ";";
+        String string = "var userPrefs = " + prefs.toString() + ";\n";
         return new ByteArrayInputStream(string.getBytes());
     }