Adding conditional calling of the idpCollector and registering during…

… CollectorFactory initialization
ForgeRock · Feb 6, 2025 · 6eda720 · 6eda720
1 parent 53f1afb
commit 6eda720
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/Davinci/Davinci/Davinci.swift b/Davinci/Davinci/Davinci.swift
@@ -32,6 +32,8 @@ extension DaVinci {
             cookieConfig.persist = [Request.Constants.stCookie, Request.Constants.stNoSsCookie]
         }
 
+        CollectorFactory.shared.registerDefaultCollectors()
+
         // Apply custom configuration
         block(config)
 

diff --git a/Davinci/Davinci/collector/CollectorFactory.swift b/Davinci/Davinci/collector/CollectorFactory.swift
@@ -8,7 +8,7 @@
 //  of the MIT license. See the LICENSE file for details.
 //
 
-
+import Foundation
 import PingOrchestrate
 
 /// The CollectorFactory singleton is responsible for creating and managing Collector instances.
@@ -21,7 +21,10 @@ public final class CollectorFactory {
     /// The shared instance of the CollectorFactory.
     public static let shared = CollectorFactory()
 
-    init() {
+    init() { }
+
+    /// Registers the default DaVinci Collectors.
+    public func registerDefaultCollectors() {
         register(type: Constants.TEXT, collector: TextCollector.self)//
         register(type: Constants.PASSWORD, collector: PasswordCollector.self)
         register(type: Constants.PASSWORD_VERIFY, collector: PasswordCollector.self)
@@ -33,6 +36,9 @@ public final class CollectorFactory {
         register(type: Constants.RADIO, collector: SingleSelectCollector.self)
         register(type: Constants.COMBOBOX, collector: MultiSelectCollector.self)
         register(type: Constants.CHECKBOX, collector: MultiSelectCollector.self)
+        if let c: NSObject.Type = NSClassFromString("Extrernal_idp.IdpCollector") as? NSObject.Type {
+            c.perform(Selector(("registerCollector")))
+        }
     }
 
     /// Registers a new type of Collector.

diff --git a/Extrernal-idp/Extrernal-idp/IdpCollector.swift b/Extrernal-idp/Extrernal-idp/IdpCollector.swift
@@ -12,7 +12,8 @@ import Foundation
 import PingOrchestrate
 import PingDavinci
 
-public class IdpCollector: Collector, ContinueNodeAware, RequestInterceptor {
+@objc
+public class IdpCollector: NSObject, Collector, ContinueNodeAware, RequestInterceptor {
 
     public var continueNode: PingOrchestrate.ContinueNode?
 
@@ -60,6 +61,11 @@ public class IdpCollector: Collector, ContinueNodeAware, RequestInterceptor {
         }
     }
 
+    @objc
+    public static func registerCollector() {
+        CollectorFactory.shared.register(type: Constants.SOCIAL_LOGIN_BUTTON, collector: IdpCollector.self)
+    }
+
     public func authorize() async -> Result<Bool, IdpExceptions> {
         do {
 

diff --git a/SampleApps/PingExample/PingExample/DavinciViewModel.swift b/SampleApps/PingExample/PingExample/DavinciViewModel.swift
@@ -31,9 +31,6 @@ public let davinci = DaVinci.createDaVinci { config in
         oidcValue.redirectUri = currentConfig?.redirectUri ?? ""
         oidcValue.discoveryEndpoint = currentConfig?.discoveryEndpoint ?? ""
     }
-#if canImport(Extrernal_idp)
-    CollectorFactory.shared.register(type: Constants.SOCIAL_LOGIN_BUTTON, collector: IdpCollector.self)
-#endif
 }
 
 // A view model that manages the flow and state of the DaVinci orchestration process.