Merge pull request #1836 from matiaspando/existingProfile

Existing profile

js/controllers/importProfile.js

@@ -27,9 +27,18 @@ angular.module('copayApp.controllers').controller('ImportProfileController',
         walletDefaults: config.wallet,
         passphraseConfig: config.passphraseConfig,
       }, function(err, iden) {
-        if (err && !iden) {
+        if (err) {
           $scope.loading = false;
-          $scope.error = (err.toString() || '').match('BADSTR') ? 'Bad password or corrupt profile file' : 'Unknown error';
+
+          if ((err.toString() || '').match('BADSTR')) {
+            $scope.error = 'Bad password or corrupt profile file';
+          } else if ((err.toString() || '').match('EEXISTS')) {
+            $scope.error = 'Profile already exists';
+          } else {
+            $scope.error = 'Unknown error';
+          }
+          $scope.$digest();
+
         } else {
           var firstWallet = iden.getLastFocusedWallet();
           controllerUtils.bindProfile($scope, iden, firstWallet);

js/models/Identity.js

@@ -299,11 +299,14 @@ Identity.prototype.importWalletFromObj = function(obj, opts, cb) {
     log.debug('Adding wallet to profile:' + w.getName());
     self.addWallet(w);
     self.bindWallet(w);
+
+    var writeOpts = _.extend({
+      noWallets: true
+    }, opts);
+
     self.storeWallet(w, function(err) {
       if (err) return cb(err);
-      self.store({
-        noWallets: true
-      }, function(err) {
+      self.store(writeOpts, function(err) {
         return cb(err, w);
       });
     });
@@ -327,7 +330,6 @@ Identity.importFromEncryptedFullJson = function(ejson, password, opts, cb) {
   var crypto = opts.cryptoUtil || cryptoUtil;
 
   var str = crypto.decrypt(password, ejson);
-
   if (!str) {
     // 0.7.3 broken KDF
     log.debug('Trying legacy encryption...');
@@ -360,9 +362,16 @@ Identity.importFromFullJson = function(str, password, opts, cb) {
 
   var iden = new Identity(opts);
 
+  opts.failIfExists = true;
+
   json.wallets = json.wallets || {};
 
+  iden.store(opts, function(err) {
+    if (err) return cb(err); //profile already exists
+
+    opts.failIfExists = false;
     async.map(json.wallets, function(walletData, callback) {
+
       if (!walletData)
         return callback();
 
@@ -374,10 +383,14 @@ Identity.importFromFullJson = function(str, password, opts, cb) {
     }, function(err, results) {
       if (err) return cb(err);
 
-    iden.store(null, function(err) {
+      iden.store(opts, function(err) {
         return cb(err, iden);
       });
     });
+
+  });
+
+
 };
 
 Identity.prototype.bindWallet = function(w) {