aspnet
/
AzureSignalR-samples
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Fix BidirectionChat samples (#226) 

1. Added `local.settings.json` file to dotnet isolated-worker sample
2. Fixed the UI problem that "AddUserToGroup", "RemoveUserFromGroup" buttons appear in the messages whose user ID is null.
This commit is contained in:
yzt 2023-05-06 11:43:45 +08:00 коммит произвёл GitHub
Родитель 2e928b19f5
Коммит c255794db2
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
5 изменённых файлов: 53 добавлений и 37 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

37
samples/BidirectionChat/csharp/content/index.html
Просмотреть файл

@ -33,7 +33,8 @@
<label for="checkbox">Send To Default Group: {{ this.defaultgroup }}</label>
</div>
<form v-on:submit.prevent="sendNewMessage(checked)">
<input type="text" v-model="newMessage" id="message-box" class="form-control" placeholder="Type message here..." />
<input type="text" v-model="newMessage" id="message-box" class="form-control"
placeholder="Type message here..." />
</form>
</div>
</div>
@ -57,20 +58,25 @@
</a>
<span v-if="message.ConnectionId || message.connectionId">
<a href="#" v-on:click.prevent="sendToConnection(message.ConnectionId || message.connectionId)">
<span class="badge badge-primary">Connection: {{ message.ConnectionId || message.connectionId }}</span>
<span class="badge badge-primary">Connection: {{ message.ConnectionId ||
message.connectionId
}}</span>
</a>
</span>
<a href="#" v-on:click.prevent="addUserToGroup(message.Sender || message.sender)">
<span class="badge badge-primary">AddUserToGroup</span>
<span v-if="message.Sender || message.sender" class="badge badge-primary">AddUserToGroup</span>
</a>
<a href="#" v-on:click.prevent="removeUserFromGroup(message.Sender || message.sender)">
<span class="badge badge-primary">RemoveUserFromGroup</span>
<span v-if="message.Sender || message.sender" class="badge badge-primary">RemoveUserFromGroup</span>
</a>
<a href="#" v-on:click.prevent="addConnectionToGroup(message.ConnectionId || message.connectionId)">
<span v-if="message.ConnectionId || message.connectionId" class="badge badge-primary">AddConnectionToGroup</span>
<span v-if="message.ConnectionId || message.connectionId"
class="badge badge-primary">AddConnectionToGroup</span>
</a>
<a href="#" v-on:click.prevent="removeConnectionIdFromGroup(message.ConnectionId || message.connectionId)">
<span v-if="message.ConnectionId || message.connectionId" class="badge badge-primary">RemoveConnectionFromGroup</span>
<a href="#"
v-on:click.prevent="removeConnectionIdFromGroup(message.ConnectionId || message.connectionId)">
<span v-if="message.ConnectionId || message.connectionId"
class="badge badge-primary">RemoveConnectionFromGroup</span>
</a>
<span v-if="message.IsPrivate || message.isPrivate" class="badge badge-secondary">private message
</span>
@ -127,7 +133,7 @@
connection.invoke("sendToConnection", connectionId, messageText);
}
},
addConnectionToGroup: function(connectionId) {
addConnectionToGroup: function (connectionId) {
confirm('Add connection ' + connectionId + ' to group: ' + this.defaultgroup);
connection.invoke("joinGroup", connectionId, this.defaultgroup);
},
@ -135,11 +141,11 @@
r = confirm('Add user ' + user + ' to group: ' + this.defaultgroup);
connection.invoke("joinUserToGroup", user, this.defaultgroup);
},
removeConnectionIdFromGroup: function(connectionId) {
removeConnectionIdFromGroup: function (connectionId) {
confirm('Remove connection ' + connectionId + ' from group: ' + this.defaultgroup);
connection.invoke("leaveGroup", connectionId, this.defaultgroup);
},
removeUserFromGroup: function(user) {
removeUserFromGroup: function (user) {
confirm('Remove user ' + user + ' from group: ' + this.defaultgroup);
connection.invoke("leaveUserFromGroup", user, this.defaultgroup);
}
@ -173,7 +179,7 @@
function getAxiosConfig() {
const config = {
headers: {
'x-ms-signalr-user-id': data.username,
'x-ms-signalr-user-id': data.username,
'Authorization': 'Bearer ' + generateAccessToken(data.username)
}
};
@ -187,13 +193,12 @@
function onNewConnection(message) {
data.myConnectionId = message.ConnectionId;
authEnabled = false;
if (message.Authentication)
{
if (message.Authentication) {
authEnabled = true;
}
newConnectionMessage = {
id : counter++,
text : `${message.ConnectionId} has connected, with Authorization: ${authEnabled.toString()}`
id: counter++,
text: `${message.ConnectionId} has connected, with Authorization: ${authEnabled.toString()}`
};
data.messages.unshift(newConnectionMessage);
}
@ -222,7 +227,7 @@
var stringifiedHeader = CryptoJS.enc.Utf8.parse(JSON.stringify(header));
var encodedHeader = base64url(stringifiedHeader);
// customize your JWT token payload here
// customize your JWT token payload here
var data = {
"http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier": userName,
"exp": 1699819025,

2
samples/BidirectionChat/csharp/extensions.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<AzureFunctionsVersion>v3</AzureFunctionsVersion>
<AzureFunctionsVersion>v4</AzureFunctionsVersion>
<RootNamespace>bidirectional_chat</RootNamespace>
</PropertyGroup>
<ItemGroup>

13
samples/DotnetIsolated-BidirectionChat/Functions.cs
Просмотреть файл

@ -28,7 +28,7 @@ namespace IsolatedModel_BidirectionChat
public SignalRConnectionInfo Negotiate([HttpTrigger(AuthorizationLevel.Anonymous)] HttpRequestData req,
[SignalRConnectionInfoInput(HubName = "Hub", UserId = "{query.userid}")] SignalRConnectionInfo signalRConnectionInfo)
{
_logger.LogInformation("Executing negotation.");
_logger.LogInformation("Executing negotiation.");
return signalRConnectionInfo;
}
@ -47,18 +47,11 @@ namespace IsolatedModel_BidirectionChat
[Function("Broadcast")]
[SignalROutput(HubName = "Hub")]
public SignalRMessageAction Broadcast(
[SignalREndpointsInput("Hub")] SignalREndpoint[] endpoints,
[SignalRNegotiationInput("Hub", "AzureSignalRConnectionString")] SignalRNegotiationContext negotiationContext,
[SignalRTrigger("Hub", "messages", "Broadcast", "message")] SignalRInvocationContext invocationContext, string message)
public SignalRMessageAction Broadcast([SignalRTrigger("Hub", "messages", "Broadcast", "message")] SignalRInvocationContext invocationContext, string message)
{
_logger.LogInformation($"{negotiationContext.Endpoints[0].Endpoint}");
_logger.LogInformation($"{negotiationContext.Endpoints[0].ConnectionInfo.AccessToken}");
_logger.LogInformation($"{negotiationContext.Endpoints[1].Endpoint}");
return new SignalRMessageAction("newMessage")
{
Arguments = new object[] { new NewMessage(invocationContext, message) },
Endpoints = endpoints
Arguments = new object[] { new NewMessage(invocationContext, message) }
};
}

30
samples/DotnetIsolated-BidirectionChat/content/index.html
Просмотреть файл

@ -33,7 +33,8 @@
<label for="checkbox">Send To Default Group: {{ this.defaultgroup }}</label>
</div>
<form v-on:submit.prevent="sendNewMessage(checked)">
<input type="text" v-model="newMessage" id="message-box" class="form-control" placeholder="Type message here..." />
<input type="text" v-model="newMessage" id="message-box" class="form-control"
placeholder="Type message here..." />
</form>
</div>
</div>
@ -56,21 +57,30 @@
</span>
</a>
<span v-if="message.ConnectionId || message.connectionId">
<a href="#" v-on:click.prevent="sendToConnection(message.ConnectionId || message.connectionId)">
<span class="badge badge-primary">Connection: {{ message.ConnectionId || message.connectionId }}</span>
<a href="#"
v-on:click.prevent="sendToConnection(message.ConnectionId || message.connectionId)">
<span class="badge badge-primary">Connection: {{ message.ConnectionId ||
message.connectionId }}</span>
</a>
</span>
<a href="#" v-on:click.prevent="addUserToGroup(message.Sender || message.sender)">
<span class="badge badge-primary">AddUserToGroup</span>
<span v-if="message.Sender || message.sender"
class="badge badge-primary">AddUserToGroup</span>
</a>
<a href="#" v-on:click.prevent="removeUserFromGroup(message.Sender || message.sender)">
<span class="badge badge-primary">RemoveUserFromGroup</span>
<a href="#"
v-on:click.prevent="removeUserFromGroup(message.Sender || message.sender)">
<span v-if="message.Sender || message.sender"
class="badge badge-primary">RemoveUserFromGroup</span>
</a>
<a href="#" v-on:click.prevent="addConnectionToGroup(message.ConnectionId || message.connectionId)">
<span v-if="message.ConnectionId || message.connectionId" class="badge badge-primary">AddConnectionToGroup</span>
<a href="#"
v-on:click.prevent="addConnectionToGroup(message.ConnectionId || message.connectionId)">
<span v-if="message.ConnectionId || message.connectionId"
class="badge badge-primary">AddConnectionToGroup</span>
</a>
<a href="#" v-on:click.prevent="removeConnectionIdFromGroup(message.ConnectionId || message.connectionId)">
<span v-if="message.ConnectionId || message.connectionId" class="badge badge-primary">RemoveConnectionFromGroup</span>
<a href="#"
v-on:click.prevent="removeConnectionIdFromGroup(message.ConnectionId || message.connectionId)">
<span v-if="message.ConnectionId || message.connectionId"
class="badge badge-primary">RemoveConnectionFromGroup</span>
</a>
<span v-if="message.IsPrivate || message.isPrivate" class="badge badge-secondary">
private message

8
samples/DotnetIsolated-BidirectionChat/local.settings.json Normal file
Просмотреть файл

@ -0,0 +1,8 @@
{
"IsEncrypted": false,
"Values": {
"AzureWebJobsStorage": "UseDevelopmentStorage=true",
"FUNCTIONS_WORKER_RUNTIME": "dotnet-isolated",
"AzureSignalRConnectionString": ""
}
}