From 5f5aadab5f09d5674c1157475b6edc44568a2241 Mon Sep 17 00:00:00 2001
From: Mikael Mengistu <mimengis@microsoft.com>
Date: Mon, 12 Aug 2019 16:10:45 -0700
Subject: [PATCH 1/3] Update chat sample to use nice looking names

---
 .../samples/SignalRSamples/Hubs/Chat.cs       | 42 +++++++------------
 .../SignalRSamples/Hubs/DynamicChat.cs        | 38 +++++++----------
 .../samples/SignalRSamples/Hubs/HubTChat.cs   | 38 +++++++----------
 .../samples/SignalRSamples/wwwroot/hubs.html  | 24 +++++++----
 4 files changed, 60 insertions(+), 82 deletions(-)

diff --git a/src/SignalR/samples/SignalRSamples/Hubs/Chat.cs b/src/SignalR/samples/SignalRSamples/Hubs/Chat.cs
index cabbd4a39116..02d9c5f6b2ac 100644
--- a/src/SignalR/samples/SignalRSamples/Hubs/Chat.cs
+++ b/src/SignalR/samples/SignalRSamples/Hubs/Chat.cs
@@ -9,58 +9,48 @@ namespace SignalRSamples.Hubs
 {
     public class Chat : Hub
     {
-        public override async Task OnConnectedAsync()
+        public Task Send(string name, string message)
         {
-            await Clients.All.SendAsync("Send", $"{Context.ConnectionId} joined");
+            return Clients.All.SendAsync("Send", $"{name}: {message}");
         }
 
-        public override async Task OnDisconnectedAsync(Exception ex)
+        public Task SendToOthers(string name, string message)
         {
-            await Clients.Others.SendAsync("Send", $"{Context.ConnectionId} left");
+            return Clients.Others.SendAsync("Send", $"{name}: {message}");
         }
 
-        public Task Send(string message)
+        public Task SendToConnection(string connectionId, string name, string message)
         {
-            return Clients.All.SendAsync("Send", $"{Context.ConnectionId}: {message}");
+            return Clients.Client(connectionId).SendAsync("Send", $"Private message from {name}: {message}");
         }
 
-        public Task SendToOthers(string message)
+        public Task SendToGroup(string groupName, string name ,string message)
         {
-            return Clients.Others.SendAsync("Send", $"{Context.ConnectionId}: {message}");
+            return Clients.Group(groupName).SendAsync("Send", $"{name}@{groupName}: {message}");
         }
 
-        public Task SendToConnection(string connectionId, string message)
+        public Task SendToOthersInGroup(string groupName, string name,string message)
         {
-            return Clients.Client(connectionId).SendAsync("Send", $"Private message from {Context.ConnectionId}: {message}");
+            return Clients.OthersInGroup(groupName).SendAsync("Send", $"{name}@{groupName}: {message}");
         }
 
-        public Task SendToGroup(string groupName, string message)
-        {
-            return Clients.Group(groupName).SendAsync("Send", $"{Context.ConnectionId}@{groupName}: {message}");
-        }
-
-        public Task SendToOthersInGroup(string groupName, string message)
-        {
-            return Clients.OthersInGroup(groupName).SendAsync("Send", $"{Context.ConnectionId}@{groupName}: {message}");
-        }
-
-        public async Task JoinGroup(string groupName)
+        public async Task JoinGroup(string groupName, string name)
         {
             await Groups.AddToGroupAsync(Context.ConnectionId, groupName);
 
-            await Clients.Group(groupName).SendAsync("Send", $"{Context.ConnectionId} joined {groupName}");
+            await Clients.Group(groupName).SendAsync("Send", $"{name} joined {groupName}");
         }
 
-        public async Task LeaveGroup(string groupName)
+        public async Task LeaveGroup(string groupName, string name)
         {
-            await Clients.Group(groupName).SendAsync("Send", $"{Context.ConnectionId} left {groupName}");
+            await Clients.Group(groupName).SendAsync("Send", $"{name} left {groupName}");
 
             await Groups.RemoveFromGroupAsync(Context.ConnectionId, groupName);
         }
 
-        public Task Echo(string message)
+        public Task Echo(string name, string message)
         {
-            return Clients.Caller.SendAsync("Send", $"{Context.ConnectionId}: {message}");
+            return Clients.Caller.SendAsync("Send", $"{name}: {message}");
         }
     }
 }
