Skip to content

Commit 46f3b6f

Browse files
committed
fix(realtime): remove jwt check (#658)
* fix(realtime): remove jwt check Also: - Call `setAuth` after heartbeat - Send `x-client-info` when joining channel * fix tests * only send token if changed
1 parent 5a000f6 commit 46f3b6f

File tree

3 files changed

+34
-16
lines changed

3 files changed

+34
-16
lines changed

.swiftpm/xcode/xcshareddata/xcschemes/Realtime.xcscheme

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,29 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
shouldUseLaunchSchemeArgsEnv = "YES">
29+
shouldUseLaunchSchemeArgsEnv = "YES"
30+
codeCoverageEnabled = "YES"
31+
onlyGenerateCoverageForSpecifiedTargets = "YES">
32+
<CodeCoverageTargets>
33+
<BuildableReference
34+
BuildableIdentifier = "primary"
35+
BlueprintIdentifier = "Realtime"
36+
BuildableName = "Realtime"
37+
BlueprintName = "Realtime"
38+
ReferencedContainer = "container:">
39+
</BuildableReference>
40+
</CodeCoverageTargets>
3041
<Testables>
42+
<TestableReference
43+
skipped = "NO">
44+
<BuildableReference
45+
BuildableIdentifier = "primary"
46+
BlueprintIdentifier = "RealtimeTests"
47+
BuildableName = "RealtimeTests"
48+
BlueprintName = "RealtimeTests"
49+
ReferencedContainer = "container:">
50+
</BuildableReference>
51+
</TestableReference>
3152
</Testables>
3253
</TestAction>
3354
<LaunchAction

Sources/Realtime/RealtimeJoinConfig.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,12 @@ import Foundation
1010
struct RealtimeJoinPayload: Codable {
1111
var config: RealtimeJoinConfig
1212
var accessToken: String?
13+
var version: String?
1314

1415
enum CodingKeys: String, CodingKey {
1516
case config
1617
case accessToken = "access_token"
18+
case version
1719
}
1820
}
1921

Tests/RealtimeTests/RealtimeTests.swift

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ final class RealtimeTests: XCTestCase {
113113
XCTAssertEqual(channelStatuses.value, [.unsubscribed, .subscribing, .subscribed])
114114

115115
assertInlineSnapshot(of: client.sentEvents.map(\.json), as: .json) {
116-
"""
116+
#"""
117117
[
118118
{
119119
"text" : {
@@ -147,14 +147,15 @@ final class RealtimeTests: XCTestCase {
147147
"key" : ""
148148
},
149149
"private" : false
150-
}
150+
},
151+
"version" : "realtime-swift\/0.0.0"
151152
},
152153
"ref" : "1",
153154
"topic" : "realtime:public:messages"
154155
}
155156
}
156157
]
157-
"""
158+
"""#
158159
}
159160
}
160161

@@ -199,7 +200,7 @@ final class RealtimeTests: XCTestCase {
199200
$0.event == "phx_join"
200201
}
201202
assertInlineSnapshot(of: events, as: .json) {
202-
"""
203+
#"""
203204
[
204205
{
205206
"event" : "phx_join",
@@ -218,7 +219,8 @@ final class RealtimeTests: XCTestCase {
218219
"key" : ""
219220
},
220221
"private" : false
221-
}
222+
},
223+
"version" : "realtime-swift\/0.0.0"
222224
},
223225
"ref" : "1",
224226
"topic" : "realtime:public:messages"
@@ -240,13 +242,14 @@ final class RealtimeTests: XCTestCase {
240242
"key" : ""
241243
},
242244
"private" : false
243-
}
245+
},
246+
"version" : "realtime-swift\/0.0.0"
244247
},
245248
"ref" : "2",
246249
"topic" : "realtime:public:messages"
247250
}
248251
]
249-
"""
252+
"""#
250253
}
251254
}
252255

@@ -378,14 +381,6 @@ final class RealtimeTests: XCTestCase {
378381
XCTAssertEqual(sut.mutableState.accessToken, validToken)
379382
}
380383

381-
func testSetAuthWithExpiredToken() async throws {
382-
let expiredToken =
383-
"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyLCJleHAiOi02NDA5MjIxMTIwMH0.tnbZRC8vEyK3zaxPxfOjNgvpnuum18dxYlXeHJ4r7u8"
384-
await sut.setAuth(expiredToken)
385-
386-
XCTAssertNotEqual(sut.mutableState.accessToken, expiredToken)
387-
}
388-
389384
func testSetAuthWithNonJWT() async throws {
390385
let token = "sb-token"
391386
await sut.setAuth(token)

0 commit comments

Comments
 (0)