Skip to content

Commit 07eeaea

Browse files
kfa-onewelcomekfa-onewelcome
authored
Merge pull request #79 from onewelcome/EXAMPLEIOS-94
[EXAMPLEIOS-94] Release 6.2.2 with a fix for stateless with browser idp
2 parents b11d8a2 + b7e3bb4 commit 07eeaea

File tree

7 files changed

+46
-11
lines changed

7 files changed

+46
-11
lines changed

‎Configuration/Production/OneginiConfigModel.m‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
@implementation OneginiConfigModel
44

5-
// Config model generated by SDK Configurator version: v5.2.0
5+
// Config model generated by SDK Configurator version: v5.3.0
66

77
+ (NSArray *)certificates
88
{
@@ -16,7 +16,7 @@ + (NSDictionary *)configuration
1616
@"ONGServerVersion" : @"1.33.0",
1717
@"ONGAppIdentifier" : @"ExampleApp",
1818
@"ONGAppPlatform" : @"ios",
19-
@"ONGAppVersion" : @"6.2.1",
19+
@"ONGAppVersion" : @"6.2.2",
2020
@"ONGAppBaseURL" : @"https://mobile-security-proxy.onegini.com",
2121
@"ONGResourceBaseURL" : @"https://mobile-security-proxy.onegini.com/resources/",
2222
@"ONGRedirectURL" : @"oneginiexample://loginsuccess",
@@ -25,7 +25,7 @@ + (NSDictionary *)configuration
2525

2626
+ (NSString *)serverPublicKey
2727
{
28-
return @"CCD2EEDE4EF9B3794DC9C673B4613530BB44E814623C6EE7F895A3011E5FF03D";
28+
return @"981BD68D8E1EC4E8961291AB393FB4450209A22A1D2AC4460AE869783AB64D52";
2929
}
3030

31-
@end
31+
@end

‎OneWelcomeExampleApp.xcodeproj/project.pbxproj‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
573335CF2B03C06E001B3B3C /* ChangePinErrorDomainMapping.swift in Sources */ = {isa = PBXBuildFile; fileRef = 573335CD2B03C06E001B3B3C /* ChangePinErrorDomainMapping.swift */; };
1919
575ED880298BF2A10094CBFD /* FetchResourceErrorMapping.swift in Sources */ = {isa = PBXBuildFile; fileRef = 575ED87F298BF2A10094CBFD /* FetchResourceErrorMapping.swift */; };
2020
575ED881298BF2A10094CBFD /* FetchResourceErrorMapping.swift in Sources */ = {isa = PBXBuildFile; fileRef = 575ED87F298BF2A10094CBFD /* FetchResourceErrorMapping.swift */; };
21+
57A343722B2C3C78001B47BE /* RegistrationErrorDomainMapping.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57A343712B2C3C78001B47BE /* RegistrationErrorDomainMapping.swift */; };
22+
57A343732B2C3C78001B47BE /* RegistrationErrorDomainMapping.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57A343712B2C3C78001B47BE /* RegistrationErrorDomainMapping.swift */; };
2123
57B353312AAAFF710049516E /* AllowedIdentityProviders.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57B353302AAAFF710049516E /* AllowedIdentityProviders.swift */; };
2224
57B353322AAAFF710049516E /* AllowedIdentityProviders.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57B353302AAAFF710049516E /* AllowedIdentityProviders.swift */; };
2325
57B353332AAAFF710049516E /* AllowedIdentityProviders.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57B353302AAAFF710049516E /* AllowedIdentityProviders.swift */; };
@@ -334,6 +336,7 @@
334336
5731AFB4296EC93F00E6165D /* QRCodePresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QRCodePresenter.swift; sourceTree = "<group>"; };
335337
573335CD2B03C06E001B3B3C /* ChangePinErrorDomainMapping.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChangePinErrorDomainMapping.swift; sourceTree = "<group>"; };
336338
575ED87F298BF2A10094CBFD /* FetchResourceErrorMapping.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FetchResourceErrorMapping.swift; sourceTree = "<group>"; };
339+
57A343712B2C3C78001B47BE /* RegistrationErrorDomainMapping.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RegistrationErrorDomainMapping.swift; sourceTree = "<group>"; };
337340
57B353302AAAFF710049516E /* AllowedIdentityProviders.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AllowedIdentityProviders.swift; sourceTree = "<group>"; };
338341
777B3B7E33B15B327C42F241 /* Pods_OneWelcomeExampleAppDebug.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_OneWelcomeExampleAppDebug.framework; sourceTree = BUILT_PRODUCTS_DIR; };
339342
7E01FDE72110AF7800DF0043 /* AuthenticatorsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthenticatorsViewController.swift; sourceTree = "<group>"; };
@@ -821,6 +824,7 @@
821824
7E999E4A22A6B6E500FEE3EC /* AppToWebSingleSignOnErrorDomainMapping.swift */,
822825
575ED87F298BF2A10094CBFD /* FetchResourceErrorMapping.swift */,
823826
573335CD2B03C06E001B3B3C /* ChangePinErrorDomainMapping.swift */,
827+
57A343712B2C3C78001B47BE /* RegistrationErrorDomainMapping.swift */,
824828
);
825829
path = ErrorMappings;
826830
sourceTree = "<group>";
@@ -1352,6 +1356,7 @@
13521356
isa = PBXSourcesBuildPhase;
13531357
buildActionMask = 2147483647;
13541358
files = (
1359+
57A343722B2C3C78001B47BE /* RegistrationErrorDomainMapping.swift in Sources */,
13551360
7E45478F20E24DEE00FB620F /* PinViewController.swift in Sources */,
13561361
573335CE2B03C06E001B3B3C /* ChangePinErrorDomainMapping.swift in Sources */,
13571362
7E45477220DD422600FB620F /* ButtonTableViewCell.swift in Sources */,
@@ -1460,6 +1465,7 @@
14601465
isa = PBXSourcesBuildPhase;
14611466
buildActionMask = 2147483647;
14621467
files = (
1468+
57A343732B2C3C78001B47BE /* RegistrationErrorDomainMapping.swift in Sources */,
14631469
AD07D3DB28771F4F0095571A /* PinViewController.swift in Sources */,
14641470
9EFDEC2429D4777600521793 /* ErrorExtension.swift in Sources */,
14651471
AD07D3DC28771F4F0095571A /* ButtonTableViewCell.swift in Sources */,
@@ -1714,7 +1720,7 @@
17141720
"$(inherited)",
17151721
"@executable_path/Frameworks",
17161722
);
1717-
MARKETING_VERSION = 6.2.1;
1723+
MARKETING_VERSION = 6.2.2;
17181724
PRODUCT_BUNDLE_IDENTIFIER = com.onewelcome.OneginiExampleAppSwift;
17191725
PRODUCT_NAME = "$(TARGET_NAME)";
17201726
SWIFT_OBJC_BRIDGING_HEADER = "OneWelcomeExampleApp/SupportingFiles/OneWelcomeExampleApp-Bridging-Header.h";
@@ -1741,7 +1747,7 @@
17411747
"$(inherited)",
17421748
"@executable_path/Frameworks",
17431749
);
1744-
MARKETING_VERSION = 6.2.1;
1750+
MARKETING_VERSION = 6.2.2;
17451751
PRODUCT_BUNDLE_IDENTIFIER = com.onewelcome.OneginiExampleAppSwift;
17461752
PRODUCT_NAME = "$(TARGET_NAME)";
17471753
SWIFT_OBJC_BRIDGING_HEADER = "OneWelcomeExampleApp/SupportingFiles/OneWelcomeExampleApp-Bridging-Header.h";

