Skip to content

Commit 7cae37a

Browse files
authored
Merge pull request #152 from adobe/staging
Staging 5.0.1 -> Main
2 parents 8c8c906 + 686105a commit 7cae37a

24 files changed

+5693
-2912
lines changed

AEPAssurance.podspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "AEPAssurance"
3-
s.version = "5.0.0"
3+
s.version = "5.0.1"
44

55
s.summary = "AEPAssurance SDK for Adobe Experience Platform Mobile SDK. Written and maintained by Adobe."
66

AEPAssurance.xcodeproj/project.pbxproj

+18
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,12 @@
2929
750EE32C2937C6D50013C411 /* AssuranceStatusPresentationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 750EE32B2937C6D50013C411 /* AssuranceStatusPresentationTests.swift */; };
3030
750EE32E2937C7E40013C411 /* QuickConnectViewTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 750EE32D2937C7E40013C411 /* QuickConnectViewTests.swift */; };
3131
750EE3302937D6B10013C411 /* MockQuickConnectManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 750EE32F2937D6B10013C411 /* MockQuickConnectManager.swift */; };
32+
7522C4882C24DAC3004AF637 /* Localizable.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = 7522C4872C24DAC2004AF637 /* Localizable.xcstrings */; };
3233
7527DCA22926F15300FE0D8C /* AssuranceConnectionDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7527DCA12926F15300FE0D8C /* AssuranceConnectionDelegate.swift */; };
3334
753867C32925735D0021BC3F /* AssuranceAuthorizingPresentation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 753867C22925735D0021BC3F /* AssuranceAuthorizingPresentation.swift */; };
3435
753867C529257CFE0021BC3F /* AssuranceStatusPresentation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 753867C429257CFE0021BC3F /* AssuranceStatusPresentation.swift */; };
3536
755A475D2A377F2A00FE00AA /* htmlSampleEscaped.txt in Resources */ = {isa = PBXBuildFile; fileRef = 755A475C2A377F2A00FE00AA /* htmlSampleEscaped.txt */; };
37+
75B72F962C3DC3FF00FA1658 /* Localizable.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = 75B72F952C3DC3FF00FA1658 /* Localizable.xcstrings */; };
3638
7881FA5928D50C8D0051F902 /* QuickConnectServiceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7881FA5828D50C8D0051F902 /* QuickConnectServiceTests.swift */; };
3739
B601172227BAE3EF006D3968 /* Connection.swift in Sources */ = {isa = PBXBuildFile; fileRef = B601172127BAE3EF006D3968 /* Connection.swift */; };
3840
B601172527BAE4AA006D3968 /* AdobeLogo.swift in Sources */ = {isa = PBXBuildFile; fileRef = B601172427BAE4AA006D3968 /* AdobeLogo.swift */; };
@@ -225,10 +227,12 @@
225227
750EE32B2937C6D50013C411 /* AssuranceStatusPresentationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AssuranceStatusPresentationTests.swift; sourceTree = "<group>"; };
226228
750EE32D2937C7E40013C411 /* QuickConnectViewTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QuickConnectViewTests.swift; sourceTree = "<group>"; };
227229
750EE32F2937D6B10013C411 /* MockQuickConnectManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockQuickConnectManager.swift; sourceTree = "<group>"; };
230+
7522C4872C24DAC2004AF637 /* Localizable.xcstrings */ = {isa = PBXFileReference; lastKnownFileType = text.json.xcstrings; path = Localizable.xcstrings; sourceTree = "<group>"; };
228231
7527DCA12926F15300FE0D8C /* AssuranceConnectionDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AssuranceConnectionDelegate.swift; sourceTree = "<group>"; };
229232
753867C22925735D0021BC3F /* AssuranceAuthorizingPresentation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AssuranceAuthorizingPresentation.swift; sourceTree = "<group>"; };
230233
753867C429257CFE0021BC3F /* AssuranceStatusPresentation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AssuranceStatusPresentation.swift; sourceTree = "<group>"; };
231234
755A475C2A377F2A00FE00AA /* htmlSampleEscaped.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = htmlSampleEscaped.txt; sourceTree = "<group>"; };
235+
75B72F952C3DC3FF00FA1658 /* Localizable.xcstrings */ = {isa = PBXFileReference; lastKnownFileType = text.json.xcstrings; path = Localizable.xcstrings; sourceTree = "<group>"; };
232236
7881FA5828D50C8D0051F902 /* QuickConnectServiceTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QuickConnectServiceTests.swift; sourceTree = "<group>"; };
233237
96C170474540581D23D5C489 /* Pods_TestApp.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_TestApp.framework; sourceTree = BUILT_PRODUCTS_DIR; };
234238
B601171F27BAE193006D3968 /* connection.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = connection.png; sourceTree = "<group>"; };
@@ -518,6 +522,7 @@
518522
B6EB1C142805F4FE0036337E /* AssuranceSessionOrchestrator.swift */,
519523
B61B7E652822D08F00E1A6B2 /* AssuranceSessionDetails.swift */,
520524
B640719D262C313E00C43183 /* Info.plist */,
525+
7522C4872C24DAC2004AF637 /* Localizable.xcstrings */,
521526
);
522527
name = Source;
523528
path = AEPAssurance/Source;
@@ -575,6 +580,7 @@
575580
B64071EE262C8F8D00C43183 /* Preview Content */,
576581
B603FA1027AD91A30033416B /* sampleRules.json */,
577582
B6DB487927B1982600166FC4 /* sample.html */,
583+
75B72F952C3DC3FF00FA1658 /* Localizable.xcstrings */,
578584
);
579585
path = TestApp;
580586
sourceTree = "<group>";
@@ -941,6 +947,16 @@
941947
knownRegions = (
942948
en,
943949
Base,
950+
"pt-BR",
951+
"zh-Hant-TW",
952+
"zh-Hant-CN",
953+
"de-DE",
954+
"es-ES",
955+
"it-IT",
956+
"fr-FR",
957+
"ja-JP",
958+
"ko-KR",
959+
"en-US",
944960
);
945961
mainGroup = B640718F262C313E00C43183;
946962
productRefGroup = B640719A262C313E00C43183 /* Products */;
@@ -961,6 +977,7 @@
961977
isa = PBXResourcesBuildPhase;
962978
buildActionMask = 2147483647;
963979
files = (
980+
7522C4882C24DAC3004AF637 /* Localizable.xcstrings in Resources */,
964981
);
965982
runOnlyForDeploymentPostprocessing = 0;
966983
};
@@ -984,6 +1001,7 @@
9841001
files = (
9851002
B64071F3262C8F8D00C43183 /* LaunchScreen.storyboard in Resources */,
9861003
B603FA1127AD91A30033416B /* sampleRules.json in Resources */,
1004+
75B72F962C3DC3FF00FA1658 /* Localizable.xcstrings in Resources */,
9871005
B64071F0262C8F8D00C43183 /* Preview Assets.xcassets in Resources */,
9881006
B6DB487A27B1982600166FC4 /* sample.html in Resources */,
9891007
B64071ED262C8F8D00C43183 /* Assets.xcassets in Resources */,

AEPAssurance/Source/AssuranceConnectionError.swift

+31-48
Original file line numberDiff line numberDiff line change
@@ -17,72 +17,55 @@ enum AssuranceConnectionError: Error, Equatable {
1717
case genericError
1818
case noOrgId
1919
case noPincode
20-
case noURL
2120
case orgIDMismatch
2221
case connectionLimit
2322
case eventLimit
2423
case deletedSession
2524
case clientError
26-
case userCancelled
27-
case invalidURL(url: String)
28-
case invalidRequestBody
29-
case invalidResponseData
30-
case failedToRegisterDevice(statusCode: Int, responseMessage: String)
31-
case failedToGetDeviceStatus(statusCode: Int, responseMessage: String)
32-
case failedToDeleteDevice(statusCode: Int, responseMessage: String)
25+
case invalidURL
26+
case invalidRequest
27+
case invalidResponse
28+
case requestFailed
3329

3430
var info: (name: String, description: String, shouldRetry: Bool) {
3531
switch self {
3632
case .genericError:
37-
return ("Connection Error",
38-
"The connection may be failing due to a network issue or an incorrect PIN. Please verify internet connectivity or the PIN and try again.", true)
33+
return (NSLocalizedString("error_title_incorrect_pin_or_network", bundle: Bundle(identifier: "com.adobe.aep.assurance.AEPAssurance") ?? Bundle.main, value: "Connection Error", comment: ""), NSLocalizedString("error_desc_incorrect_pin_or_network", bundle: Bundle(identifier: "com.adobe.aep.assurance.AEPAssurance") ?? Bundle.main, value: "The connection may be failing due to a network issue or an incorrect PIN. Please verify internet connectivity or the PIN and try again." , comment: ""), true)
3934
case .noPincode:
40-
return ("HTML Error",
41-
"Unable to extract the pincode entered.", true)
42-
case .noURL:
43-
return ("Socket Connection Error",
44-
"Unable to form a valid socket URL for connection.", false)
35+
return (NSLocalizedString("error_title_invalid_pin", bundle: Bundle(identifier: "com.adobe.aep.assurance.AEPAssurance") ?? Bundle.main, value: "Authorization Error", comment: ""),
36+
NSLocalizedString("error_desc_invalid_pin", bundle: Bundle(identifier: "com.adobe.aep.assurance.AEPAssurance") ?? Bundle.main, value: "Unable to authorize Assurance connection. Please verify the PIN and try again.", comment: ""), true)
4537
case .noOrgId:
46-
return (" Invalid Mobile SDK Configuration",
47-
"The Experience Cloud organization identifier is unavailable. Ensure SDK configuration is setup correctly. See documentation for more detail.", false)
38+
return (NSLocalizedString("error_title_invalid_org_id", bundle: Bundle(identifier: "com.adobe.aep.assurance.AEPAssurance") ?? Bundle.main, value: "Invalid Mobile SDK Configuration", comment: ""),
39+
NSLocalizedString("error_desc_invalid_org_id", bundle: Bundle(identifier: "com.adobe.aep.assurance.AEPAssurance") ?? Bundle.main, value: "The Experience Cloud organization identifier is unavailable. Ensure SDK configuration is setup correctly. See documentation for more detail.", comment: ""), false)
4840
case .orgIDMismatch:
49-
return ("Unauthorized Access",
50-
"The Experience Cloud organization identifier does not match with that of the Assurance session. Ensure the right Experience Cloud organization is being used. See documentation for more detail.", false)
41+
return (NSLocalizedString("error_title_unauthorized_access", bundle: Bundle(identifier: "com.adobe.aep.assurance.AEPAssurance") ?? Bundle.main, value: "Unauthorized Access", comment: ""),
42+
NSLocalizedString("error_desc_unauthorized_access", bundle: Bundle(identifier: "com.adobe.aep.assurance.AEPAssurance") ?? Bundle.main, value: "The Experience Cloud organization identifier does not match with that of the Assurance session. Ensure the right Experience Cloud organization is being used. See documentation for more detail.", comment: ""), false)
5143
case .connectionLimit:
52-
return ("Connection Limit Reached",
53-
"You have reached the maximum number of connected device (50) allowed to a session.", false)
44+
return (NSLocalizedString("error_title_connection_limit", bundle: Bundle(identifier: "com.adobe.aep.assurance.AEPAssurance") ?? Bundle.main, value: "Connection Limit Reached", comment: ""),
45+
NSLocalizedString("error_desc_connection_limit", bundle: Bundle(identifier: "com.adobe.aep.assurance.AEPAssurance") ?? Bundle.main, value: "You have reached the maximum number of connected device allowed to a session.", comment: ""), false)
5446
case .eventLimit:
55-
return ("Event Limit Reached",
56-
"You have reached the maximum number of events (10k) that can be sent per minute.", false)
47+
return (NSLocalizedString("error_title_event_limit", bundle: Bundle(identifier: "com.adobe.aep.assurance.AEPAssurance") ?? Bundle.main, value: "Event Limit Reached", comment: ""),
48+
NSLocalizedString("error_desc_event_limit", bundle: Bundle(identifier: "com.adobe.aep.assurance.AEPAssurance") ?? Bundle.main, value: "You have reached the maximum number of events that can be sent per minute.", comment: ""), false)
5749
// todo immediate: check with the team on better description.
5850
// todo later: have griffon server return error description and how to solve... Same for connection & event limit errors
5951
case .deletedSession:
60-
return ("Session Deleted",
61-
"You attempted to connect to a deleted session.", false)
52+
return (NSLocalizedString("error_title_session_deleted", bundle: Bundle(identifier: "com.adobe.aep.assurance.AEPAssurance") ?? Bundle.main, value: "Session Deleted", comment: ""),
53+
NSLocalizedString("error_desc_session_deleted", bundle: Bundle(identifier: "com.adobe.aep.assurance.AEPAssurance") ?? Bundle.main, value: "You attempted to connect to a deleted session.", comment: ""), false)
6254
case .clientError:
63-
return ("Client Disconnected",
64-
"This client has been disconnected due to an unexpected error. Error Code 4400.", false)
65-
case .userCancelled:
66-
return ("Assurance session connection cancelled.",
67-
"User has chosen to cancel the socket connection. To start again, please open the app with an assurance deeplink url.", false)
68-
case .invalidURL(let url):
69-
return ("Invalid url",
70-
"Attempted a network request with an invalid url: \(url)", false)
71-
case .invalidResponseData:
72-
return ("Invalid response data",
73-
"Received invalid response data", false)
74-
case .invalidRequestBody:
75-
return ("Invalid request body",
76-
"Attempted a network request with an invalid request body", false)
77-
case .failedToRegisterDevice(let statusCode, let responseMessage):
78-
return ("Failed to register device",
79-
"Failed to register device with status code: \(statusCode), and response message: \"\(responseMessage)\"", true)
80-
case .failedToGetDeviceStatus(let statusCode, let responseMessage):
81-
return ("Failed to get device status",
82-
"Failed to get device status with status code: \(statusCode), and response message: \"\(responseMessage)\"", true)
83-
case .failedToDeleteDevice(let statusCode, let responseMessage):
84-
return ("Failed to delete device",
85-
"Failed to delete device with status code: \(statusCode), and response message: \"\(responseMessage)\"", true)
55+
return (NSLocalizedString("error_title_unexpected_error", bundle: Bundle(identifier: "com.adobe.aep.assurance.AEPAssurance") ?? Bundle.main, value: "Client Disconnected", comment: ""),
56+
NSLocalizedString("error_desc_unexpected_error", bundle: Bundle(identifier: "com.adobe.aep.assurance.AEPAssurance") ?? Bundle.main, value: "This client has been disconnected due to an unexpected error.", comment: ""), false)
57+
case .invalidURL:
58+
return (NSLocalizedString("error_title_invalid_url", bundle: Bundle(identifier: "com.adobe.aep.assurance.AEPAssurance") ?? Bundle.main, value: "Invalid url", comment: ""),
59+
NSLocalizedString("error_desc_invalid_url", bundle: Bundle(identifier: "com.adobe.aep.assurance.AEPAssurance") ?? Bundle.main, value: "Attempted a network request with an invalid url.", comment: ""), false)
60+
case .invalidResponse:
61+
return (NSLocalizedString("error_title_invalid_registration_response", bundle: Bundle(identifier: "com.adobe.aep.assurance.AEPAssurance") ?? Bundle.main, value: "Invalid response data", comment: ""),
62+
NSLocalizedString("error_desc_invalid_registration_response", bundle: Bundle(identifier: "com.adobe.aep.assurance.AEPAssurance") ?? Bundle.main, value: "Connection failed due to an invalid response.", comment: ""), false)
63+
case .invalidRequest:
64+
return (NSLocalizedString("error_title_invalid_registration_request", bundle: Bundle(identifier: "com.adobe.aep.assurance.AEPAssurance") ?? Bundle.main, value: "Connection Error", comment: ""),
65+
NSLocalizedString("error_desc_invalid_registration_request", bundle: Bundle(identifier: "com.adobe.aep.assurance.AEPAssurance") ?? Bundle.main, value: "The connection may be failing due to an invalid network request.", comment: ""), false)
66+
case .requestFailed:
67+
return (NSLocalizedString("error_title_registration_error", bundle: Bundle(identifier: "com.adobe.aep.assurance.AEPAssurance") ?? Bundle.main, value: "Connection Error", comment: ""),
68+
NSLocalizedString("error_desc_registration_error", bundle: Bundle(identifier: "com.adobe.aep.assurance.AEPAssurance") ?? Bundle.main, value: "Error occurred during device registration or status check.", comment: ""), false)
8669
}
8770
}
8871
}

AEPAssurance/Source/AssuranceConstants.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import Foundation
1515
enum AssuranceConstants {
1616
static let EXTENSION_NAME = "com.adobe.assurance"
1717
static let FRIENDLY_NAME = "Assurance"
18-
static let EXTENSION_VERSION = "5.0.0"
18+
static let EXTENSION_VERSION = "5.0.1"
1919

2020
static let LOG_TAG = FRIENDLY_NAME
2121
static let DEFAULT_ENVIRONMENT = AssuranceEnvironment.prod

AEPAssurance/Source/AssuranceSessionOrchestrator.swift

-7
Original file line numberDiff line numberDiff line change
@@ -154,13 +154,6 @@ class AssuranceSessionOrchestrator: AssurancePresentationDelegate, AssuranceConn
154154
return
155155
}
156156

157-
/// display the error if the pin is empty
158-
if pin.isEmpty {
159-
authorizingPresentation?.sessionConnectionError(error: .noPincode)
160-
terminateSession(purgeBuffer: true)
161-
return
162-
}
163-
164157
/// display error if the OrgID is missing.
165158
guard let orgID = stateManager.getURLEncodedOrgID() else {
166159
authorizingPresentation?.sessionConnectionError(error: .noOrgId)

0 commit comments

Comments
 (0)