Skip to content

Commit f6a455d

Browse files
refactor(types): remove optional types from queue handling
- Make queueUrl, targetUrl and queueToken non-optional in TryPassResult - Update QueueITEngine and WaitingRoomProvider to handle non-optional values - Remove unnecessary optional handling in showQueue method - Simplify getUserId call by removing async keyword
1 parent effff76 commit f6a455d

File tree

3 files changed

+8
-9
lines changed

3 files changed

+8
-9
lines changed

Sources/QueueITLib/QueueITEngine.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,7 @@ extension QueueItEngine: WaitingRoomProviderDelegate {
137137
let queueDisabledInfo = QueueDisabledInfo(queueitToken: queuePassResult.queueToken)
138138
queueDisabledDelegate?.notifyQueueDisabled(queueDisabledInfo: queueDisabledInfo)
139139
default:
140-
// TODO: fix optional parameter
141-
showQueue(queueUrl: queuePassResult.queueUrl ?? "", targetUrl: queuePassResult.targetUrl ?? "")
140+
showQueue(queueUrl: queuePassResult.queueUrl, targetUrl: queuePassResult.targetUrl)
142141
}
143142
}
144143

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import Foundation
22

33
public struct TryPassResult {
4-
public let queueUrl: String?
5-
public let targetUrl: String?
4+
public let queueUrl: String
5+
public let targetUrl: String
66
public let redirectType: String
77
public let isPassedThrough: Bool
8-
public let queueToken: String?
8+
public let queueToken: String
99
}

Sources/QueueITLib/WaitingRoomProvider.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ private extension WaitingRoomProvider {
9898
}
9999

100100
func tryEnqueueWithUserAgent(secretAgent: String, enqueueToken: String?, enqueueKey: String?) async throws {
101-
let userId = await Utils.getUserId()
101+
let userId = Utils.getUserId()
102102
let userAgent = "\(secretAgent);\(Utils.getLibraryVersion())"
103103
let sdkVersion = Utils.getSdkVersion()
104104
apiClient = ApiClient()
@@ -138,10 +138,10 @@ private extension WaitingRoomProvider {
138138

139139
func handleAppEnqueueResponse(
140140
queueURL: String,
141-
eventTargetURL: String?,
142-
queueItToken: String?
141+
eventTargetURL: String,
142+
queueItToken: String
143143
) async {
144-
let isPassedThrough = !(queueItToken?.isEmpty ?? true)
144+
let isPassedThrough = !queueItToken.isEmpty
145145
let redirectType = getRedirectType(fromToken: queueItToken)
146146

147147
let tryPassResult = TryPassResult(

0 commit comments

Comments
 (0)