[Pkg-mozext-commits] [gcontactsync] 06/19: Issue #69: 'This login already exists' erorr when creating an account wiht an identical e-mail address

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository gcontactsync.

commit 9972f19e96ac5e1fc2b9ae069c09a45994b3e4f9
Author: Josh Geenen <joshgeenen at gmail.com>
Date:   Sun Mar 29 16:45:32 2015 -0500

    Issue #69: 'This login already exists' erorr when creating an account wiht an identical e-mail address
---
 src/content/AccountSetupWizard.js        | 5 ++++-
 src/locale/en-US/gcontactsync.properties | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/content/AccountSetupWizard.js b/src/content/AccountSetupWizard.js
index fd3c732..02f0388 100644
--- a/src/content/AccountSetupWizard.js
+++ b/src/content/AccountSetupWizard.js
@@ -175,7 +175,7 @@ com.gContactSync.AccountSetupWizard = {
         nextPage = "settingsPage";
       }
     } else {
-      var emailElem    = document.getElementById("email");
+      var emailElem = document.getElementById("email");
       this.mEmailAddress = emailElem.value;
       // This is a primitive way of validating an e-mail address, but Google takes
       // care of the rest.  It seems to allow getting an auth token w/ only the
@@ -184,6 +184,9 @@ com.gContactSync.AccountSetupWizard = {
       if (this.mEmailAddress.indexOf("@") < 1) {
         com.gContactSync.alertError(com.gContactSync.StringBundle.getStr("invalidEmail"));
         return false;
+      } else if (this.accountAlreadyExists(this.mEmailAddress)) {
+        com.gContactSync.alertError(com.gContactSync.StringBundle.getStr("emailAlreadyExists"));
+        return false;
       }
     }
 
diff --git a/src/locale/en-US/gcontactsync.properties b/src/locale/en-US/gcontactsync.properties
index 7b84606..df02d59 100644
--- a/src/locale/en-US/gcontactsync.properties
+++ b/src/locale/en-US/gcontactsync.properties
@@ -33,6 +33,7 @@ errDuringSync=Error during sync. Click here to view the log.
 offlineErr=Please try to login again when you are online.\nIf you are online and believe this is mistake, please e-mail gcontactsync at pirules dot org.
 authErr=Error encountered while authenticating.\nPlease make sure you typed your e-mail address and password correctly\nand that your e-mail address is valid.
 invalidEmail=Please enter your full e-mail address, not just your username.
+emailAlreadyExists=An account with this e-mail address already exists.  Select the existing account or enter a new e-mail address to continue.
 loggingDisabled=Logging is disabled.  Go in the Preferences and enable logging if you want to view the log file.
 tokenExpired=Login expired.
 tokenExpiredMsg=Your authentication token from Google has expired.  Please click OK then enter your credentials to get a new token and Synchronize your contacts.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/gcontactsync.git