Merge pull request #109 from JialinXin/biForHub

JialinXin · web-flow · commit ab4ffe7a08ff · 2019-09-10T15:58:02.000+08:00
Update hub names in samples
diff --git a/aspnet-samples/AdvancedChatRoom/AdvancedChatSampleHub.cs b/aspnet-samples/AdvancedChatRoom/AdvancedChatSampleHub.cs
@@ -8,7 +8,7 @@
 namespace ChatSample.AspNet
 {
     [Authorize(Roles = "Admin")]
-    public class AdvancedChat : Hub
+    public class AdvancedChatSampleHub : Hub
     {
         public override Task OnConnected()
         {
diff --git a/aspnet-samples/AdvancedChatRoom/ChatSample.AspNet.csproj b/aspnet-samples/AdvancedChatRoom/ChatSample.AspNet.csproj
@@ -211,7 +211,7 @@
     <Content Include="Web.config" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AdvancedChat.cs" />
+    <Compile Include="AdvancedChatSampleHub.cs" />
     <Compile Include="Controllers\CookieController.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Startup.cs" />
diff --git a/aspnet-samples/AdvancedChatRoom/index.html b/aspnet-samples/AdvancedChatRoom/index.html
@@ -269,7 +269,7 @@ <h2 class="text-center" style="margin-top: 0; padding-top: 30px; padding-bottom:
             // Declare a proxy to reference the hub.
             var connection = $.connection;
             connection.hub.logging = true;
-            var chat = connection.advancedChat;
+            var chat = connection.advancedChatSampleHub;
             window.console.debug = console.log;
             bindConnectionMessage(chat);
 
diff --git a/aspnet-samples/ChatRoom/ChatRoom.csproj b/aspnet-samples/ChatRoom/ChatRoom.csproj
@@ -191,7 +191,7 @@
     <Content Include="Web.config" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="ChatHub.cs" />
+    <Compile Include="ChatSampleHub.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Startup.cs" />
   </ItemGroup>
diff --git a/aspnet-samples/ChatRoom/ChatSampleHub.cs b/aspnet-samples/ChatRoom/ChatSampleHub.cs
@@ -9,7 +9,7 @@
 
 namespace ChatRoom
 {
-    public class ChatHub : Hub
+    public class ChatSampleHub : Hub
     {
         public void Send(string name, string message)
         {
diff --git a/aspnet-samples/ChatRoom/index.html b/aspnet-samples/ChatRoom/index.html
@@ -29,7 +29,7 @@
     <script type="text/javascript">
         $(function () {
             // Declare a proxy to reference the hub.
-            var chat = $.connection.chatHub;
+            var chat = $.connection.chatSampleHub;
             // Create a function that the hub can call to broadcast messages.
             chat.client.broadcastMessage = function (name, message) {
                 // Html encode display name and message.
diff --git a/samples/AdvancedChatRoom/Hub/ChatCookieSampleHub.cs b/samples/AdvancedChatRoom/Hub/ChatCookieSampleHub.cs
@@ -10,7 +10,7 @@ namespace Microsoft.Azure.SignalR.Samples.AdvancedChatRoom
     [Authorize(Roles = "Admin")]
     [Authorize(Policy = "ClaimBasedAuth")]
     [Authorize(Policy = "PolicyBasedAuth")]
-    public class ChatCookie : ChatBase
+    public class ChatCookieSampleHub : ChatBase
     {
     }
 }
diff --git a/samples/AdvancedChatRoom/Hub/ChatJwtSampleHub.cs b/samples/AdvancedChatRoom/Hub/ChatJwtSampleHub.cs
@@ -10,7 +10,7 @@ namespace Microsoft.Azure.SignalR.Samples.AdvancedChatRoom
     [Authorize(Roles = "Admin")]
     [Authorize(Policy = "ClaimBasedAuth")]
     [Authorize(Policy = "PolicyBasedAuth")]
-    public class ChatJwt : ChatBase
+    public class ChatJwtSampleHub : ChatBase
     { 
     }
 }
diff --git a/samples/AdvancedChatRoom/Startup.cs b/samples/AdvancedChatRoom/Startup.cs
@@ -73,8 +73,8 @@ public void Configure(IApplicationBuilder app)
             app.UseFileServer();
             app.UseAzureSignalR(routes =>
             {
-                routes.MapHub<ChatJwt>("/chatjwt");
-                routes.MapHub<ChatCookie>("/chatcookie");
+                routes.MapHub<ChatJwtSampleHub>("/chatjwt");
+                routes.MapHub<ChatCookieSampleHub>("/chatcookie");
             });
         }
     }
diff --git a/samples/ChatRoom/Hub/ChatSampleHub.cs b/samples/ChatRoom/Hub/ChatSampleHub.cs
@@ -5,7 +5,7 @@
 
 namespace Microsoft.Azure.SignalR.Samples.ChatRoom
 {
-    public class Chat : Hub
+    public class ChatSampleHub : Hub
     {
         public void BroadcastMessage(string name, string message)
         {
diff --git a/samples/ChatRoom/Startup.cs b/samples/ChatRoom/Startup.cs
@@ -29,7 +29,7 @@ public void Configure(IApplicationBuilder app)
             app.UseFileServer();
             app.UseAzureSignalR(routes =>
             {
-                routes.MapHub<Chat>("/chat");
+                routes.MapHub<ChatSampleHub>("/chat");
             });
         }
     }
diff --git a/samples/FlightMap/FlightControl.cs b/samples/FlightMap/FlightControl.cs
@@ -37,9 +37,9 @@ public class FlightControl : IFlightControl
 
         private FlightRecord[][] flightData;
 
-        private IHubContext<FlightMapHub> context;
+        private IHubContext<FlightMapSampleHub> context;
 
-        public FlightControl(IHubContext<FlightMapHub> context, IConfiguration configuration)
+        public FlightControl(IHubContext<FlightMapSampleHub> context, IConfiguration configuration)
         {
             this.context = context;
             var dataUrl = configuration["DataFileUrl"];
diff --git a/samples/FlightMap/Hub/FlightMapSampleHub.cs b/samples/FlightMap/Hub/FlightMapSampleHub.cs
@@ -7,11 +7,11 @@
 
 namespace Microsoft.Azure.SignalR.Samples.FlightMap
 {
-    public class FlightMapHub : Hub
+    public class FlightMapSampleHub : Hub
     {
         private IFlightControl control;
 
-        public FlightMapHub(IFlightControl ctrl)
+        public FlightMapSampleHub(IFlightControl ctrl)
         {
             control = ctrl;
         }
diff --git a/samples/FlightMap/Startup.cs b/samples/FlightMap/Startup.cs
@@ -29,7 +29,7 @@ public void Configure(IApplicationBuilder app)
             app.UseFileServer();
             app.UseAzureSignalR(routes =>
             {
-                routes.MapHub<FlightMapHub>("/flightData");
+                routes.MapHub<FlightMapSampleHub>("/flightData");
             });
         }
     }
diff --git a/samples/GitHubChat/Hub/GitHubChatSampleHub.cs b/samples/GitHubChat/Hub/GitHubChatSampleHub.cs
@@ -8,7 +8,7 @@
 namespace Microsoft.Azure.SignalR.Samples.ChatRoom
 {
     [Authorize]
-    public class Chat : Hub
+    public class GitHubChatSampleHub : Hub
     {
         public override Task OnConnectedAsync()
         {
diff --git a/samples/GitHubChat/Startup.cs b/samples/GitHubChat/Startup.cs
@@ -59,7 +59,7 @@ public void Configure(IApplicationBuilder app)
             app.UseFileServer();
             app.UseAzureSignalR(routes =>
             {
-                routes.MapHub<Chat>("/chat");
+                routes.MapHub<GitHubChatSampleHub>("/chat");
             });
         }
 
diff --git a/samples/Management/MessagePublisher/MessagePublisher.cs b/samples/Management/MessagePublisher/MessagePublisher.cs
@@ -12,7 +12,7 @@ namespace Microsoft.Azure.SignalR.Samples.Management
     public class MessagePublisher
     {
         private const string Target = "Target";
-        private const string HubName = "Management";
+        private const string HubName = "ManagementSampleHub";
         private readonly string _connectionString;
         private readonly ServiceTransportType _serviceTransportType;
         private IServiceHubContext _hubContext;
diff --git a/samples/Management/README.md b/samples/Management/README.md
@@ -26,7 +26,7 @@ dotnet run
 
 >  Parameters:
 > 
-> - -h|--hubEndpoint: Set hub endpoint. Default value: "<http://localhost:5000/Management>".
+> - -h|--hubEndpoint: Set hub endpoint. Default value: "<http://localhost:5000/ManagementSampleHub>".
 > - -u|--user: Set user ID. Default value: "User". You can set multiple users like this: "-u user1 -u user2".
 
 ### Start message publisher
diff --git a/samples/Management/SignalRClient/Program.cs b/samples/Management/SignalRClient/Program.cs
@@ -13,7 +13,7 @@ namespace SignalRClient
 {
     class Program
     {
-        private const string DefaultHubEndpoint = "http://localhost:5000/Management";
+        private const string DefaultHubEndpoint = "http://localhost:5000/ManagementSampleHub";
         private const string Target = "Target";
         private const string DefaultUser = "User";
 
diff --git a/samples/RealtimeSignIn/function/SignInFunction.cs b/samples/RealtimeSignIn/function/SignInFunction.cs
@@ -14,7 +14,7 @@ namespace RealtimeSignIn
 {
     public static class SignInFunction
     {
-        private const string HubName = "signin";
+        private const string HubName = "signinsamplehub";
 
         [FunctionName("signin")]
         public static async Task<HttpResponseMessage> Run([HttpTrigger(AuthorizationLevel.Anonymous, "get", "post")]HttpRequestMessage req, ILogger log)
@@ -30,7 +30,7 @@ public static async Task<HttpResponseMessage> Run([HttpTrigger(AuthorizationLeve
             var stats = table.GetStats();
 
             // broadcast through SignalR
-            await signalR.SendAsync("signin", "updateSignInStats", stats.TotalNumber, stats.ByOS, stats.ByBrowser);
+            await signalR.SendAsync("signinsamplehub", "updateSignInStats", stats.TotalNumber, stats.ByOS, stats.ByBrowser);
 
             return req.CreateResponse(HttpStatusCode.OK, new
             {
diff --git a/samples/SimpleEcho/EchoSampleHub.cs b/samples/SimpleEcho/EchoSampleHub.cs
@@ -1,15 +1,15 @@
-﻿// Copyright (c) Microsoft. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-using Microsoft.AspNetCore.SignalR;
-
-namespace Microsoft.Azure.SignalR.Samples.SimpleEcho
-{
-    public class EchoHub : Hub
-    {
-        public void Echo(string message)
-        {
-            Clients.Client(Context.ConnectionId).SendAsync("echo", message);
-        }
-    }
-}
+﻿// Copyright (c) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using Microsoft.AspNetCore.SignalR;
+
+namespace Microsoft.Azure.SignalR.Samples.SimpleEcho
+{
+    public class EchoSampleHub : Hub
+    {
+        public void Echo(string message)
+        {
+            Clients.Client(Context.ConnectionId).SendAsync("echo", message);
+        }
+    }
+}
diff --git a/samples/SimpleEcho/Startup.cs b/samples/SimpleEcho/Startup.cs
@@ -19,7 +19,7 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, IApplica
         {
             app.UseAzureSignalR(routes =>
             {
-                routes.MapHub<EchoHub>("/echo");
+                routes.MapHub<EchoSampleHub>("/echo");
             });
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`namespace ChatSample.AspNet`
`9`	`9`	`{`
`10`	`10`	`[Authorize(Roles = "Admin")]`
`11`		`- public class AdvancedChat : Hub`
	`11`	`+ public class AdvancedChatSampleHub : Hub`
`12`	`12`	`{`
`13`	`13`	`public override Task OnConnected()`
`14`	`14`	`{`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`
`10`	`10`	`namespace ChatRoom`
`11`	`11`	`{`
`12`		`- public class ChatHub : Hub`
	`12`	`+ public class ChatSampleHub : Hub`
`13`	`13`	`{`
`14`	`14`	`public void Send(string name, string message)`
`15`	`15`	`{`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ namespace Microsoft.Azure.SignalR.Samples.AdvancedChatRoom`
`10`	`10`	`[Authorize(Roles = "Admin")]`
`11`	`11`	`[Authorize(Policy = "ClaimBasedAuth")]`
`12`	`12`	`[Authorize(Policy = "PolicyBasedAuth")]`
`13`		`- public class ChatCookie : ChatBase`
	`13`	`+ public class ChatCookieSampleHub : ChatBase`
`14`	`14`	`{`
`15`	`15`	`}`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -73,8 +73,8 @@ public void Configure(IApplicationBuilder app)`
`73`	`73`	`app.UseFileServer();`
`74`	`74`	`app.UseAzureSignalR(routes =>`
`75`	`75`	`{`
`76`		`- routes.MapHub<ChatJwt>("/chatjwt");`
`77`		`- routes.MapHub<ChatCookie>("/chatcookie");`
	`76`	`+ routes.MapHub<ChatJwtSampleHub>("/chatjwt");`
	`77`	`+ routes.MapHub<ChatCookieSampleHub>("/chatcookie");`
`78`	`78`	`});`
`79`	`79`	`}`
`80`	`80`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`
`6`	`6`	`namespace Microsoft.Azure.SignalR.Samples.ChatRoom`
`7`	`7`	`{`
`8`		`- public class Chat : Hub`
	`8`	`+ public class ChatSampleHub : Hub`
`9`	`9`	`{`
`10`	`10`	`public void BroadcastMessage(string name, string message)`
`11`	`11`	`{`