Allows very simple mail adapters

- Fix nasty bug when updating users email and sending verification

src/Controllers/UserController.js

@@ -5,6 +5,7 @@ import MailAdapter from '../Adapters/Email/MailAdapter';
 
 var DatabaseAdapter = require('../DatabaseAdapter');
 var RestWrite = require('../RestWrite');
+var RestQuery = require('../RestQuery');
 var hash = require('../password').hash;
 var Auth = require('../Auth');
 
@@ -84,20 +85,47 @@ export class UserController extends AdaptableController {
     });
   }
   
+  getUserIfNeeded(user) {
+    if (user.username && user.email) {
+      return Promise.resolve(user);
+    }
+    var where = {};
+    if (user.username) {
+      where.username = user.username;
+    }
+    if (user.email) {
+      where.email = user.email;
+    }
+    
+    var query = new RestQuery(this.config, Auth.master(this.config), '_User', where);
+    return query.execute().then(function(result){
+      if (result.results.length != 1) {
+        return Promise.reject();
+      }
+      return result.results[0];
+    })
+  }
+  
 
   sendVerificationEmail(user) {
     if (!this.shouldVerifyEmails) {
       return;
     }
-    
-    const token = encodeURIComponent(user._email_verify_token);
-    const username = encodeURIComponent(user.username);
-   
-    let link = `${this.config.verifyEmailURL}?token=${token}&username=${username}`;
-    this.adapter.sendVerificationEmail({
-      appName: this.config.appName,
-      link: link,
-      user: inflate('_User', user),
+    // We may need to fetch the user in case of update email
+    this.getUserIfNeeded(user).then((user) => {
+      const token = encodeURIComponent(user._email_verify_token);
+      const username = encodeURIComponent(user.username);
+      let link = `${this.config.verifyEmailURL}?token=${token}&username=${username}`;
+      let options = {
+        appName: this.config.appName,
+        link: link,
+        user: inflate('_User', user),
+      };
+      if (this.adapter.sendVerificationEmail) {
+        this.adapter.sendVerificationEmail(options);
+      } else {
+        this.adapter.sendMail(this.defaultVerificationEmail(options));
+      }
     });
   }
   
@@ -134,11 +162,23 @@ export class UserController extends AdaptableController {
       const token = encodeURIComponent(user._perishable_token);
       const username = encodeURIComponent(user.username);    
       let link = `${this.config.requestResetPasswordURL}?token=${token}&username=${username}`
-      this.adapter.sendPasswordResetEmail({
-        appName: this.config.appName,
-        link: link,
-        user: inflate('_User', user),
-      });
+      
+      if (!user.username) {
+        console.log('No username...');
+      }
+      
+      let options = {
+          appName: this.config.appName,
+          link: link,
+          user: inflate('_User', user),
+        };
+      
+      if (this.adapter.sendPasswordResetEmail) {
+        this.adapter.sendPasswordResetEmail(options);
+      } else {
+        this.adapter.sendMail(this.defaultResetPasswordEmail(options));
+      }
+
       return Promise.resolve(user);
     });
   }
@@ -148,6 +188,26 @@ export class UserController extends AdaptableController {
      return updateUserPassword(username, token, password, this.config);
    });
   }
+  
+  defaultVerificationEmail({link, user, appName, }) {
+    let text = "Hi,\n\n" +
+	      "You are being asked to confirm the e-mail address " + user.email + " with " + appName + "\n\n" +
+	      "" +
+	      "Click here to confirm it:\n" + link;
+    let to = user.get("email");
+    let subject = 'Please verify your e-mail for ' + appName;
+    return { text, to, subject };
+  }
+  
+  defaultResetPasswordEmail({link, user, appName, }) {
+    let text = "Hi,\n\n" + 
+        "You requested to reset your password for " + appName + ".\n\n" +
+        "" +
+        "Click here to reset it:\n" + link;
+    let to = user.get("email");
+    let subject =  'Password Reset for ' + appName;
+    return { text, to, subject };
+  }
 }
 
 // Mark this private