‎OneWelcomeExampleApp/ErrorMappings/ErrorMapper.swift‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ class ErrorMapper {
3636
return AppToWebSingleSignOnErrorDomainMapping().mapError(error)
3737
case ONGChangePinErrorDomain:
3838
return ChangePinErrorDomainMapping().mapError(error)
39+
case ONGRegistrationErrorDomain:
40+
return RegistrationErrorDomainMapping().mapError(error)
3941
default:
4042
return AppError(errorDescription: "Something went wrong.")
4143
}

‎OneWelcomeExampleApp/ErrorMappings/RegistrationErrorDomainMapping.swift‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
// Copyright © 2023 OneWelcome. All rights reserved.
2+
3+
import Foundation
4+
5+
class RegistrationErrorDomainMapping {
6+
func mapError(_ error: Error) -> AppError {
7+
let title = "Registration error"
8+
9+
switch ONGRegistrationError(rawValue: error.code) {
10+
case .stateless:
11+
let errorDescription = "Stateless registration not available for browser based providers."
12+
let recoverySuggestion = ""
13+
return AppError(title: title, errorDescription: errorDescription, recoverySuggestion: recoverySuggestion)
14+
default:
15+
return AppError(errorDescription: "Something went wrong.")
16+
}
17+
}
18+
}

