Skip to content

Commit

Permalink
Fix/here_now (#193)
Browse files Browse the repository at this point in the history
* fix: hereNow with channelGroups only, url

* Update CODEOWNERS

* Update CODEOWNERS

* argument validation for hereNow

* PubNub SDK v6.19.0.1 release.

* revert b7e1e6b

* PubNub SDK v6.19.1.0 release.

---------

Co-authored-by: Serhii Mamontov <[email protected]>
Co-authored-by: PubNub Release Bot <[email protected]>
  • Loading branch information
3 people authored Oct 24, 2023
1 parent 3f516b0 commit afa3f16
Show file tree
Hide file tree
Showing 8 changed files with 31 additions and 31 deletions.
19 changes: 12 additions & 7 deletions .pubnub.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
name: c-sharp
version: "6.19.0"
version: "6.19.1"
schema: 1
scm: github.com/pubnub/c-sharp
changelog:
- date: 2023-10-24
version: v6.19.1
changes:
- type: bug
text: "Fixes issue of getting error when hereNow is called with channelGroups param only."
- date: 2023-10-16
version: v6.19.0
changes:
Expand Down Expand Up @@ -741,7 +746,7 @@ features:
- QUERY-PARAM
supported-platforms:
-
version: Pubnub 'C#' 6.19.0
version: Pubnub 'C#' 6.19.1
platforms:
- Windows 10 and up
- Windows Server 2008 and up
Expand All @@ -751,7 +756,7 @@ supported-platforms:
- .Net Framework 4.5
- .Net Framework 4.6.1+
-
version: PubnubPCL 'C#' 6.19.0
version: PubnubPCL 'C#' 6.19.1
platforms:
- Xamarin.Android
- Xamarin.iOS
Expand All @@ -771,7 +776,7 @@ supported-platforms:
- .Net Core
- .Net 6.0
-
version: PubnubUWP 'C#' 6.19.0
version: PubnubUWP 'C#' 6.19.1
platforms:
- Windows Phone 10
- Universal Windows Apps
Expand All @@ -795,7 +800,7 @@ sdks:
distribution-type: source
distribution-repository: GitHub
package-name: Pubnub
location: https://github.com/pubnub/c-sharp/releases/tag/v6.19.0.0
location: https://github.com/pubnub/c-sharp/releases/tag/v6.19.1.0
requires:
-
name: ".Net"
Expand Down Expand Up @@ -1078,7 +1083,7 @@ sdks:
distribution-type: source
distribution-repository: GitHub
package-name: PubNubPCL
location: https://github.com/pubnub/c-sharp/releases/tag/v6.19.0.0
location: https://github.com/pubnub/c-sharp/releases/tag/v6.19.1.0
requires:
-
name: ".Net Core"
Expand Down Expand Up @@ -1437,7 +1442,7 @@ sdks:
distribution-type: source
distribution-repository: GitHub
package-name: PubnubUWP
location: https://github.com/pubnub/c-sharp/releases/tag/v6.19.0.0
location: https://github.com/pubnub/c-sharp/releases/tag/v6.19.1.0
requires:
-
name: "Universal Windows Platform Development"
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
v6.19.1 - October 24 2023
-----------------------------
- Fixed: fixes issue of getting error when hereNow is called with channelGroups param only.

v6.19.0 - October 16 2023
-----------------------------
- Added: add crypto module that allows configure SDK to encrypt and decrypt messages.
Expand Down
12 changes: 6 additions & 6 deletions src/Api/PubnubApi/Builder/UrlRequestBuilder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -278,18 +278,18 @@ Uri IUrlRequestBuilder.BuildSignalRequest(string requestMethod, string requestBo
Uri IUrlRequestBuilder.BuildHereNowRequest(string requestMethod, string requestBody, string[] channels, string[] channelGroups, bool showUUIDList, bool includeUserState, Dictionary<string, object> externalQueryParam)
{
PNOperationType currentType = PNOperationType.PNHereNowOperation;
string channel = (channels != null && channels.Length > 0) ? string.Join(",", channels.OrderBy(x => x).ToArray()) : "";
if ((channels == null || channels.Length == 0) && (channelGroups == null || channelGroups.Length == 0)) {
throw new ArgumentException("Please provide Channels or ChannelGroups.");
}
string channel = (channels != null && channels.Length > 0) ? string.Join(",", channels.OrderBy(x => x).ToArray()) : ",";

List<string> url = new List<string>();
url.Add("v2");
url.Add("presence");
url.Add("sub_key");
url.Add(pubnubConfig.ContainsKey(pubnubInstanceId) ? pubnubConfig[pubnubInstanceId].SubscribeKey : "");
if (!string.IsNullOrEmpty(channel))
{
url.Add("channel");
url.Add(channel);
}
url.Add("channel");
url.Add(channel);

int disableUUID = showUUIDList ? 0 : 1;
int userState = includeUserState ? 1 : 0;
Expand Down
4 changes: 2 additions & 2 deletions src/Api/PubnubApi/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
[assembly: AssemblyProduct("Pubnub C# SDK")]
[assembly: AssemblyCopyright("Copyright © 2021")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyVersion("6.19.0.0")]
[assembly: AssemblyFileVersion("6.19.0.0")]
[assembly: AssemblyVersion("6.19.1.0")]
[assembly: AssemblyFileVersion("6.19.1.0")]
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
Expand Down
7 changes: 2 additions & 5 deletions src/Api/PubnubApi/PubnubApi.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,15 @@

<PropertyGroup>
<PackageId>Pubnub</PackageId>
<PackageVersion>6.19.0.0</PackageVersion>
<PackageVersion>6.19.1.0</PackageVersion>
<Title>PubNub C# .NET - Web Data Push API</Title>
<Authors>Pandu Masabathula</Authors>
<Owners>PubNub</Owners>
<PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
<PackageIconUrl>http://pubnub.s3.amazonaws.com/2011/powered-by-pubnub/pubnub-icon-600x600.png</PackageIconUrl>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<RepositoryUrl>https://github.com/pubnub/c-sharp/</RepositoryUrl>
<PackageReleaseNotes>Add crypto module that allows configure SDK to encrypt and decrypt messages.
Improved security of crypto implementation by adding enhanced AES-CBC cryptor.
Fixes Newtonsoft Json vulnerability with MaxDepth and upgrade to version for non-PCL.
Add SubscribeKey validation for subscribe feature.</PackageReleaseNotes>
<PackageReleaseNotes>Fixes issue of getting error when hereNow is called with channelGroups param only.</PackageReleaseNotes>
<PackageTags>Web Data Push Real-time Notifications ESB Message Broadcasting Distributed Computing</PackageTags>
<!--<Summary>PubNub is a Massively Scalable Web Push Service for Web and Mobile Games. This is a cloud-based service for broadcasting messages to thousands of web and mobile clients simultaneously</Summary>-->
<Description>PubNub is a Massively Scalable Web Push Service for Web and Mobile Games. This is a cloud-based service for broadcasting messages to thousands of web and mobile clients simultaneously</Description>
Expand Down
7 changes: 2 additions & 5 deletions src/Api/PubnubApiPCL/PubnubApiPCL.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,15 @@

<PropertyGroup>
<PackageId>PubnubPCL</PackageId>
<PackageVersion>6.19.0.0</PackageVersion>
<PackageVersion>6.19.1.0</PackageVersion>
<Title>PubNub C# .NET - Web Data Push API</Title>
<Authors>Pandu Masabathula</Authors>
<Owners>PubNub</Owners>
<PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
<PackageIconUrl>http://pubnub.s3.amazonaws.com/2011/powered-by-pubnub/pubnub-icon-600x600.png</PackageIconUrl>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<RepositoryUrl>https://github.com/pubnub/c-sharp/</RepositoryUrl>
<PackageReleaseNotes>Add crypto module that allows configure SDK to encrypt and decrypt messages.
Improved security of crypto implementation by adding enhanced AES-CBC cryptor.
Fixes Newtonsoft Json vulnerability with MaxDepth and upgrade to version for non-PCL.
Add SubscribeKey validation for subscribe feature.</PackageReleaseNotes>
<PackageReleaseNotes>Fixes issue of getting error when hereNow is called with channelGroups param only.</PackageReleaseNotes>
<PackageTags>Web Data Push Real-time Notifications ESB Message Broadcasting Distributed Computing</PackageTags>
<!--<Summary>PubNub is a Massively Scalable Web Push Service for Web and Mobile Games. This is a cloud-based service for broadcasting messages to thousands of web and mobile clients simultaneously</Summary>-->
<Description>PubNub is a Massively Scalable Web Push Service for Web and Mobile Games. This is a cloud-based service for broadcasting messages to thousands of web and mobile clients simultaneously</Description>
Expand Down
7 changes: 2 additions & 5 deletions src/Api/PubnubApiUWP/PubnubApiUWP.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,15 @@

<PropertyGroup>
<PackageId>PubnubUWP</PackageId>
<PackageVersion>6.19.0.0</PackageVersion>
<PackageVersion>6.19.1.0</PackageVersion>
<Title>PubNub C# .NET - Web Data Push API</Title>
<Authors>Pandu Masabathula</Authors>
<Owners>PubNub</Owners>
<PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
<PackageIconUrl>http://pubnub.s3.amazonaws.com/2011/powered-by-pubnub/pubnub-icon-600x600.png</PackageIconUrl>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<RepositoryUrl>https://github.com/pubnub/c-sharp/</RepositoryUrl>
<PackageReleaseNotes>Add crypto module that allows configure SDK to encrypt and decrypt messages.
Improved security of crypto implementation by adding enhanced AES-CBC cryptor.
Fixes Newtonsoft Json vulnerability with MaxDepth and upgrade to version for non-PCL.
Add SubscribeKey validation for subscribe feature.</PackageReleaseNotes>
<PackageReleaseNotes>Fixes issue of getting error when hereNow is called with channelGroups param only.</PackageReleaseNotes>
<PackageTags>Web Data Push Real-time Notifications ESB Message Broadcasting Distributed Computing</PackageTags>
<!--<Summary>PubNub is a Massively Scalable Web Push Service for Web and Mobile Games. This is a cloud-based service for broadcasting messages to thousands of web and mobile clients simultaneously</Summary>-->
<Description>PubNub is a Massively Scalable Web Push Service for Web and Mobile Games. This is a cloud-based service for broadcasting messages to thousands of web and mobile clients simultaneously</Description>
Expand Down
2 changes: 1 addition & 1 deletion src/Api/PubnubApiUnity/PubnubApiUnity.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

<PropertyGroup>
<PackageId>PubnubApiUnity</PackageId>
<PackageVersion>6.19.0.0</PackageVersion>
<PackageVersion>6.19.1.0</PackageVersion>
<Title>PubNub C# .NET - Web Data Push API</Title>
<Authors>Pandu Masabathula</Authors>
<Owners>PubNub</Owners>
Expand Down

0 comments on commit afa3f16

Please sign in to comment.