Merge pull request #9705 from cmgustavo/ref/profile-file-storage-02

WIP ref(file-storage): adds more console.log
bitpay · May 10, 2019 · 2c33b95 · 2c33b95
2 parents 74e9698 + b3dc4db
commit 2c33b95
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 28 deletions.
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
@@ -217,11 +217,21 @@ export class CopayApp {
         this.onProfileLoad(profile);
       })
       .catch((err: Error) => {
-        this.logger.warn('LoadAndBindProfile', err.message);
-        this.rootPage =
-          err.message == 'ONBOARDINGNONCOMPLETED: Onboarding non completed'
-            ? OnboardingPage
-            : DisclaimerPage;
+        switch (err.message) {
+          case 'NONAGREEDDISCLAIMER':
+            this.logger.warn('Non agreed disclaimer');
+            this.rootPage = DisclaimerPage;
+            break;
+          case 'ONBOARDINGNONCOMPLETED':
+            this.logger.warn('Onboarding non completed');
+            this.rootPage = OnboardingPage;
+            break;
+          default:
+            this.popupProvider.ionicAlert(
+              'Could not initialize the app',
+              err.message
+            );
+        }
       });
   }
 

diff --git a/src/models/profile/profile.model.ts b/src/models/profile/profile.model.ts
@@ -12,19 +12,20 @@ export class Profile {
     this.version = '1.0.0';
   }
 
-  static create(opts?): Profile {
-    opts = opts ? opts : {};
+  static create(): Profile {
     let x = new Profile();
     x.createdOn = Date.now();
-    x.credentials = opts.credentials || [];
+    x.credentials = [];
     x.disclaimerAccepted = false;
     x.onboardingCompleted = false;
     x.checked = {};
     return x;
   }
 
   static fromObj(obj): Profile {
-    obj = obj ? obj : {};
+    if (!obj || typeof obj != 'object') {
+      throw new Error('Wrong params at Profile.fromObj: ' + obj);
+    }
     let x = new Profile();
     x.createdOn = obj.createdOn;
     x.credentials = obj.credentials || [];

diff --git a/src/providers/persistence/storage/file-storage.ts b/src/providers/persistence/storage/file-storage.ts
@@ -117,11 +117,13 @@ export class FileStorage implements IStorage {
           return new Promise((resolve, reject) => {
             fileEntry.createWriter(fileWriter => {
               fileWriter.onwriteend = () => {
+                this.log.debug('Successful file write...');
                 return resolve();
               };
 
-              fileWriter.onerror = () => {
-                return reject();
+              fileWriter.onerror = e => {
+                this.log.error('Failed file write: ' + e.toString());
+                return reject(e.toString());
               };
 
               if (_.isObject(v)) v = JSON.stringify(v);

diff --git a/src/providers/profile/profile.ts b/src/providers/profile/profile.ts
@@ -372,7 +372,14 @@ export class ProfileProvider {
 
   public updateCredentials(credentials): void {
     this.profile.updateWallet(credentials);
-    this.persistenceProvider.storeProfile(this.profile);
+    this.persistenceProvider.storeProfile(this.profile).then(
+      () => {
+        this.logger.debug('Updated modified Profile(updateCredentials)');
+      },
+      e => {
+        this.logger.error('Could not save Profile(updateCredentials)', e);
+      }
+    );
   }
 
   private runValidation(wallet, delay?: number, retryDelay?: number) {
@@ -421,10 +428,16 @@ export class ProfileProvider {
 
   public storeProfileIfDirty(): void {
     if (this.profile.dirty) {
-      this.persistenceProvider.storeProfile(this.profile).then(() => {
-        this.logger.debug('Saved modified Profile');
-        return;
-      });
+      this.persistenceProvider.storeProfile(this.profile).then(
+        () => {
+          this.logger.debug('Saved modified Profile');
+          return;
+        },
+        e => {
+          this.logger.error('Could not save Profile(Dirty)', e);
+          return;
+        }
+      );
     } else {
       return;
     }
@@ -688,11 +701,17 @@ export class ProfileProvider {
 
     this.saveBwsUrl(walletId, opts);
 
-    return this.persistenceProvider.storeProfile(this.profile).then(() => {
-      if (!opts.skipEvent) this.events.publish('Local/WalletListChange');
+    return this.persistenceProvider.storeProfile(this.profile).then(
+      () => {
+        if (!opts.skipEvent) this.events.publish('Local/WalletListChange');
 
-      return Promise.resolve(wallet);
-    });
+        return Promise.resolve(wallet);
+      },
+      e => {
+        this.logger.error('Could not save Profile(addAndBindWalletClient)', e);
+        return Promise.reject(e);
+      }
+    );
   }
 
   private saveBwsUrl(walletId, opts): void {
@@ -931,9 +950,7 @@ export class ProfileProvider {
                   return resolve();
                 })
                 .catch(() => {
-                  return reject(
-                    new Error('NONAGREEDDISCLAIMER: Non agreed disclaimer')
-                  );
+                  return reject(new Error('NONAGREEDDISCLAIMER'));
                 });
             })
             .catch(() => {
@@ -948,11 +965,7 @@ export class ProfileProvider {
                     });
                 })
                 .catch(() => {
-                  return reject(
-                    new Error(
-                      'ONBOARDINGNONCOMPLETED: Onboarding non completed'
-                    )
-                  );
+                  return reject(new Error('ONBOARDINGNONCOMPLETED'));
                 });
             });
         })