‎OneWelcomeExampleApp/Interactors/RegisterUserInteractor.swift‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,15 @@ extension RegisterUserInteractor: RegistrationDelegate {
190190
}
191191

192192
func userClient(_ userClient: UserClient, didFailToRegisterUserWith identityProvider: IdentityProvider, error: Error) {
193+
switch ONGRegistrationError(rawValue: error.code) {
194+
case .stateless:
195+
let mappedError = ErrorMapper().mapError(error)
196+
registerUserPresenter?.registerUserActionFailed(mappedError)
197+
return
198+
default:
199+
break
200+
}
201+
193202
switch ONGGenericError(rawValue: error.code) {
194203
case .actionCancelled:
195204
registerUserPresenter?.registerUserActionCancelled()

‎Podfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use_frameworks!
66
plugin 'cocoapods-art', :sources => ['onegini']
77

88
def oneginiSDKiOS
9-
pod 'OneginiSDKiOS', '~> 12.3.2'
9+
pod 'OneginiSDKiOS', '~> 12.3.4'
1010
end
1111

1212
def externalRegularDependencies

‎Podfile.lock‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ PODS:
1515
- AFNetworking/UIKit (4.0.1):
1616
- AFNetworking/NSURLSession
1717
- BetterSegmentedControl (2.0.1)
18-
- OneginiSDKiOS (12.3.2):
18+
- OneginiSDKiOS (12.3.4):
1919
- AFNetworking (~> 4.0.1)
2020
- Typhoon (~> 4.0.8)
2121
- SkyFloatingLabelTextField (3.8.0)
@@ -33,7 +33,7 @@ PODS:
3333

3434
DEPENDENCIES:
3535
- BetterSegmentedControl (~> 2.0.0)
36-
- OneginiSDKiOS (~> 12.3.2)
36+
- OneginiSDKiOS (~> 12.3.4)
3737
- SkyFloatingLabelTextField (~> 3.0)
3838
- SwiftLint (~> 0.50)
3939
- Swinject (= 2.8.1)
@@ -54,13 +54,13 @@ SPEC REPOS:
5454
SPEC CHECKSUMS:
5555
AFNetworking: 3bd23d814e976cd148d7d44c3ab78017b744cd58
5656
BetterSegmentedControl: 09607b27861d49cbce48b7673b74f9150a3d371a
57-
OneginiSDKiOS: ad2bd5bf971c65e313477b09ffa7370256f69bff
57+
OneginiSDKiOS: 675441522589bb9411bce8023c2b1704ab6a272a
5858
SkyFloatingLabelTextField: 5a338412114808e961fe2d14ea2c5452c8b6e4aa
5959
SwiftLint: c1de071d9d08c8aba837545f6254315bc900e211
6060
Swinject: 97112918bd7e0785dc2df7036213f3c8cbba6586
6161
TransitionButton: 36283346e17c64775a1b3bc3a7a72940a367de1f
6262
Typhoon: 1973c93ecfb3edb963d78b10e715bc2911475bd2
6363

64-
PODFILE CHECKSUM: fc3985c8e123495707fc72d60291ca3c6e5dd672
64+
PODFILE CHECKSUM: 56d389be96829a496b798d2cfed578035e6a3f5f
6565

6666
COCOAPODS: 1.12.1

0 commit comments

Comments
 (0)