remove promises (simplify), rename auth, add login page

sedenardi · sedenardi · commit d4c370fbb032 · 2016-11-27T23:26:15.000-05:00
diff --git a/auth.js b/auth.js
diff --git a/authentication.js b/authentication.js
@@ -0,0 +1,20 @@
+'use strict';
+
+const users = {
+  user1: 'pass1',
+  user2: 'pass2'
+};
+
+module.exports = {
+  auth: (user, pass) => {
+    if (!user || !pass) {
+      return { success: false, message: 'Must provide username and password.' };
+    } else if (!users[user]) {
+      return { success: false, message: 'User doesn\'t exist.' };
+    } else if (users[user] !== pass) {
+      return { success: false, message: 'Incorrect password.' };
+    } else {
+      return { success: true };
+    }
+  }
+};
diff --git a/index.js b/index.js
@@ -1,34 +1,37 @@
 'use strict';
 
 const cookie = require('cookie');
-
-const auth = require('./auth');
+const fs = require('fs');
+const path = require('path');
+const authentication = require('./authentication');
 const session = require('./session');
 
+const loginPath = path.resolve(__dirname, './login.html');
+
 module.exports = {
   post: (event, context) => {
     const user = event.data.username;
     const pass = event.data.password;
-    auth(user, pass).then((authRes) => {
-      if (res) {
-        session.set(user).then((cookie) => {
-          return context.done(null, Object.assign(authRes, cookie));
-        });
-      } else {
-        return context.done(null, authRes)
-      }
-    });
+    const authRes = authentication.auth(user, pass);
+    if (authRes) {
+      const cookie = session.set(user);
+      return context.done(null, Object.assign(authRes, cookie));
+    } else {
+      return context.done(null, authRes)
+    }
   },
   get: (event, context) => {
     const cookieStr = event.headers ? (event.headers.Cookie || '') : '';
     const cookies = cookie.parse(cookieStr);
-    session.get(cookies).then((sessionRes) => {
-      if (sessionRes) {
-        // authenticated
-
-      } else {
-        
-      }
-    });
+    const sessionRes = session.get(cookies);
+    if (sessionRes.valid) {
+      // authenticated
+      return context.done(null, `Logged in as: ${sessionRes.user}`)
+    } else {
+      fs.readFile(loginPath, (err, res) => {
+        if (err) { return context.done(err); }
+        return context.done(null, res.toString());
+      });
+    }
   }
 };
diff --git a/login.html b/login.html
@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<html>
+  <body>
+    <h2>Login</h2>
+    <div>
+      <label>Username:</label>
+      <input type="text" name="username" id="username"/>
+    </div>
+    <div>
+      <label>Password:</label>
+      <input type="password" name="password" id="password"/>
+    </div>
+    <div>
+      <span id="result"></span>
+    </div>
+    <div>
+      <button id="submit">Log In</button>
+    </div>
+    <script>
+      var post = function() {
+        var data = {
+          username: document.getElementById('username').value,
+          password: document.getElementById('password').value
+        };
+        var req = new XMLHttpRequest();
+        req.onreadystatechange = function() {
+          if (req.readyState == XMLHttpRequest.DONE ) {
+             if (req.status == 200) {
+               var res = JSON.parse(req.responseText);
+               if (res.Success) {
+                 location.reload();
+               } else {
+                 document.getElementById('result').innerHTML = res.message;
+               }
+             } else {
+               document.getElementById('result').innerHTML = 'Unknown error.';
+             }
+          }
+        };
+        req.open('POST', '', true);
+        req.setRequestHeader('Content-Type', 'application/json;charset=UTF-8');
+        req.send(JSON.stringify(data));
+      }
+      document.getElementById('submit').addEventListener('click', post);
+    </script>
+  </body>
+</html>
diff --git a/session.js b/session.js
@@ -5,22 +5,18 @@ const cookiePrefix = 'Session::';
 
 module.exports = {
   set: (user) => {
-    return new Promise((resolve, reject) => {
-      const sessionId = `${cookiePrefix}${user}`;
-      const newCookie = `${cookieKey}=${sessionId}`;
-      return resolve({ Cookie: newCookie });
-    });
+    const sessionId = `${cookiePrefix}${user}`;
+    const newCookie = `${cookieKey}=${sessionId}`;
+    return { Cookie: newCookie };
   },
   get: (cookies) => {
-    return new Promise((resolve, reject) => {
-      if (!cookies[cookieKey]) {
-        return resolve(false);
-      }
-      const user = cookies[cookieKey].replace(cookiePrefix, '');
-      if (!user) {
-        return resolve(false);
-      }
-      return resolve(true);
-    });
+    if (!cookies[cookieKey]) {
+      return { valid: false };
+    }
+    const user = cookies[cookieKey].replace(cookiePrefix, '');
+    return {
+      valid: !!user,
+      user: user
+    };
   }
 };
