File tree 5 files changed +26
-42
lines changed
WooCommerce/WordPressAuthenticator/WordPressKit
5 files changed +26
-42
lines changed Original file line number Diff line number Diff line change
1
+ #import < Foundation/Foundation.h>
2
+
3
+ // / Error domain of `NSError` instances that are converted from `WordPressComRestApiEndpointError`
4
+ // / and `WordPressAPIError<WordPressComRestApiEndpointError>` instances.
5
+ // /
6
+ // / This matches the compiler generated value and is used to ensure consistent error domain across error types and SPM or Framework build modes.
7
+ // /
8
+ // / See `extension WordPressComRestApiEndpointError: CustomNSError` in CoreAPI package for context.
9
+ static NSString *const _Nonnull WordPressComRestApiErrorDomain = @" WordPressKit.WordPressComRestApiError" ;
Original file line number Diff line number Diff line change 1
1
import Foundation
2
+ #if SWIFT_PACKAGE
3
+ import APIInterface
4
+ #endif
2
5
3
6
/// Custom `NSError` bridge implementation.
4
7
///
@@ -86,8 +89,7 @@ extension WordPressAPIError: CustomNSError {
86
89
/// And in cases where additional user info was provided, they need to be carried over to the `NSError` instances.
87
90
extension WordPressComRestApiEndpointError : CustomNSError {
88
91
89
- // This value is the same as the `WordPressComRestApiErrorDomain` constant generated by Swift compiler.
90
- public static let errorDomain = " WordPressKit.WordPressComRestApiError "
92
+ public static let errorDomain = WordPressComRestApiErrorDomain
91
93
92
94
public var errorCode : Int {
93
95
code. rawValue
Load Diff This file was deleted.
Original file line number Diff line number Diff line change @@ -244,8 +244,9 @@ - (NSError *)processMediaUploadErrors:(NSArray *)errorList {
244
244
errorMessage = errorInfo[@" message" ];
245
245
}
246
246
NSDictionary *errorDictionary = @{NSLocalizedDescriptionKey : errorMessage};
247
- error = [NSError wordPressComRestApiErrorWithCode: WordPressComRestApiErrorCodeUploadFailed
248
- userInfo: errorDictionary];
247
+ error = [[NSError alloc ] initWithDomain: WordPressComRestApiErrorDomain
248
+ code: WordPressComRestApiErrorCodeUploadFailed
249
+ userInfo: errorDictionary];
249
250
}
250
251
return error;
251
252
}
@@ -297,8 +298,9 @@ - (void)deleteMedia:(RemoteMedia *)media
297
298
}
298
299
} else {
299
300
if (failure) {
300
- NSError *error = [NSError wordPressComRestApiErrorWithCode: WordPressComRestApiErrorCodeUnknown
301
- userInfo: nil ];
301
+ NSError *error = [[NSError alloc ] initWithDomain: WordPressComRestApiErrorDomain
302
+ code: WordPressComRestApiErrorCodeUnknown
303
+ userInfo: nil ];
302
304
failure (error);
303
305
}
304
306
}
@@ -369,8 +371,9 @@ -(void)getVideoPressToken:(NSString *)videoPressID
369
371
}
370
372
} else {
371
373
if (failure) {
372
- NSError *error = [NSError wordPressComRestApiErrorWithCode: WordPressComRestApiErrorCodeUnknown
373
- userInfo: nil ];
374
+ NSError *error = [[NSError alloc ] initWithDomain: WordPressComRestApiErrorDomain
375
+ code: WordPressComRestApiErrorCodeUnknown
376
+ userInfo: nil ];
374
377
failure (error);
375
378
}
376
379
}
Original file line number Diff line number Diff line change @@ -179,9 +179,9 @@ - (void)createWPComBlogWithUrl:(NSString *)blogUrl
179
179
NSMutableDictionary *userInfo = [[NSMutableDictionary alloc ] init ];
180
180
userInfo[WordPressComRestApi.ErrorKeyErrorMessage] = localizedErrorMessage;
181
181
userInfo[NSLocalizedDescriptionKey ] = localizedErrorMessage;
182
- NSError *errorWithLocalizedMessage = [NSError wordPressComRestApiErrorWithCode: WordPressComRestApiErrorCodeUnknown
183
- userInfo: userInfo];
184
-
182
+ NSError *errorWithLocalizedMessage = [[ NSError alloc ] initWithDomain: WordPressComRestApiErrorDomain
183
+ code: WordPressComRestApiErrorCodeUnknown
184
+ userInfo: userInfo];
185
185
failure (errorWithLocalizedMessage);
186
186
} else {
187
187
success (responseObject);
@@ -228,7 +228,7 @@ - (void)createWPComBlogWithUrl:(NSString *)blogUrl
228
228
229
229
- (NSError *)errorWithLocalizedMessage : (NSError *)error {
230
230
NSError *errorWithLocalizedMessage = error;
231
- if ([error hasWordPressComRestApiErrorDomain ] &&
231
+ if ([error.domain isEqual: WordPressComRestApiErrorDomain ] &&
232
232
[error.userInfo objectForKey: WordPressComRestApi.ErrorKeyErrorCode] != nil ) {
233
233
234
234
NSString *localizedErrorMessage = [self errorMessageForError: error];
You can’t perform that action at this time.
0 commit comments