support get flows and screens by Version

underthestars-zhy · Apr 30, 2023 · a9cbec7 · a9cbec7
1 parent d946341
commit a9cbec7
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 9 deletions.
diff --git a/Sources/MobbinAPI/IOS/GetiOSDetails.swift b/Sources/MobbinAPI/IOS/GetiOSDetails.swift
@@ -9,7 +9,7 @@ import Foundation
 import SwiftyJSON
 
 extension MobbinAPI {
-    public func getiOSScreens(of app: App) async throws -> [Screen] {
+    public func getiOSScreens(by version: Version) async throws -> [Screen] {
         guard let token else { throw MobbinError.cannotFindToken }
 
         guard var URL = URL(string: "https://ujasntkfphywizsdaapi.supabase.co/rest/v1/rpc/get_app_screens_filter") else { throw HTTPError.wrongUrlFormat }
@@ -45,7 +45,7 @@ extension MobbinAPI {
         // JSON Body
 
         let bodyObject: [String : Any] = [
-            "filterAppVersionId": app.appVersionId,
+            "filterAppVersionId": version.id,
             "filterOperator": "and",
             "filterScreenElements": NSNull(),
             "filterScreenPatterns": NSNull(),
@@ -83,7 +83,11 @@ extension MobbinAPI {
         } ?? []
     }
 
-    public func getiOSFlows(of app: App) async throws -> [Flow] {
+    public func getiOSScreens(of app: App) async throws -> [Screen] {
+         try await getiOSScreens(by: Version(id: app.appVersionId, createdAt: app.appVersionCreatedAt, publishedAt: app.appVersionPublishedAt))
+    }
+
+    public func getiOSFlows(by version: Version) async throws -> [Flow] {
         guard let token else { throw MobbinError.cannotFindToken }
 
         guard var URL = URL(string: "https://ujasntkfphywizsdaapi.supabase.co/rest/v1/rpc/get_app_sections_filter") else { throw HTTPError.wrongUrlFormat }
@@ -120,7 +124,7 @@ extension MobbinAPI {
         // JSON Body
 
         let bodyObject: [String : Any] = [
-            "filterAppVersionId": app.appVersionId,
+            "filterAppVersionId": version.id,
             "filterOperator": "and",
             "filterFlowTitles": NSNull(),
             "filterScreenPatterns": NSNull(),
@@ -169,4 +173,8 @@ extension MobbinAPI {
             return Flow(id: id, name: name, actions: actions, parentAppSectionId: parentAppSectionId, order: order, updatedAt: updatedAt, appVersionId: appVersionId, screens: screens)
         } ?? []
     }
+
+    public func getiOSFlows(of app: App) async throws -> [Flow] {
+        try await getiOSFlows(by: Version(id: app.appVersionId, createdAt: app.appVersionCreatedAt, publishedAt: app.appVersionPublishedAt))
+    }
 }
diff --git a/Sources/MobbinAPI/Mobbin/AppVersion.swift b/Sources/MobbinAPI/Mobbin/AppVersion.swift
@@ -8,7 +8,7 @@
 import Foundation
 
 extension MobbinAPI {
-    func versions(of app: App, mobbinToken: String? = nil) async throws -> [Version] {
+    public func versions(of app: App, mobbinToken: String? = nil) async throws -> [Version] {
         let json = try await mobbinAppInfo(of: app, mobbinToken: mobbinToken)
 
         return try json["pageProps"]["app"]["appVersions"].array?.map({ json in

diff --git a/Sources/MobbinAPI/Mobbin/DownloadURL.swift b/Sources/MobbinAPI/Mobbin/DownloadURL.swift
@@ -9,7 +9,7 @@ import Foundation
 import SwiftyJSON
 
 extension MobbinAPI {
-    func downloadURL(of app: App, mobbinToken: String? = nil) async throws -> URL {
+    public func downloadURL(of app: App, mobbinToken: String? = nil) async throws -> URL {
         let json = try await mobbinAppInfo(of: app, mobbinToken: mobbinToken)
 
         guard let url = json["pageProps"]["app"]["appStoreUrl"].url else { throw MobbinError.wrongURL(json["pageProps"]["app"]["appStoreUrl"].stringValue) }

diff --git a/Sources/MobbinAPI/Mobbin/MobbinAppInfo.swift b/Sources/MobbinAPI/Mobbin/MobbinAppInfo.swift
@@ -17,7 +17,7 @@ extension MobbinAPI {
         } else {
             token = try await getMobbinQueryToken()
         }
-        
+
         guard var URL = URL(string: "https://mobbin.com/_next/data/\(token)/apps/\(app.appName.lowercased().replacing(" ", with: "-"))-\(app.platform)-\(app.id)/_/screens.json") else {
             throw HTTPError.wrongUrlFormat }
         let URLParams = [

diff --git a/Sources/MobbinAPI/Mobbin/MobbinQueryToken.swift b/Sources/MobbinAPI/Mobbin/MobbinQueryToken.swift
@@ -8,7 +8,7 @@
 import Foundation
 
 extension MobbinAPI {
-    func getMobbinQueryToken() async throws -> String {
+    public func getMobbinQueryToken() async throws -> String {
         guard let URL = URL(string: "https://mobbin.com/") else { throw MobbinError.cannotFindToken }
         var request = URLRequest(url: URL)
         request.httpMethod = "GET"

diff --git a/Sources/MobbinAPI/Model/Version.swift b/Sources/MobbinAPI/Model/Version.swift
@@ -7,7 +7,7 @@
 
 import Foundation
 
-struct Version {
+public struct Version {
     let id: String
     let createdAt: Date
     let publishedAt: Date

diff --git a/Tests/MobbinAPITests/MobbinAPITests.swift b/Tests/MobbinAPITests/MobbinAPITests.swift
@@ -79,6 +79,18 @@ final class MobbinAPITests: XCTestCase {
         XCTAssertEqual(flows.count, 30)
     }
 
+    func testGetiOSScreensByVersion() async throws {
+        let api = MobbinAPI(email: "[email protected]", token: Token(accessToken: "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJhdWQiOiJhdXRoZW50aWNhdGVkIiwiZXhwIjoxNjgyOTU1Nzk5LCJzdWIiOiJkMmI0MTU5MC01M2E0LTRjNGQtOWQ5NC0wNmY1ZDcxODA3YzMiLCJlbWFpbCI6InpodWhhb3l1MDkwOUBpY2xvdWQuY29tIiwicGhvbmUiOiIiLCJhcHBfbWV0YWRhdGEiOnsicHJvdmlkZXIiOiJlbWFpbCIsInByb3ZpZGVycyI6WyJlbWFpbCJdfSwidXNlcl9tZXRhZGF0YSI6eyJhdmF0YXJfdXJsIjoiaHR0cHM6Ly91amFzbnRrZnBoeXdpenNkYWFwaS5zdXBhYmFzZS5jby9zdG9yYWdlL3YxL29iamVjdC9wdWJsaWMvdXNlci91c2VyX2F2YXRhcnMvYTcyZTgwNjQtZjdlYi00YjBhLTg0MWMtMzlhM2ExMGRmY2E0LmpwZWciLCJmdWxsX25hbWUiOiJVVFN6aHkifSwicm9sZSI6ImF1dGhlbnRpY2F0ZWQiLCJhYWwiOiJhYWwxIiwiYW1yIjpbeyJtZXRob2QiOiJvdHAiLCJ0aW1lc3RhbXAiOjE2ODI4NjkzOTl9XSwic2Vzc2lvbl9pZCI6Ijc3MmM5YmQxLTY2NWEtNGVmMS1hNjkxLWZkYWNhNDQyMGI5NCJ9.ffaXhHJtn45KUHSs3uI8LaRik1MSVUdIIjRsZAyVil0", refreshToken: ""))
+
+        let apps = try await api.queryNextPage(nil)
+
+        let version = try await api.versions(of: apps[1])[1]
+
+        let flows = try await api.getiOSFlows(by: version)
+
+        XCTAssertEqual(flows.count, 39)
+    }
+
     func testQueryCollections() async throws {
         let api = MobbinAPI(email: "[email protected]", token: Token(accessToken: "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJhdWQiOiJhdXRoZW50aWNhdGVkIiwiZXhwIjoxNjgyNzc3MTQ0LCJzdWIiOiJkMmI0MTU5MC01M2E0LTRjNGQtOWQ5NC0wNmY1ZDcxODA3YzMiLCJlbWFpbCI6InpodWhhb3l1MDkwOUBpY2xvdWQuY29tIiwicGhvbmUiOiIiLCJhcHBfbWV0YWRhdGEiOnsicHJvdmlkZXIiOiJlbWFpbCIsInByb3ZpZGVycyI6WyJlbWFpbCJdfSwidXNlcl9tZXRhZGF0YSI6eyJhdmF0YXJfdXJsIjoiaHR0cHM6Ly91amFzbnRrZnBoeXdpenNkYWFwaS5zdXBhYmFzZS5jby9zdG9yYWdlL3YxL29iamVjdC9wdWJsaWMvdXNlci91c2VyX2F2YXRhcnMvYTcyZTgwNjQtZjdlYi00YjBhLTg0MWMtMzlhM2ExMGRmY2E0LmpwZWciLCJmdWxsX25hbWUiOiJVVFN6aHkifSwicm9sZSI6ImF1dGhlbnRpY2F0ZWQiLCJhYWwiOiJhYWwxIiwiYW1yIjpbeyJtZXRob2QiOiJvdHAiLCJ0aW1lc3RhbXAiOjE2ODI1MjE1OTR9XSwic2Vzc2lvbl9pZCI6ImNjMzI3ZDMzLWVkODAtNDM1Mi05NTRlLTI5OWZiNzQ1YmM5ZiJ9.s4eXeIaY9OBKT_-TxAPeWtnivxdRO1yM9K7gT68jAac", refreshToken: ""))