Skip to content

Commit 557ce57

Browse files
DevAganiDevAgani
authored
Merge pull request #1019 from Backbase/chore/dynamic-switch-msdk
Swift 5 : Introduce `useMsdkSwift`
2 parents 18ca231 + f889db0 commit 557ce57

File tree

6 files changed

+57
-3
lines changed

6 files changed

+57
-3
lines changed

‎boat-scaffold/src/main/templates/boat-swift5/APIs.mustache‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,14 @@
55
//
66

77
import Foundation
8+
{{#useMsdkSwift}}
9+
import BackbaseSDK
10+
{{/useMsdkSwift}}
11+
{{^useMsdkSwift}}
812
import Backbase
913
import ClientCommonGen2
14+
{{/useMsdkSwift}}
15+
1016

1117
{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} class {{moduleName}}Client: NSObject, DBSClient {
1218
{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} var dataProvider: DBSDataProvider?
@@ -42,7 +48,12 @@ import ClientCommonGen2
4248
self.headers = headers
4349
4450
addHeaders({{moduleName}}Client.customHeaders)
51+
{{#useMsdkSwift}}
52+
addHeaders(Backbase.authClient()?.tokens() ?? [:])
53+
{{/useMsdkSwift}}
54+
{{^useMsdkSwift}}
4555
addHeaders(Backbase.authClient().tokens())
56+
{{/useMsdkSwift}}
4657
}
4758

4859
{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} func addHeaders(_ aHeaders:[String:String]) {

‎boat-scaffold/src/main/templates/boat-swift5/Podfile.mustache‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,12 @@ install! 'cocoapods', deterministic_uuids: false
1010
inhibit_all_warnings!
1111

1212
def normal_pods
13-
pod 'Backbase', '>= 9'{{#useRxSwift}}
13+
{{#useMsdkSwift}}
14+
pod 'BackbaseSDK'
15+
{{/useMsdkSwift}}
16+
{{^useMsdkSwift}}
17+
pod 'Backbase', '>= 9'
18+
{{/useMsdkSwift}}{{#useRxSwift}}
1419
pod 'RxSwift', '>= 5.0.0'{{/useRxSwift}}{{#useAlamofire}}
1520
pod 'Alamofire', '>= 4.9.1'{{/useAlamofire}}{{#usePromiseKit}}
1621
pod 'PromiseKit', '>= 6.12.0'{{/usePromiseKit}}

‎boat-scaffold/src/main/templates/boat-swift5/Podspec.mustache‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,13 @@ Pod::Spec.new do |s|
2121
s.vendored_frameworks = '{{projectName}}.xcframework'
2222

2323
# ――― Dependencies ――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
24+
{{#useMsdkSwift}}
25+
s.dependency 'BackbaseSDK'
26+
{{/useMsdkSwift}}
27+
{{^useMsdkSwift}}
2428
s.dependency 'Backbase', '>= 9.0'
2529
s.dependency 'ClientCommonGen2', '>= 1.0'
30+
{{/useMsdkSwift}}
2631
{{#usePromiseKit}}
2732
s.dependency 'PromiseKit/CorePromise', '>= 6.12.0'
2833
{{/usePromiseKit}}

‎boat-scaffold/src/main/templates/boat-swift5/api.mustache‎

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,14 @@
66
//
77

88
import Foundation
9+
{{#useMsdkSwift}}
10+
import BackbaseSDK
11+
{{/useMsdkSwift}}
12+
{{^useMsdkSwift}}
913
import Backbase
10-
import ClientCommonGen2{{#usePromiseKit}}
14+
import ClientCommonGen2
15+
{{/useMsdkSwift}}
16+
{{#usePromiseKit}}
1117
import PromiseKit{{/usePromiseKit}}{{#useRxSwift}}
1218
import RxSwift{{/useRxSwift}}{{#useCombine}}
1319
import Combine{{/useCombine}}
@@ -48,7 +54,12 @@ extension {{moduleName}}Client {
4854
{{#description}}
4955
/** {{description}} */{{/description}}
5056
{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} class {{classname}}: NSObject, DBSClient, {{classname}}Protocol {
57+
{{#useMsdkSwift}}
58+
public var dataProvider: BackbaseSDK.DBSDataProvider?
59+
{{/useMsdkSwift}}
60+
{{^useMsdkSwift}}
5161
public var dataProvider: DBSDataProvider?
62+
{{/useMsdkSwift}}
5263
public var baseURL: URL
5364

5465
public override init() {
@@ -189,7 +200,7 @@ extension {{moduleName}}Client {
189200
}
190201
}
191202
{{/useResult}}
192-
203+
193204
/**
194205
{{#summary}}
195206
{{{summary}}}
@@ -252,12 +263,24 @@ extension {{moduleName}}Client {
252263
]
253264
let headerParameters = APIHelper.rejectNilHeaders(nillableHeaders){{/-last}}{{/headerParams}}
254265
guard let url = urlComponents?.url else { throw CallError.invalidUrl }
266+
267+
{{#useMsdkSwift}}
268+
let request = try BackbaseSDK.RequestBuilder.createURLRequest(requestUrl: url,
269+
method: "{{httpMethod}}",
270+
queryParameters: {{#hasQueryParams}}queryParameters.compactMapValues({ $0 }){{/hasQueryParams}}{{^hasQueryParams}}nil{{/hasQueryParams}},
271+
bodyParameters: parameters,
272+
bodyType: {{#hasBodyParam}}{{^isMultipart}}.json{{/isMultipart}}{{/hasBodyParam}}{{^hasBodyParam}}{{#isMultipart}}.multipartForm{{/isMultipart}}{{/hasBodyParam}}{{^hasBodyParam}}{{^isMultipart}}.none{{/isMultipart}}{{/hasBodyParam}}{{#headerParams}}{{#-first}},
273+
headers: headerParameters{{/-first}}{{/headerParams}})
274+
{{/useMsdkSwift}}
275+
{{^useMsdkSwift}}
255276
let request = try ClientCommonGen2.RequestBuilder.createURLRequest(requestUrl: url,
256277
method: "{{httpMethod}}",
257278
queryParameters: {{#hasQueryParams}}queryParameters.compactMapValues({ $0 }){{/hasQueryParams}}{{^hasQueryParams}}nil{{/hasQueryParams}},
258279
bodyParameters: parameters,
259280
bodyType: {{#hasBodyParam}}{{^isMultipart}}.json{{/isMultipart}}{{/hasBodyParam}}{{^hasBodyParam}}{{#isMultipart}}.multipartForm{{/isMultipart}}{{/hasBodyParam}}{{^hasBodyParam}}{{^isMultipart}}.none{{/isMultipart}}{{/hasBodyParam}}{{#headerParams}}{{#-first}},
260281
headers: headerParameters{{/-first}}{{/headerParams}})
282+
{{/useMsdkSwift}}
283+
261284
return Call<{{#returnType}}{{#isResponseFile}}Data{{/isResponseFile}}{{^isResponseFile}}{{{returnType}}}{{/isResponseFile}}{{/returnType}}{{^returnType}}NoResponse{{/returnType}}>(dataProvider: dataProvider, request: request)
262285
}
263286
{{/operation}}

‎boat-scaffold/src/main/templates/boat-swift5/api_parameters.mustache‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,12 @@
88
// https://openapi-generator.tech
99

1010
import Foundation
11+
{{#useMsdkSwift}}
12+
import BackbaseSDK
13+
{{/useMsdkSwift}}
14+
{{^useMsdkSwift}}
1115
import ClientCommonGen2
16+
{{/useMsdkSwift}}
1217

1318
public extension {{classname}} {
1419
{{#operation}}

‎boat-scaffold/src/main/templates/boat-swift5/model.mustache‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,12 @@
66
//
77

88
import Foundation
9+
{{#useMsdkSwift}}
10+
import BackbaseSDK
11+
{{/useMsdkSwift}}
12+
{{^useMsdkSwift}}
913
import ClientCommonGen2
14+
{{/useMsdkSwift}}
1015

1116
{{#description}}
1217
/** {{description}} */{{/description}}

0 commit comments

Comments
 (0)