Skip to content

Guard against nil account in createOrUpdateAccountWithAuthToken callback #25967

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jkmassel merged 1 commit into from
Sep 2, 2026
+6 −2
Merged

Guard against nil account in createOrUpdateAccountWithAuthToken callback #25967

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion WordPress/Classes/Services/AccountService.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ extern NSNotificationName const WPAccountEmailAndDefaultBlogUpdatedNotification;
@param failure A failure block.
*/
- (void)createOrUpdateAccountWithAuthToken:(NSString *)authToken
success:(void (^)(WPAccount * _Nonnull))success
success:(void (^)(WPAccount * _Nullable))success
failure:(void (^)(NSError * _Nonnull))failure;

- (NSManagedObjectID *)createOrUpdateAccountWithUserDetails:(RemoteUser *)remoteUser authToken:(NSString *)authToken;
Expand Down
2 changes: 1 addition & 1 deletion WordPress/Classes/Services/AccountService.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ - (WPAccount *)findDefaultAccountCandidateFromAccounts:(NSArray *)allAccounts
}

- (void)createOrUpdateAccountWithAuthToken:(NSString *)authToken
success:(void (^)(WPAccount * _Nonnull))success
success:(void (^)(WPAccount * _Nullable))success
failure:(void (^)(NSError * _Nonnull))failure
{
WordPressComRestApi *api = [WordPressComRestApi defaultApiWithOAuthToken:authToken userAgent:[WPUserAgent wordPressUserAgent] localeKey:[WordPressComRestApi LocaleKeyDefault]];
Expand Down
4 changes: 4 additions & 0 deletions WordPress/Classes/Services/WordPressComSyncService.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ class WordPressComSyncService {
func syncWPCom(authToken: String, isJetpackLogin: Bool, onSuccess: @escaping (WPAccount) -> Void, onFailure: @escaping (Error) -> Void) {
let accountService = AccountService(coreDataStack: coreDataStack)
accountService.createOrUpdateAccount(withAuthToken: authToken, success: { account in
guard let account else {
onFailure(URLError(.unknown))
return
}
self.syncOrAssociateBlogs(account: account, isJetpackLogin: isJetpackLogin, onSuccess: onSuccess, onFailure: onFailure)
}, failure: { error in
onFailure(error)
Expand Down