Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add socketio support when generating client access uri #46942

Merged
merged 3 commits into from
Nov 4, 2024
Merged

add socketio support when generating client access uri #46942

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
419da6a
add socketio support when generating client access uri
cqnguy23 Nov 1, 2024
16c4227
add changelog
cqnguy23 Nov 1, 2024
b94ccd2
update api
cqnguy23 Nov 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions sdk/webpubsub/Azure.Messaging.WebPubSub/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
## 1.5.0-beta.1 (Unreleased)

### Features Added
- Added support for SocketIO when generating ClientAccessURI

### Breaking Changes

Expand Down
5 changes: 5 additions & 0 deletions sdk/webpubsub/Azure.Messaging.WebPubSub/src/WebPubSubClientProtocol.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,9 @@ public enum WebPubSubClientProtocol
/// MQTT client protocol, whose access endpoint starts with "/clients/mqtt".
/// </summary>
Mqtt,

/// <summary>
/// SocketIO client protocol, whose access endpoint starts with "/clients/socketio".
/// </summary>
SocketIO,
}
2 changes: 2 additions & 0 deletions sdk/webpubsub/Azure.Messaging.WebPubSub/src/WebPubSubServiceClient_helpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,6 +387,7 @@ private string GenerateTokenFromAzureKeyCredential(DateTimeOffset expiresAt, Web
{
WebPubSubClientProtocol.Default => $"client/hubs/{_hub}",
WebPubSubClientProtocol.Mqtt => $"clients/mqtt/hubs/{_hub}",
WebPubSubClientProtocol.SocketIO => $"clients/socketio/hubs/{_hub}",
_ => throw new ArgumentOutOfRangeException(nameof(clientProtocol))
};

Expand All @@ -407,6 +408,7 @@ private async Task<string> GetClientAccessTokenCore(
{
WebPubSubClientProtocol.Default => "default",
WebPubSubClientProtocol.Mqtt => "mqtt",
WebPubSubClientProtocol.SocketIO => "socketio",
_ => throw new ArgumentOutOfRangeException(nameof(clientAccess))
};
if (_tokenCredential != null)
Expand Down
2 changes: 2 additions & 0 deletions sdk/webpubsub/Azure.Messaging.WebPubSub/tests/WebPubSubGenerateUriTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ public class WebPubSubGenerateUriTests

[TestCase(WebPubSubClientProtocol.Default, "/client")]
[TestCase(WebPubSubClientProtocol.Mqtt, "/clients/mqtt")]
[TestCase(WebPubSubClientProtocol.SocketIO, "/clients/socketio")]
public async Task GetClientAccessUri_AccessKey_Test(WebPubSubClientProtocol clientType, string clientUriPrefix)
{
var serviceClient = new WebPubSubServiceClient(string.Format("Endpoint=http://localhost;Port=8080;AccessKey={0};Version=1.0;", FakeAccessKey), "hub");
Expand All @@ -38,6 +39,7 @@ public async Task GetClientAccessUri_AccessKey_Test(WebPubSubClientProtocol clie

[TestCase(WebPubSubClientProtocol.Default, "/client", "default")]
[TestCase(WebPubSubClientProtocol.Mqtt, "/clients/mqtt", "mqtt")]
[TestCase(WebPubSubClientProtocol.SocketIO, "/clients/socketio", "socketio")]
public async Task GetClientAccessUri_MicrosoftEntraId_DefaultClient_Test(WebPubSubClientProtocol clientType, string clientUriPrefix, string clientTypeString)
{
var serviceClient = new WebPubSubServiceSubClass(new Uri("https://localhost"), "hub", new DefaultAzureCredential());
Expand Down
Loading