Merge pull request #19756 from wordpress-mobile/fix/delete-credentials-when-blog-removed

dvdchr · web-flow · commit a0f249b3082c · 2022-12-10T00:28:01.000+07:00
Remove self-hosted credentials from keychain when the site is removed
diff --git a/WordPress/Classes/Models/Blog.m b/WordPress/Classes/Models/Blog.m
@@ -105,6 +105,11 @@ - (void)prepareForDeletion
 {
     [super prepareForDeletion];
 
+    // delete stored password in the keychain for self-hosted sites.
+    if ([self.username length] > 0 && [self.xmlrpc length] > 0) {
+        self.password = nil;
+    }
+
     [_xmlrpcApi invalidateAndCancelTasks];
     [_wordPressOrgRestApi invalidateAndCancelTasks];
 }

Original file line number	Diff line number	Diff line change
`@@ -105,6 +105,11 @@ - (void)prepareForDeletion`
`105`	`105`	`{`
`106`	`106`	`[super prepareForDeletion];`
`107`	`107`
	`108`	`+ // delete stored password in the keychain for self-hosted sites.`
	`109`	`+ if ([self.username length] > 0 && [self.xmlrpc length] > 0) {`
	`110`	`+ self.password = nil;`
	`111`	`+ }`
	`112`	`+`
`108`	`113`	`[_xmlrpcApi invalidateAndCancelTasks];`
`109`	`114`	`[_wordPressOrgRestApi invalidateAndCancelTasks];`
`110`	`115`	`}`