Merge pull request #366 from uProxy/gitlaura-remove-cloud-friend

Remove cloud friend from storage

Author: gitlaura

src/cloud/social/provider.ts

@@ -262,14 +262,15 @@ export class CloudSocialProvider {
   }
 
   // Saves contacts to storage.
-  private saveContacts_ = () => {
+  private saveContacts_ = (): Promise<void> => {
     log.debug('saveContacts');
-    this.storage_.set(STORAGE_KEY, JSON.stringify(<SavedContacts>{
+    return this.storage_.set(STORAGE_KEY, JSON.stringify(<SavedContacts>{
       contacts: Object.keys(this.savedContacts_).map(key => this.savedContacts_[key])
     })).then((unused: string) => {
       log.debug('saved contacts');
-    }, (e: Error) => {
+    }).catch((e) => {
       log.error('could not save contacts: %1', e);
+      Promise.reject(e);
     });
   }
 
@@ -391,9 +392,19 @@ export class CloudSocialProvider {
         new Error('blockUser unimplemented'));
   }
 
-  public removeUser = (userId: string): Promise<void> => {
-    return Promise.reject(
-        new Error('removeUser unimplemented'));
+  // Removes a cloud contact from storage
+  public removeUser = (host: string): Promise<void> => {
+    log.debug('removeUser %1', host);
+    if (!(host in this.savedContacts_)) {
+      // Do not return an error because result is as expected.
+      log.warn('cloud contact %1 is not in %2 - cannot remove from storage', host, STORAGE_KEY);
+      return Promise.resolve<void>();
+    }
+    // Remove host from savedContacts and clients
+    delete this.savedContacts_[host];
+    delete this.clients_[host];
+    // Update storage with this.savedContacts_
+    return this.saveContacts_();
   }
 }