login to imap and smtp via chrome identity api works

.gitignore

@@ -1,2 +1,3 @@
 node_modules
 .DS_Store
+*-browserified.js

package.json

@@ -10,11 +10,13 @@
 		"start": "grunt prod"
 	},
 	"dependencies": {
-		"grunt": "~0.4.1",
+		"crypto-lib": "https://github.com/whiteout-io/crypto-lib/tarball/master",
-		"grunt-contrib-connect": "~0.3.0",
+		"imap-client": "git+ssh://git@github.com:whiteout-io/imap-client.git#master",
-		"crypto-lib": "https://github.com/whiteout-io/crypto-lib/tarball/master"
+		"smtp-client": "git+ssh://git@github.com:whiteout-io/smtp-client.git#master"
 	},
 	"devDependencies": {
+		"grunt": "~0.4.1",
+		"grunt-contrib-connect": "~0.3.0",
 		"grunt-contrib-jshint": "~0.5.3",
 		"grunt-contrib-qunit": "~0.2.1"
 	}

res/copy-deps.sh

@@ -6,5 +6,19 @@ echo "--> copying dependencies to src\n"
 cd `dirname $0`
 cd ..
 
+# copy crypto lib
 cp ./node_modules/crypto-lib/src/*.js ./src/js/crypto/
-cp ./node_modules/crypto-lib/node_modules/node-forge/js/*.js ./src/lib/
+cp ./node_modules/crypto-lib/node_modules/node-forge/js/*.js ./src/lib/
+
+# build imap/smtp modules and copy
+cd ./node_modules/imap-client/
+npm install && node build.js
+cp ./src-gen/*.js ../../src/lib/
+cd ../../
+
+cd ./node_modules/smtp-client/
+npm install && node build.js
+cp ./src-gen/*.js ../../src/lib/
+cd ../../
+
+echo "\n--> finished copying dependencies.\n"

src/index.js

@@ -1,20 +1,11 @@
 require(['jquery', 'js/app-controller', 'js/app-config'], function($, controller, app) {
 	'use strict';
 
-	chrome.identity.getAuthToken({
-		'interactive': true
-	}, function(token) {
-		console.log(token);
-		// Use the token.
-	});
-
 	/**
 	 * Load templates and start the application
 	 */
 	$(document).ready(function() {
-		controller.init(function() {
+		controller.start(startApp);
-			controller.start(startApp);
-		});
 	});
 
 	function startApp() {

src/js/app-controller.js

@@ -1,23 +1,13 @@
 /**
  * The main application controller
  */
-define(['jquery', 'js/dao/email-dao', 'js/dao/keychain-dao', 'js/dao/cloudstorage-dao',
+define(['jquery', 'ImapClient', 'SmtpClient', 'js/dao/email-dao', 'js/dao/keychain-dao',
-		'js/app-config', 'cordova'
+	'js/dao/cloudstorage-dao', 'js/app-config', 'cordova'
-], function($, EmailDAO, KeychainDAO, cloudstorage, app) {
+], function($, ImapClient, SmtpClient, EmailDAO, KeychainDAO, cloudstorage, app) {
 	'use strict';
 
-	var self = {};
+	var self = {},
-
+		emailDao;
-	var emailDao;
-
-	/**
-	 * Initializes modules through dependecy injection
-	 */
-	self.init = function(callback) {
-		var keychain = new KeychainDAO(cloudstorage);
-		emailDao = new EmailDAO(cloudstorage, keychain);
-		callback();
-	};
 
 	/**
 	 * Start the application by loading the view templates
@@ -25,7 +15,7 @@ define(['jquery', 'js/dao/email-dao', 'js/dao/keychain-dao', 'js/dao/cloudstorag
 	self.start = function(callback) {
 		// the views to load
 		var views = ['login', 'compose', 'folderlist', 'messagelist',
-				'messagelistitem', 'read'
+			'messagelistitem', 'read'
 		];
 
 		// are we running in native app or in browser?
@@ -49,7 +39,7 @@ define(['jquery', 'js/dao/email-dao', 'js/dao/keychain-dao', 'js/dao/cloudstorag
 	self.execute = function(cmd, args, callback) {
 		if (cmd === 'login') {
 			// login user
-			login(args.userId, args.password, function(err) {
+			fetchOAuthToken(args.userId, args.password, function(err) {
 				callback({
 					err: err
 				});
@@ -102,8 +92,52 @@ define(['jquery', 'js/dao/email-dao', 'js/dao/keychain-dao', 'js/dao/cloudstorag
 	// Helper methods
 	//
 
-	function login(userId, password, callback) {
+	function fetchOAuthToken(userId, password, callback) {
+		// get OAuth Token from chrome
+		chrome.identity.getAuthToken({
+				'interactive': true
+			},
+			function(token) {
+				login(userId, password, token, callback);
+			}
+		);
+	}
+
+	function login(userId, password, token, callback) {
+		var auth, imapOptions, smtpOptions,
+			keychain, imapClient, smtpClient;
+
+		// create mail credentials objects for imap/smtp
+		auth = {
+			XOAuth2: {
+				user: userId,
+				clientId: '440907777130.apps.googleusercontent.com',
+				accessToken: token
+			}
+		};
+		imapOptions = {
+			secure: true,
+			port: 993,
+			host: 'imap.gmail.com',
+			auth: auth
+		};
+		smtpOptions = {
+			secure: true,
+			port: 465,
+			host: 'smtp.gmail.com',
+			auth: auth
+		};
+
+		// init objects and inject dependencies
+		keychain = new KeychainDAO(cloudstorage);
+		imapClient = new ImapClient(imapOptions);
+		smtpClient = new SmtpClient(smtpOptions);
+		emailDao = new EmailDAO(cloudstorage, keychain, imapClient, smtpClient);
+
+		// init email dao
 		var account = new app.model.Account({
+			imapOptions: imapOptions,
+			smtpOptions: smtpOptions,
 			emailAddress: userId,
 			symKeySize: app.config.symKeySize,
 			symIvSize: app.config.symIvSize,

src/js/dao/email-dao.js

@@ -3,11 +3,11 @@
  * between the cloud service and the device's local storage
  */
 define(['underscore', 'cryptoLib/util', 'js/crypto/crypto', 'js/dao/lawnchair-dao',
-		'js/dao/devicestorage-dao', 'js/app-config', 'js/model/account-model'
+	'js/dao/devicestorage-dao', 'js/app-config', 'js/model/account-model'
 ], function(_, util, crypto, jsonDB, devicestorage, app) {
 	'use strict';
 
-	var EmailDAO = function(cloudstorage, keychain) {
+	var EmailDAO = function(cloudstorage, keychain, imapClient, smtpClient) {
 		var self = this;
 
 		/**
@@ -25,18 +25,30 @@ define(['underscore', 'cryptoLib/util', 'js/crypto/crypto', 'js/dao/lawnchair-da
 				return;
 			}
 
-			// init user's local database
+			// login IMAP client if existent
-			jsonDB.init(emailAddress);
+			if (imapClient) {
+				imapClient.login(function() {
+					console.log('logged into imap.');
+					initKeychain();
+				});
+			} else {
+				initKeychain();
+			}
 
-			// call getUserKeyPair to read/sync keypair with devicestorage/cloud
+			function initKeychain() {
-			keychain.getUserKeyPair(emailAddress, function(err, storedKeypair) {
+				// init user's local database
-				if (err) {
+				jsonDB.init(emailAddress);
-					callback(err);
+
-					return;
+				// call getUserKeyPair to read/sync keypair with devicestorage/cloud
-				}
+				keychain.getUserKeyPair(emailAddress, function(err, storedKeypair) {
-				// init crypto
+					if (err) {
-				initCrypto(storedKeypair);
+						callback(err);
-			});
+						return;
+					}
+					// init crypto
+					initCrypto(storedKeypair);
+				});
+			}
 
 			function initCrypto(storedKeypair) {
 				crypto.init({
@@ -300,10 +312,15 @@ define(['underscore', 'cryptoLib/util', 'js/crypto/crypto', 'js/dao/lawnchair-da
 			}
 
 			function send(email) {
-				// send email to cloud service
+				if (smtpClient) {
-				cloudstorage.deliverEmail(email, userId, recipient, function(err) {
+					// send email directly client side
-					callback(err);
+					smtpClient.send(email, callback);
-				});
+				} else {
+					// send email via cloud service
+					cloudstorage.deliverEmail(email, userId, recipient, function(err) {
+						callback(err);
+					});
+				}
 			}
 		};
 	};

src/js/view/login-view.js

@@ -23,7 +23,7 @@ define(['jquery', 'underscore', 'backbone', 'js/app-config'], function($, _, Bac
 
 		login: function() {
 			var page = $(this.el),
-				userId = page.find('#userId').val() + '@mail.whiteout.io',
+				userId = page.find('#userId').val(),
 				password = page.find('#password').val();
 
 			// show loading msg during init

src/manifest.json

@@ -8,14 +8,16 @@
     "128": "css/images/mail-128.png"
   },
   "permissions": [
-      "https://storage.whiteout.io/",
+    "https://storage.whiteout.io/",
-      "identity"
+    "identity", {
+      "socket": ["tcp-connect"]
+    }
   ],
   "key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDBXqC3/oX5fP/gLORcVN62Pf3Ph+pO4qEB+FynSMWMoqWUt7FDoaKuHrsP/KInuP/0PUZcqpij9kB9MytLTqYzGIoRsUd37i1Dt6R69fnNsIqAISgoWIRg4VyRdon9cTIniv3DVV45PPyNCvN+oQoBMv9NbojWnlL9W05bKYkABQIDAQAB",
   "oauth2": {
     "client_id": "440907777130.apps.googleusercontent.com",
     "scopes": [
-        "https://mail.google.com/"
+      "https://mail.google.com/"
     ]
   },
   "app": {

src/require-config.js

@@ -14,7 +14,9 @@
 			lawnchair: 'lawnchair/lawnchair-git',
 			lawnchairSQL: 'lawnchair/lawnchair-adapter-webkit-sqlite-git',
 			lawnchairIDB: 'lawnchair/lawnchair-adapter-indexed-db-git',
-			cordova: 'cordova-2.5.0'
+			cordova: 'cordova-2.5.0',
+			ImapClient: 'imap-client-browserified',
+			SmtpClient: 'smtp-client-browserified'
 		},
 		shim: {
 			lawnchair: {

src/tpl/login.html

@@ -7,9 +7,9 @@
   <div id="loginForm">
     <h3>Please sign in</h3>
     <label for="userId" class="ui-hidden-accessible">Username:</label>
-    <input type="email" name="user" id="userId" value="" placeholder="user" data-theme="a">
+    <input type="email" name="user" id="userId" value="safewithme.testuser@gmail.com" placeholder="user" data-theme="a">
     <label for="password" class="ui-hidden-accessible">Password:</label>
-    <input type="password" name="pass" id="password" value="" placeholder="password" data-theme="a">
+    <input type="password" name="pass" id="password" value="passphrase" placeholder="password" data-theme="a">
     <input type="button" data-theme="b" data-icon="check" id="loginBtn" value="Sign in">
   </div>
 </div><!-- /content -->