diff --git a/src/SignalR/samples/SignalRSamples/Hubs/DynamicChat.cs b/src/SignalR/samples/SignalRSamples/Hubs/DynamicChat.cs
index 30d715435149..aba79b24baa5 100644
--- a/src/SignalR/samples/SignalRSamples/Hubs/DynamicChat.cs
+++ b/src/SignalR/samples/SignalRSamples/Hubs/DynamicChat.cs
@@ -9,53 +9,43 @@ namespace SignalRSamples.Hubs
 {
     public class DynamicChat : DynamicHub
     {
-        public override async Task OnConnectedAsync()
+        public Task Send(string name, string message)
         {
-            await Clients.All.Send($"{Context.ConnectionId} joined");
+            return Clients.All.Send($"{name}: {message}");
         }
 
-        public override async Task OnDisconnectedAsync(Exception ex)
+        public Task SendToOthers(string name, string message)
         {
-            await Clients.Others.Send($"{Context.ConnectionId} left");
+            return Clients.Others.Send($"{name}: {message}");
         }
 
-        public Task Send(string message)
+        public Task SendToGroup(string groupName, string name, string message)
         {
-            return Clients.All.Send($"{Context.ConnectionId}: {message}");
+            return Clients.Group(groupName).Send($"{name}@{groupName}: {message}");
         }
 
-        public Task SendToOthers(string message)
+        public Task SendToOthersInGroup(string groupName, string name, string message)
         {
-            return Clients.Others.Send($"{Context.ConnectionId}: {message}");
+            return Clients.OthersInGroup(groupName).Send($"{name}@{groupName}: {message}");
         }
 
-        public Task SendToGroup(string groupName, string message)
-        {
-            return Clients.Group(groupName).Send($"{Context.ConnectionId}@{groupName}: {message}");
-        }
-
-        public Task SendToOthersInGroup(string groupName, string message)
-        {
-            return Clients.OthersInGroup(groupName).Send($"{Context.ConnectionId}@{groupName}: {message}");
-        }
-
-        public async Task JoinGroup(string groupName)
+        public async Task JoinGroup(string groupName, string name)
         {
             await Groups.AddToGroupAsync(Context.ConnectionId, groupName);
 
-            await Clients.Group(groupName).Send($"{Context.ConnectionId} joined {groupName}");
+            await Clients.Group(groupName).Send($"{name} joined {groupName}");
         }
 
-        public async Task LeaveGroup(string groupName)
+        public async Task LeaveGroup(string groupName, string name)
         {
-            await Clients.Group(groupName).Send($"{Context.ConnectionId} left {groupName}");
+            await Clients.Group(groupName).Send($"{name} left {groupName}");
 
             await Groups.RemoveFromGroupAsync(Context.ConnectionId, groupName);
         }
 
-        public Task Echo(string message)
+        public Task Echo(string name, string message)
         {
-            return Clients.Caller.Send($"{Context.ConnectionId}: {message}");
+            return Clients.Caller.Send($"{name}: {message}");
         }
     }
 }
