[Enhancement]Allow deeplinks from new domain (#785)

Author: ipavlidakis

DemoApp/Sources/Components/AppEnvironment.swift

@@ -41,6 +41,7 @@ extension AppEnvironment {
         case demo
         case legacy
         case prontoFrankfurtC2
+        case livestream
         case custom(baseURL: BaseURL, apiKey: String, token: String)
 
         var url: URL {
@@ -55,6 +56,8 @@ extension AppEnvironment {
                 URL(string: "https://getstream.io")!
             case .legacy:
                 URL(string: "https://stream-calls-dogfood.vercel.app")!
+            case .livestream:
+                URL(string: "https://livestream-react-demo.vercel.app")!
             case let .custom(baseURL, _, _):
                 baseURL.url
             }
@@ -72,6 +75,8 @@ extension AppEnvironment {
                 return "Staging"
             case .legacy:
                 return "Legacy"
+            case .livestream:
+                return "Livestream"
             case .demo:
                 return "Demo"
             case let .custom(_, apiKey, _):
@@ -94,6 +99,9 @@ extension AppEnvironment {
                     .appendingPathComponent("join")
                     .appendingPathComponent(callId)
                     .addQueryParameter("type", value: callType)
+            case .livestream:
+                return url
+                    .appending(.init(name: "id", value: callId))
             default:
                 return url
                     .appendingPathComponent("join")
@@ -107,7 +115,8 @@ extension AppEnvironment {
             .prontoStaging,
             .staging,
             .demo,
-            .legacy
+            .legacy,
+            .livestream
         ]
     }
 
@@ -258,6 +267,7 @@ extension AppEnvironment {
         case staging
         case demo
         case legacy
+        case livestream
 
         var deeplinkURL: URL {
             switch self {
@@ -269,6 +279,8 @@ extension AppEnvironment {
                 return BaseURL.demo.url
             case .legacy:
                 return BaseURL.legacy.url
+            case .livestream:
+                return BaseURL.livestream.url
             }
         }
 
@@ -282,18 +294,20 @@ extension AppEnvironment {
                 return "Demo"
             case .legacy:
                 return "Legacy"
+            case .livestream:
+                return "Livestream"
             }
         }
     }
 
     static var supportedDeeplinks: [SupportedDeeplink] = {
         switch configuration {
         case .debug:
-            return [.pronto, .demo, .staging, .legacy]
+            return [.pronto, .demo, .staging, .legacy, .livestream]
         case .test:
             return [.pronto, .demo, .staging, .legacy]
         case .release:
-            return [.demo]
+            return [.demo, .livestream]
         }
     }()
 }

DemoApp/Sources/Components/Authentication/AuthenticationProvider.swift

@@ -46,6 +46,8 @@ enum AuthenticationProvider {
                 return "demo"
             case .prontoFrankfurtC2:
                 return "pronto-fra-c2"
+            case .livestream:
+                return "demo"
             case .custom:
                 return ""
             }

DemoApp/Sources/Components/Deeplinks/DeeplinkAdapter.swift

@@ -37,51 +37,65 @@ struct DeeplinkAdapter {
         guard canHandle(url: url) else {
             return (.empty, nil)
         }
-        
-        let pathComponentsCount = url.pathComponents.endIndex
 
-        // Fetch the callId from the path components
-        // e.g https://getstream.io/join/path-call-id
-        let callPathId: String? = {
+        if
+            url.host == AppEnvironment.BaseURL.livestream.url.host,
+            let callId = url.queryParameters["id"] ?? url.queryParameters["view"] {
+            return (
+                DeeplinkInfo(
+                    url: url,
+                    callId: callId,
+                    callType: .livestream,
+                    baseURL: AppEnvironment.BaseURL.livestream
+                ),
+                nil
+            )
+        } else {
+            let pathComponentsCount = url.pathComponents.endIndex
+
+            // Fetch the callId from the path components
+            // e.g https://getstream.io/join/path-call-id
+            let callPathId: String? = {
+                guard
+                    pathComponentsCount >= 2,
+                    url.pathComponents[pathComponentsCount - 2] == "join",
+                    let callId = url.pathComponents.last
+                else {
+                    return nil
+                }
+                return callId
+            }()
+
+            // Fetch the callId from the query parameters
+            // e.g https://getstream.io/video/demos?id=parameter-call-id
+            let callParameterId = url.queryParameters["id"]
+
             guard
-                pathComponentsCount >= 2,
-                url.pathComponents[pathComponentsCount - 2] == "join",
-                let callId = url.pathComponents.last
+                // Use the the callPathId with higher priority if it's available.
+                let callId = callPathId ?? callParameterId
             else {
-                return nil
+                log.warning("Unable to handle deeplink because id was missing.")
+                return (.empty, nil)
             }
-            return callId
-        }()
-
-        // Fetch the callId from the query parameters
-        // e.g https://getstream.io/video/demos?id=parameter-call-id
-        let callParameterId = url.queryParameters["id"]
 
-        guard
-            // Use the the callPathId with higher priority if it's available.
-            let callId = callPathId ?? callParameterId
-        else {
-            log.warning("Unable to handle deeplink because id was missing.")
-            return (.empty, nil)
-        }
+            let callType = url.queryParameters["type"] ?? "default"
 
-        let callType = url.queryParameters["type"] ?? "default"
+            log.debug("Deeplink handled was: \(url)")
+            let host = url.host
+            let baseURL: AppEnvironment.BaseURL = AppEnvironment
+                .BaseURL
+                .allCases
+                .first { $0.url.host == host } ?? AppEnvironment.baseURL
 
-        log.debug("Deeplink handled was: \(url)")
-        let host = url.host
-        let baseURL: AppEnvironment.BaseURL = AppEnvironment
-            .BaseURL
-            .allCases
-            .first { $0.url.host == host } ?? AppEnvironment.baseURL
-
-        return (
-            DeeplinkInfo(
-                url: url,
-                callId: callId,
-                callType: callType,
-                baseURL: baseURL
-            ),
-            nil
-        )
+            return (
+                DeeplinkInfo(
+                    url: url,
+                    callId: callId,
+                    callType: callType,
+                    baseURL: baseURL
+                ),
+                nil
+            )
+        }
     }
 }

DemoApp/Sources/ViewModifiers/CallModifier/DemoCallModifier.swift

@@ -9,6 +9,8 @@ import SwiftUI
 
 struct DemoCallModifier<Factory: ViewFactory>: ViewModifier {
 
+    @Injected(\.appearance) private var appearance
+
     var viewFactory: Factory
     var viewModel: CallViewModel
     var chatViewModel: DemoChatViewModel
@@ -27,32 +29,16 @@ struct DemoCallModifier<Factory: ViewFactory>: ViewModifier {
 
     func body(content: Content) -> some View {
         contentView(content)
+            .modifier(ThermalStateViewModifier())
     }
 
     @MainActor
     @ViewBuilder
     private func contentView(_ rootView: Content) -> some View {
-        if
-            let call = viewModel.call,
-            call.callType == .livestream {
-            ZStack {
-                rootView
-                LivestreamPlayer(
-                    viewFactory: viewFactory,
-                    type: call.callType,
-                    id: call.callId,
-                    joinPolicy: .none,
-                    showsLeaveCallButton: true,
-                    onFullScreenStateChange: { [weak viewModel] in viewModel?.hideUIElements = $0 }
-                )
-            }
-        } else {
-            VideoViewOverlay(
-                rootView: rootView,
-                viewFactory: viewFactory,
-                viewModel: viewModel
-            )
-            .modifier(ThermalStateViewModifier())
-        }
+        DemoVideoViewOverlay(
+            rootView: rootView,
+            viewFactory: viewFactory,
+            viewModel: viewModel
+        )
     }
 }

DemoApp/Sources/Views/CallTopView/DemoCallTopView.swift

@@ -22,23 +22,27 @@ struct DemoCallTopView: View {
 
     var body: some View {
         HStack(spacing: 0) {
-            HStack {
-                if viewModel.callParticipants.count > 1, !hideLayoutMenu {
-                    LayoutMenuView(viewModel: viewModel)
-                        .accessibility(identifier: "viewMenu")
-                }
+            if !isCallLivestream {
+                HStack {
+                    if viewModel.callParticipants.count > 1, !hideLayoutMenu {
+                        LayoutMenuView(viewModel: viewModel)
+                            .accessibility(identifier: "viewMenu")
+                    }
 
-                ToggleCameraIconView(viewModel: viewModel)
+                    ToggleCameraIconView(viewModel: viewModel)
 
-                Spacer()
+                    Spacer()
+                }
+                .frame(maxWidth: .infinity)
             }
-            .frame(maxWidth: .infinity)
 
-            HStack(alignment: .center) {
-                CallDurationView(viewModel)
+            if !isCallLivestream {
+                HStack(alignment: .center) {
+                    CallDurationView(viewModel)
+                }
+                .frame(height: 44)
+                .frame(maxWidth: .infinity)
             }
-            .frame(height: 44)
-            .frame(maxWidth: .infinity)
 
             HStack {
                 Spacer()
@@ -61,6 +65,11 @@ struct DemoCallTopView: View {
         )
     }
 
+    private var isCallLivestream: Bool {
+        guard let call = viewModel.call else { return false }
+        return call.callType == .livestream
+    }
+
     private var hideLayoutMenu: Bool {
         viewModel.call?.state.screenSharingSession != nil
             && viewModel.call?.state.isCurrentUserScreensharing == false

DemoApp/Sources/Views/CallView/CallingView/DemoCallingViewModifier.swift

@@ -20,11 +20,10 @@ struct DemoCallingViewModifier: ViewModifier {
 
     private var isAnonymous: Bool { appState.currentUser == .anonymous }
 
-    private var callType: String {
+    @State private var callType: String =
         !AppState.shared.deeplinkInfo.callType.isEmpty
             ? AppState.shared.deeplinkInfo.callType
             : AppEnvironment.preferredCallType ?? .default
-    }
 
     init(
         text: Binding<String>,
@@ -49,14 +48,15 @@ struct DemoCallingViewModifier: ViewModifier {
                 // deeplink.
 
                 if deeplinkInfo.callId.isEmpty {
-                    joinCallIfNeeded(with: self.text.wrappedValue, callType: callType)
+                    joinCallIfNeeded(with: self.text.wrappedValue, callType: deeplinkInfo.callType)
                 } else {
                     self.text.wrappedValue = deeplinkInfo.callId
                     joinCallIfNeeded(
                         with: self.text.wrappedValue,
-                        callType: callType
+                        callType: deeplinkInfo.callType
                     )
                 }
+                callType = deeplinkInfo.callType
             }
             .onChange(of: viewModel.callingState) { callingState in
                 switch callingState {

DemoApp/Sources/Views/CallView/CallingView/SimpleCallingView.swift

@@ -156,8 +156,9 @@ struct SimpleCallingView: View {
             return
         }
 
-        if deeplinkInfo.baseURL == AppEnvironment
-            .baseURL || (deeplinkInfo.baseURL == .legacy && AppEnvironment.baseURL == .pronto) {
+        if
+            deeplinkInfo.baseURL == AppEnvironment.baseURL || (deeplinkInfo.baseURL == .legacy && AppEnvironment.baseURL == .pronto)
+        {
             if !Set(AppEnvironment.availableCallTypes).contains(deeplinkInfo.callType) {
                 AppEnvironment.availableCallTypes.append(deeplinkInfo.callType)
             }