Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Configuration/Production/OneginiConfigModel.m
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

@implementation OneginiConfigModel

// Config model generated by SDK Configurator version: v5.2.0
// Config model generated by SDK Configurator version: v5.3.0

+ (NSArray *)certificates
{
Expand All @@ -16,7 +16,7 @@ + (NSDictionary *)configuration
@"ONGServerVersion" : @"1.33.0",
@"ONGAppIdentifier" : @"ExampleApp",
@"ONGAppPlatform" : @"ios",
@"ONGAppVersion" : @"6.2.1",
@"ONGAppVersion" : @"6.2.2",
@"ONGAppBaseURL" : @"https://mobile-security-proxy.onegini.com",
@"ONGResourceBaseURL" : @"https://mobile-security-proxy.onegini.com/resources/",
@"ONGRedirectURL" : @"oneginiexample://loginsuccess",
Expand All @@ -25,7 +25,7 @@ + (NSDictionary *)configuration

+ (NSString *)serverPublicKey
{
return @"CCD2EEDE4EF9B3794DC9C673B4613530BB44E814623C6EE7F895A3011E5FF03D";
return @"981BD68D8E1EC4E8961291AB393FB4450209A22A1D2AC4460AE869783AB64D52";
}

@end
@end
10 changes: 8 additions & 2 deletions OneWelcomeExampleApp.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
573335CF2B03C06E001B3B3C /* ChangePinErrorDomainMapping.swift in Sources */ = {isa = PBXBuildFile; fileRef = 573335CD2B03C06E001B3B3C /* ChangePinErrorDomainMapping.swift */; };
575ED880298BF2A10094CBFD /* FetchResourceErrorMapping.swift in Sources */ = {isa = PBXBuildFile; fileRef = 575ED87F298BF2A10094CBFD /* FetchResourceErrorMapping.swift */; };
575ED881298BF2A10094CBFD /* FetchResourceErrorMapping.swift in Sources */ = {isa = PBXBuildFile; fileRef = 575ED87F298BF2A10094CBFD /* FetchResourceErrorMapping.swift */; };
57A343722B2C3C78001B47BE /* RegistrationErrorDomainMapping.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57A343712B2C3C78001B47BE /* RegistrationErrorDomainMapping.swift */; };
57A343732B2C3C78001B47BE /* RegistrationErrorDomainMapping.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57A343712B2C3C78001B47BE /* RegistrationErrorDomainMapping.swift */; };
57B353312AAAFF710049516E /* AllowedIdentityProviders.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57B353302AAAFF710049516E /* AllowedIdentityProviders.swift */; };
57B353322AAAFF710049516E /* AllowedIdentityProviders.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57B353302AAAFF710049516E /* AllowedIdentityProviders.swift */; };
57B353332AAAFF710049516E /* AllowedIdentityProviders.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57B353302AAAFF710049516E /* AllowedIdentityProviders.swift */; };
Expand Down Expand Up @@ -334,6 +336,7 @@
5731AFB4296EC93F00E6165D /* QRCodePresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QRCodePresenter.swift; sourceTree = "<group>"; };
573335CD2B03C06E001B3B3C /* ChangePinErrorDomainMapping.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChangePinErrorDomainMapping.swift; sourceTree = "<group>"; };
575ED87F298BF2A10094CBFD /* FetchResourceErrorMapping.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FetchResourceErrorMapping.swift; sourceTree = "<group>"; };
57A343712B2C3C78001B47BE /* RegistrationErrorDomainMapping.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RegistrationErrorDomainMapping.swift; sourceTree = "<group>"; };
57B353302AAAFF710049516E /* AllowedIdentityProviders.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AllowedIdentityProviders.swift; sourceTree = "<group>"; };
777B3B7E33B15B327C42F241 /* Pods_OneWelcomeExampleAppDebug.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_OneWelcomeExampleAppDebug.framework; sourceTree = BUILT_PRODUCTS_DIR; };
7E01FDE72110AF7800DF0043 /* AuthenticatorsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthenticatorsViewController.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -821,6 +824,7 @@
7E999E4A22A6B6E500FEE3EC /* AppToWebSingleSignOnErrorDomainMapping.swift */,
575ED87F298BF2A10094CBFD /* FetchResourceErrorMapping.swift */,
573335CD2B03C06E001B3B3C /* ChangePinErrorDomainMapping.swift */,
57A343712B2C3C78001B47BE /* RegistrationErrorDomainMapping.swift */,
);
path = ErrorMappings;
sourceTree = "<group>";
Expand Down Expand Up @@ -1352,6 +1356,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
57A343722B2C3C78001B47BE /* RegistrationErrorDomainMapping.swift in Sources */,
7E45478F20E24DEE00FB620F /* PinViewController.swift in Sources */,
573335CE2B03C06E001B3B3C /* ChangePinErrorDomainMapping.swift in Sources */,
7E45477220DD422600FB620F /* ButtonTableViewCell.swift in Sources */,
Expand Down Expand Up @@ -1460,6 +1465,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
57A343732B2C3C78001B47BE /* RegistrationErrorDomainMapping.swift in Sources */,
AD07D3DB28771F4F0095571A /* PinViewController.swift in Sources */,
9EFDEC2429D4777600521793 /* ErrorExtension.swift in Sources */,
AD07D3DC28771F4F0095571A /* ButtonTableViewCell.swift in Sources */,
Expand Down Expand Up @@ -1714,7 +1720,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 6.2.1;
MARKETING_VERSION = 6.2.2;
PRODUCT_BUNDLE_IDENTIFIER = com.onewelcome.OneginiExampleAppSwift;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "OneWelcomeExampleApp/SupportingFiles/OneWelcomeExampleApp-Bridging-Header.h";
Expand All @@ -1741,7 +1747,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 6.2.1;
MARKETING_VERSION = 6.2.2;
PRODUCT_BUNDLE_IDENTIFIER = com.onewelcome.OneginiExampleAppSwift;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "OneWelcomeExampleApp/SupportingFiles/OneWelcomeExampleApp-Bridging-Header.h";
Expand Down
2 changes: 2 additions & 0 deletions OneWelcomeExampleApp/ErrorMappings/ErrorMapper.swift
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ class ErrorMapper {
return AppToWebSingleSignOnErrorDomainMapping().mapError(error)
case ONGChangePinErrorDomain:
return ChangePinErrorDomainMapping().mapError(error)
case ONGRegistrationErrorDomain:
return RegistrationErrorDomainMapping().mapError(error)
default:
return AppError(errorDescription: "Something went wrong.")
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
// Copyright © 2023 OneWelcome. All rights reserved.

import Foundation

class RegistrationErrorDomainMapping {
func mapError(_ error: Error) -> AppError {
let title = "Registration error"

switch ONGRegistrationError(rawValue: error.code) {
case .stateless:
let errorDescription = "Stateless registration not available for browser based providers."
let recoverySuggestion = ""
return AppError(title: title, errorDescription: errorDescription, recoverySuggestion: recoverySuggestion)
default:
return AppError(errorDescription: "Something went wrong.")
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,15 @@ extension RegisterUserInteractor: RegistrationDelegate {
}

func userClient(_ userClient: UserClient, didFailToRegisterUserWith identityProvider: IdentityProvider, error: Error) {
switch ONGRegistrationError(rawValue: error.code) {
case .stateless:
let mappedError = ErrorMapper().mapError(error)
registerUserPresenter?.registerUserActionFailed(mappedError)
return
default:
break
}

switch ONGGenericError(rawValue: error.code) {
case .actionCancelled:
registerUserPresenter?.registerUserActionCancelled()
Expand Down
2 changes: 1 addition & 1 deletion Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use_frameworks!
plugin 'cocoapods-art', :sources => ['onegini']

def oneginiSDKiOS
pod 'OneginiSDKiOS', '~> 12.3.2'
pod 'OneginiSDKiOS', '~> 12.3.4'
end

def externalRegularDependencies
Expand Down
8 changes: 4 additions & 4 deletions Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ PODS:
- AFNetworking/UIKit (4.0.1):
- AFNetworking/NSURLSession
- BetterSegmentedControl (2.0.1)
- OneginiSDKiOS (12.3.2):
- OneginiSDKiOS (12.3.4):
- AFNetworking (~> 4.0.1)
- Typhoon (~> 4.0.8)
- SkyFloatingLabelTextField (3.8.0)
Expand All @@ -33,7 +33,7 @@ PODS:

DEPENDENCIES:
- BetterSegmentedControl (~> 2.0.0)
- OneginiSDKiOS (~> 12.3.2)
- OneginiSDKiOS (~> 12.3.4)
- SkyFloatingLabelTextField (~> 3.0)
- SwiftLint (~> 0.50)
- Swinject (= 2.8.1)
Expand All @@ -54,13 +54,13 @@ SPEC REPOS:
SPEC CHECKSUMS:
AFNetworking: 3bd23d814e976cd148d7d44c3ab78017b744cd58
BetterSegmentedControl: 09607b27861d49cbce48b7673b74f9150a3d371a
OneginiSDKiOS: ad2bd5bf971c65e313477b09ffa7370256f69bff
OneginiSDKiOS: 675441522589bb9411bce8023c2b1704ab6a272a
SkyFloatingLabelTextField: 5a338412114808e961fe2d14ea2c5452c8b6e4aa
SwiftLint: c1de071d9d08c8aba837545f6254315bc900e211
Swinject: 97112918bd7e0785dc2df7036213f3c8cbba6586
TransitionButton: 36283346e17c64775a1b3bc3a7a72940a367de1f
Typhoon: 1973c93ecfb3edb963d78b10e715bc2911475bd2

PODFILE CHECKSUM: fc3985c8e123495707fc72d60291ca3c6e5dd672
PODFILE CHECKSUM: 56d389be96829a496b798d2cfed578035e6a3f5f

COCOAPODS: 1.12.1