diff --git a/src/SignalR/samples/SignalRSamples/Hubs/HubTChat.cs b/src/SignalR/samples/SignalRSamples/Hubs/HubTChat.cs
index 3acb04f3231a..ee0efa7a5c0c 100644
--- a/src/SignalR/samples/SignalRSamples/Hubs/HubTChat.cs
+++ b/src/SignalR/samples/SignalRSamples/Hubs/HubTChat.cs
@@ -9,53 +9,43 @@ namespace SignalRSamples.Hubs
 {
     public class HubTChat : Hub<IChatClient>
     {
-        public override async Task OnConnectedAsync()
+        public Task Send(string name, string message)
         {
-            await Clients.All.Send($"{Context.ConnectionId} joined");
+            return Clients.All.Send($"{name}: {message}");
         }
 
-        public override async Task OnDisconnectedAsync(Exception ex)
+        public Task SendToOthers(string name, string message)
         {
-            await Clients.Others.Send($"{Context.ConnectionId} left");
+            return Clients.Others.Send($"{name}: {message}");
         }
 
-        public Task Send(string message)
+        public Task SendToGroup(string groupName, string name, string message)
         {
-            return Clients.All.Send($"{Context.ConnectionId}: {message}");
+            return Clients.Group(groupName).Send($"{name}@{groupName}: {message}");
         }
 
-        public Task SendToOthers(string message)
+        public Task SendToOthersInGroup(string groupName, string name, string message)
         {
-            return Clients.Others.Send($"{Context.ConnectionId}: {message}");
+            return Clients.OthersInGroup(groupName).Send($"{name}@{groupName}: {message}");
         }
 
-        public Task SendToGroup(string groupName, string message)
-        {
-            return Clients.Group(groupName).Send($"{Context.ConnectionId}@{groupName}: {message}");
-        }
-
-        public Task SendToOthersInGroup(string groupName, string message)
-        {
-            return Clients.OthersInGroup(groupName).Send($"{Context.ConnectionId}@{groupName}: {message}");
-        }
-
-        public async Task JoinGroup(string groupName)
+        public async Task JoinGroup(string groupName, string name)
         {
             await Groups.AddToGroupAsync(Context.ConnectionId, groupName);
 
-            await Clients.Group(groupName).Send($"{Context.ConnectionId} joined {groupName}");
+            await Clients.Group(groupName).Send($"{name} joined {groupName}");
         }
 
-        public async Task LeaveGroup(string groupName)
+        public async Task LeaveGroup(string groupName, string name)
         {
-            await Clients.Group(groupName).Send($"{Context.ConnectionId} left {groupName}");
+            await Clients.Group(groupName).Send($"{name} left {groupName}");
 
             await Groups.RemoveFromGroupAsync(Context.ConnectionId, groupName);
         }
 
-        public Task Echo(string message)
+        public Task Echo(string name, string message)
         {
-            return Clients.Caller.Send($"{Context.ConnectionId}: {message}");
+            return Clients.Caller.Send($"{name}: {message}");
         }
     }
 
diff --git a/src/SignalR/samples/SignalRSamples/wwwroot/hubs.html b/src/SignalR/samples/SignalRSamples/wwwroot/hubs.html
index 8700fd4d1198..d29bfae679c6 100644
--- a/src/SignalR/samples/SignalRSamples/wwwroot/hubs.html
+++ b/src/SignalR/samples/SignalRSamples/wwwroot/hubs.html
@@ -58,6 +58,7 @@ <h4>To Me</h4>
         <div class="input-append">
             <input type="text" id="me-message-text" placeholder="Type a message" />
             <input type="button" id="send" class="btn" value="Send to Me" />
+            <input type="hidden" id="displayname" />
         </div>
     </form>
 
@@ -83,6 +84,13 @@ <h4>Group Actions</h4>
 <script src="lib/signalr/signalr-protocol-msgpack.js"></script>
 <script src="utils.js"></script>
 <script>
+    var name = prompt("Please enter your name", "D'Artagnan");
+    if (name === "") {
+        name = "Anonymous"
+    }
+
+    document.getElementById("displayname").innerHTML = name
+
     var isConnected = false;
     function invoke(connection, method) {
         if (!isConnected) {
@@ -205,45 +213,45 @@ <h4>Group Actions</h4>
 
     click('broadcast', function (event) {
         let data = getText('message-text');
-        invoke(connection, 'Send', data);
+        invoke(connection, 'Send', name, data);
     });
 
     click('join-group', function (event) {
         let groupName = getText('group-name');
-        invoke(connection, 'JoinGroup', groupName);
+        invoke(connection, 'JoinGroup', groupName, name);
     });
 
     click('leave-group', function (event) {
         let groupName = getText('group-name');
-        invoke(connection, 'LeaveGroup', groupName);
+        invoke(connection, 'LeaveGroup', groupName, name);
     });
 
     click('groupmsg', function (event) {
         let groupName = getText('group-name');
         let message = getText('group-message-text');
-        invoke(connection, 'SendToGroup', groupName, message);
+        invoke(connection, 'SendToGroup', groupName, name, message);
     });
 
     click('others-groupmsg', function (event) {
         let groupName = getText('group-name');
         let message = getText('group-message-text');
-        invoke(connection, 'SendToOthersInGroup', groupName, message);
+        invoke(connection, 'SendToOthersInGroup', groupName, data, name, message);
     });
 
     click('send', function (event) {
         let data = getText('me-message-text');
-        invoke(connection, 'Echo', data);
+        invoke(connection, 'Echo', name, data);
     });
 
     click('broadcast-exceptme', function (event) {
         let data = getText('message-text');
-        invoke(connection, 'SendToOthers', data);
+        invoke(connection, 'SendToOthers', name, data);
     });
 
     click('connection-send', function (event) {
         let data = getText('connection-message-text');
         let id = getText('connection-id');
-        invoke(connection, 'SendToConnection', id, data);
+        invoke(connection, 'SendToConnection', id, name, data);
     });
 
 </script>

From 023fc536b8fb2304dfc5febe21e94d52e6479bcf Mon Sep 17 00:00:00 2001
From: Mikael Mengistu <mimengis@microsoft.com>
Date: Mon, 12 Aug 2019 16:26:20 -0700
Subject: [PATCH 2/3] update

---
 src/SignalR/samples/SignalRSamples/wwwroot/hubs.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/SignalR/samples/SignalRSamples/wwwroot/hubs.html b/src/SignalR/samples/SignalRSamples/wwwroot/hubs.html
index d29bfae679c6..66bcc43c48e2 100644
--- a/src/SignalR/samples/SignalRSamples/wwwroot/hubs.html
+++ b/src/SignalR/samples/SignalRSamples/wwwroot/hubs.html
@@ -235,7 +235,7 @@ <h4>Group Actions</h4>
     click('others-groupmsg', function (event) {
         let groupName = getText('group-name');
         let message = getText('group-message-text');
-        invoke(connection, 'SendToOthersInGroup', groupName, data, name, message);
+        invoke(connection, 'SendToOthersInGroup', groupName, name, message);
     });
 
     click('send', function (event) {

From db3472243e5091d9669ba1853935967d3258f6b5 Mon Sep 17 00:00:00 2001
From: Mikael Mengistu <mimengis@microsoft.com>
Date: Tue, 13 Aug 2019 11:34:51 -0700
Subject: [PATCH 3/3] update

---
 src/SignalR/samples/SignalRSamples/Hubs/Chat.cs  | 12 ++++++++++++
 .../samples/SignalRSamples/Hubs/DynamicChat.cs   | 12 ++++++++++++
 .../samples/SignalRSamples/Hubs/HubTChat.cs      | 12 ++++++++++++
 .../samples/SignalRSamples/wwwroot/hubs.html     | 16 +++++++++-------
 4 files changed, 45 insertions(+), 7 deletions(-)

diff --git a/src/SignalR/samples/SignalRSamples/Hubs/Chat.cs b/src/SignalR/samples/SignalRSamples/Hubs/Chat.cs
index 02d9c5f6b2ac..7d662e27e2b5 100644
--- a/src/SignalR/samples/SignalRSamples/Hubs/Chat.cs
+++ b/src/SignalR/samples/SignalRSamples/Hubs/Chat.cs
@@ -9,6 +9,18 @@ namespace SignalRSamples.Hubs
 {
     public class Chat : Hub
     {
+        public override Task OnConnectedAsync()
+        {
+            var name = Context.GetHttpContext().Request.Query["name"];
+            return Clients.All.SendAsync("Send", $"{name} joined the chat");
+        }
+
+        public override Task OnDisconnectedAsync(Exception exception)
+        {
+            var name = Context.GetHttpContext().Request.Query["name"];
+            return Clients.All.SendAsync("Send", $"{name} left the chat");
+        }
+
         public Task Send(string name, string message)
         {
             return Clients.All.SendAsync("Send", $"{name}: {message}");
diff --git a/src/SignalR/samples/SignalRSamples/Hubs/DynamicChat.cs b/src/SignalR/samples/SignalRSamples/Hubs/DynamicChat.cs
index aba79b24baa5..711df26f3733 100644
--- a/src/SignalR/samples/SignalRSamples/Hubs/DynamicChat.cs
+++ b/src/SignalR/samples/SignalRSamples/Hubs/DynamicChat.cs
@@ -9,6 +9,18 @@ namespace SignalRSamples.Hubs
 {
     public class DynamicChat : DynamicHub
     {
+        public override Task OnConnectedAsync()
+        {
+            var name = Context.GetHttpContext().Request.Query["name"];
+            return Clients.All.Send($"{name} joined the chat");
+        }
+
+        public override Task OnDisconnectedAsync(Exception exception)
+        {
+            var name = Context.GetHttpContext().Request.Query["name"];
+            return Clients.All.Send($"{name} left the chat");
+        }
+
         public Task Send(string name, string message)
         {
             return Clients.All.Send($"{name}: {message}");
diff --git a/src/SignalR/samples/SignalRSamples/Hubs/HubTChat.cs b/src/SignalR/samples/SignalRSamples/Hubs/HubTChat.cs
index ee0efa7a5c0c..7aadbaad14ba 100644
--- a/src/SignalR/samples/SignalRSamples/Hubs/HubTChat.cs
+++ b/src/SignalR/samples/SignalRSamples/Hubs/HubTChat.cs
@@ -9,6 +9,18 @@ namespace SignalRSamples.Hubs
 {
     public class HubTChat : Hub<IChatClient>
     {
+        public override Task OnConnectedAsync()
+        {
+            var name = Context.GetHttpContext().Request.Query["name"];
+            return Clients.All.Send($"{name} joined the chat");
+        }
+
+        public override Task OnDisconnectedAsync(Exception exception)
+        {
+            var name = Context.GetHttpContext().Request.Query["name"];
+            return Clients.All.Send($"{name} left the chat");
+        }
+
         public Task Send(string name, string message)
         {
             return Clients.All.Send($"{name}: {message}");
diff --git a/src/SignalR/samples/SignalRSamples/wwwroot/hubs.html b/src/SignalR/samples/SignalRSamples/wwwroot/hubs.html
index 66bcc43c48e2..014f753744f4 100644
--- a/src/SignalR/samples/SignalRSamples/wwwroot/hubs.html
+++ b/src/SignalR/samples/SignalRSamples/wwwroot/hubs.html
@@ -27,6 +27,7 @@ <h1 id="head1">SignalR Hubs Sample</h1>
             <option value="hubT">Hub&lt;T&gt;</option>
         </select>
 
+        <input type="text" id="displayname" placeholder="Enter User Name" />
         <input type="button" id="connect" value="Connect" />
         <input type="button" id="disconnect" value="Disconnect" />
 
@@ -84,13 +85,6 @@ <h4>Group Actions</h4>
 <script src="lib/signalr/signalr-protocol-msgpack.js"></script>
 <script src="utils.js"></script>
 <script>
-    var name = prompt("Please enter your name", "D'Artagnan");
-    if (name === "") {
-        name = "Anonymous"
-    }
-
-    document.getElementById("displayname").innerHTML = name
-
     var isConnected = false;
     function invoke(connection, method) {
         if (!isConnected) {
@@ -146,6 +140,13 @@ <h4>Group Actions</h4>
     var connection;
 
     click('connect', function (event) {
+
+        name = document.getElementById("displayname").value
+        if (name === "") {
+            alert("Please enter a valid name");
+            return;
+        }
+
         let hubRoute = hubTypeDropdown.value || "default";
         let protocol = protocolDropdown.value === "msgpack" ?
             new signalR.protocols.msgpack.MessagePackHubProtocol() :
@@ -156,6 +157,7 @@ <h4>Group Actions</h4>
             options.transport = signalR.HttpTransportType[transportDropdown.value];
         }
 
+        hubRoute = hubRoute + "?name=" + name;
         console.log('http://' + document.location.host + '/' + hubRoute);
 
         var connectionBuilder = new signalR.HubConnectionBuilder()