fix(pamv3): fix token in subscription session (#94)

fix(pamv3): fix token in subscription session Fix issue because of which access token not updated in subscription session.
pubnub · Jan 19, 2022 · dbbbd10 · dbbbd10
1 parent 5e6ae3c
commit dbbbd10
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 7 deletions.
diff --git a/.pubnub.yml b/.pubnub.yml
@@ -1,9 +1,14 @@
 ---
 name: swift
 scm: github.com/pubnub/swift
-version: "5.0.0"
+version: "5.0.1"
 schema: 1
 changelog:
+  - date: 2022-01-19
+    version: 5.0.1
+    changes:
+      - type: bug
+        text: "Fix issue because of which access token not updated in subscription session."
   - date: 2022-01-12
     version: 5.0.0
     changes:
@@ -434,7 +439,7 @@ sdks:
           - distribution-type: source
             distribution-repository: GitHub release
             package-name: PubNub
-            location: https://github.com/pubnub/swift/archive/refs/tags/5.0.0.zip
+            location: https://github.com/pubnub/swift/archive/refs/tags/5.0.1.zip
             supported-platforms:
               supported-operating-systems:
                 macOS:

diff --git a/Examples/Example-iOS/Info.plist b/Examples/Example-iOS/Info.plist
@@ -6,6 +6,8 @@
 	<string>demo</string>
 	<key>PubNubSubscribeKey</key>
 	<string>demo</string>
+	<key>PubNubUuid</key>
+	<string>demo-user</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleExecutable</key>

diff --git a/PubNub.xcodeproj/project.pbxproj b/PubNub.xcodeproj/project.pbxproj
@@ -2506,7 +2506,7 @@
 					"$(inherited)",
 					"$(TOOLCHAIN_DIR)/usr/lib/swift/macosx",
 				);
-				MARKETING_VERSION = 5.0.0;
+				MARKETING_VERSION = 5.0.1;
 				OTHER_CFLAGS = "$(inherited)";
 				OTHER_LDFLAGS = "$(inherited)";
 				OTHER_SWIFT_FLAGS = "$(inherited)";
@@ -2539,7 +2539,7 @@
 					"$(inherited)",
 					"$(TOOLCHAIN_DIR)/usr/lib/swift/macosx",
 				);
-				MARKETING_VERSION = 5.0.0;
+				MARKETING_VERSION = 5.0.1;
 				OTHER_CFLAGS = "$(inherited)";
 				OTHER_LDFLAGS = "$(inherited)";
 				OTHER_SWIFT_FLAGS = "$(inherited)";

diff --git a/PubNubSwift.podspec b/PubNubSwift.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name     = 'PubNubSwift'
-  s.version  = '5.0.0'
+  s.version  = '5.0.1'
   s.homepage = 'https://github.com/pubnub/swift'
   s.documentation_url = 'https://www.pubnub.com/docs/swift-native/pubnub-swift-sdk'
   s.authors = { 'PubNub, Inc.' => '[email protected]' }

diff --git a/Sources/PubNub/Helpers/Constants.swift b/Sources/PubNub/Helpers/Constants.swift
@@ -62,7 +62,7 @@ public struct Constant {
   }()
 
   static let pubnubSwiftSDKVersion: String = {
-    "5.0.0"
+    "5.0.1"
   }()
 
   static let appBundleId: String = {

diff --git a/Sources/PubNub/PubNub.swift b/Sources/PubNub/PubNub.swift
@@ -2041,6 +2041,7 @@ extension PubNub {
   /// - Parameter token: The token to add to the Token Management System.
   public mutating func set(token: String) {
     configuration.authToken = token
+    subscription.configuration.authToken = token
   }
 }
 

diff --git a/Sources/PubNub/Subscription/SubscribeSessionFactory.swift b/Sources/PubNub/Subscription/SubscribeSessionFactory.swift
@@ -113,6 +113,8 @@ public protocol SubscriptionConfiguration: RouterConfiguration {
   var requestMessageCountThreshold: UInt { get }
   /// PSV2 feature to subscribe with a custom filter expression.
   var filterExpression: String? { get }
+  /// If Access Manager (PAM) is enabled, client will use  `authToken` instead of `authKey` on all requests
+  override var authToken: String? { get set }
 }
 
 extension SubscriptionConfiguration {

diff --git a/Sources/PubNub/Subscription/SubscriptionSession.swift b/Sources/PubNub/Subscription/SubscriptionSession.swift
@@ -33,7 +33,7 @@ public class SubscriptionSession {
 
   public let uuid = UUID()
   let longPollingSession: SessionReplaceable
-  let configuration: SubscriptionConfiguration
+  internal(set) var configuration: SubscriptionConfiguration
   let sessionStream: SessionListener
 
   /// PSV2 feature to subscribe with a custom filter expression.

diff --git a/Tests/PubNubTests/Helpers/PAMTokenTests.swift b/Tests/PubNubTests/Helpers/PAMTokenTests.swift
@@ -69,6 +69,16 @@ extension PAMTokenTests {
     pubnub.set(token: "access-token")
 
     XCTAssertEqual(pubnub.configuration.authToken, "access-token")
+    XCTAssertEqual(pubnub.subscription.configuration.authToken, "access-token")
+  }
+
+  func testChangeToken() {
+    var pubnub = PubNub(configuration: config)
+    pubnub.set(token: "access-token")
+    pubnub.set(token: "access-token-updated")
+
+    XCTAssertEqual(pubnub.configuration.authToken, "access-token-updated")
+    XCTAssertEqual(pubnub.subscription.configuration.authToken, "access-token-updated")
   }
 
   // swiftlint:enable line_length
-Original file line number
+Diff line change
@@ Expand Up / @@ -62,7 +62,7 @@ public struct Constant { @@
       }()
       static let pubnubSwiftSDKVersion: String = {
-        "5.0.0"
+        "5.0.1"
       }()
       static let appBundleId: String = {
@@ Expand Down @@