Przeglądaj źródła

Implement simple auth

Johannes Zellner 11 lat temu
rodzic
commit
2d57bdaf11
8 zmienionych plików z 356 dodań i 240 usunięć
  1. 11 48
      app.js
  2. 155 122
      frontend/index.html
  3. 63 48
      frontend/js/core.js
  4. 60 17
      frontend/js/main.js
  5. 3 2
      frontend/js/settings.js
  6. 1 1
      frontend/js/thing.js
  7. 2 1
      package.json
  8. 61 1
      src/routes.js

+ 11 - 48
app.js

@@ -5,74 +5,37 @@
 require('supererror')({ splatchError: true });
 
 var express = require('express'),
-    passport = require('passport'),
     json = require('body-parser').json,
-    cookieParser = require('cookie-parser'),
-    session = require('express-session'),
-    CloudronStrategy = require('passport-cloudron'),
     cors = require('cors'),
     routes = require('./src/routes.js'),
     things = require('./src/things.js'),
     lastmile = require('connect-lastmile'),
     serveStatic = require('serve-static');
 
-passport.serializeUser(function (user, done) {
-    console.log('Now serializeUser', user);
-    done(null, user.id);
-});
-
-passport.deserializeUser(function (id, done) {
-    console.log('Now deserializeUser', id);
-    done(null, { id: id });
-});
-
-passport.use(new CloudronStrategy({
-        callbackURL: 'http://localhost:3000/auth/cloudron/callback'
-    }, function verify(token, tokenSecret, profile, done) {
-        done(null, profile);
-    }
-));
-
-function auth(req, res, next) {
-    if (process.env.NO_AUTH) return next();
-    if (req.isAuthenticated()) return next();
-
-    res.status(401).end();
-}
-
 var app = express();
 var router = new express.Router();
 
 router.del = router.delete;
 
-router.post('/api/things', auth, routes.add);
-router.get ('/api/things', auth, routes.getAll);
-router.get ('/api/things/:id', auth, routes.get);
-router.put ('/api/things/:id', auth, routes.put);
-router.del ('/api/things/:id', auth, routes.del);
+router.post('/api/things', routes.auth, routes.add);
+router.get ('/api/things', routes.auth, routes.getAll);
+router.get ('/api/things/:id', routes.auth, routes.get);
+router.put ('/api/things/:id', routes.auth, routes.put);
+router.del ('/api/things/:id', routes.auth, routes.del);
 
-router.get ('/api/tags', auth, routes.getTags);
+router.get ('/api/tags', routes.auth, routes.getTags);
 
-router.post('/api/settings', auth, routes.settingsSave);
-router.get ('/api/settings', auth, routes.settingsGet);
+router.post('/api/settings', routes.auth, routes.settingsSave);
+router.get ('/api/settings', routes.auth, routes.settingsGet);
 
-router.get ('/api/export', auth, routes.exportThings);
+router.get ('/api/export', routes.auth, routes.exportThings);
 
-router.get ('/auth/cloudron/callback', passport.authenticate('cloudron', { successRedirect: '/', failureRedirect: '/auth/login' }));
-
-router.get ('/auth/login', passport.authenticate('cloudron'));
-router.get ('/auth/logout', function (req, res) {
-    req.logout();
-    res.redirect('/');
-});
+router.post('/api/login', routes.login);
+router.get ('/api/logout', routes.logout);
 
 app.use(serveStatic(__dirname + '/public'));
 app.use(cors());
 app.use(json({ strict: true }));
-app.use(cookieParser());
-app.use(session({ secret: 'holy guacamoly' }));
-app.use(passport.initialize());
-app.use(passport.session());
 app.use(router);
 app.use(lastmile());
 

+ 155 - 122
frontend/index.html

@@ -24,162 +24,195 @@
   </head>
   <body id="application">
 
-    <div class="modal fade" id="modalAdd">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close">×</button>
-            <h4 class="modal-title">Add something</h4>
+    <div v-show="mainView === 'login'" v-cloak>
+      <div class="container" id="loginView">
+        <div class="row">
+          <div class="col-md-4 col-md-offset-4">
+            <h4 class="modal-title">Login</h4>
           </div>
-          <div class="modal-body">
-            <textarea class="form-control" id="inputContent" rows="8" v-model="content" autofocus></textarea>
+        </div>
+        <form v-on:submit.prevent="doLogin">
+          <div class="row">
+            <div class="col-md-4 col-md-offset-4">
+              <div class="form-group label-floating">
+                <label class="control-label" for="inputUsername">Username</label>
+                <input type="text" class="form-control" id="inputUsername" v-model="username" autofocus />
+              </div>
+            </div>
+            <div class="col-md-4 col-md-offset-4">
+              <div class="form-group label-floating">
+                <label class="control-label" for="inputPassword">Password</label>
+                <input type="password" class="form-control" id="inputPassword" v-model="password" autofocus />
+              </div>
+            </div>
           </div>
-          <div class="modal-footer">
-            <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-            <button type="button" class="btn btn-success" v-on:click="save">Save</button>
+          <div class="row">
+            <div class="col-md-4 col-md-offset-4">
+              <button type="submit" class="btn btn-success pull-right">Login</button>
+            </div>
           </div>
-        </div>
+        </form>
       </div>
     </div>
 
-    <div class="modal fade" id="modalEdit">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close">×</button>
-            <h4 class="modal-title">Edit</h4>
-          </div>
-          <div class="modal-body">
-            <textarea class="form-control" id="inputContent" rows="8" v-model="thing.content" autofocus></textarea>
-          </div>
-          <div class="modal-footer">
-            <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-            <button type="button" class="btn btn-success" v-on:click="save">Save</button>
+    <div v-show="mainView === 'content'" v-cloak>
+      <div class="modal fade" id="modalAdd">
+        <div class="modal-dialog">
+          <div class="modal-content">
+            <div class="modal-header">
+              <button type="button" class="close">×</button>
+              <h4 class="modal-title">Add something</h4>
+            </div>
+            <div class="modal-body">
+              <textarea class="form-control" id="inputContent" rows="8" v-model="content" autofocus></textarea>
+            </div>
+            <div class="modal-footer">
+              <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+              <button type="button" class="btn btn-success" v-on:click="save">Save</button>
+            </div>
           </div>
         </div>
       </div>
-    </div>
 
-    <div class="modal fade" id="modalDel">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <h4 class="modal-title">Really Delete this Thing?</h4>
-          </div>
-          <div class="modal-footer">
-            <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-            <button type="button" class="btn btn-danger" v-on:click="del">Delete</button>
+      <div class="modal fade" id="modalEdit">
+        <div class="modal-dialog">
+          <div class="modal-content">
+            <div class="modal-header">
+              <button type="button" class="close">×</button>
+              <h4 class="modal-title">Edit</h4>
+            </div>
+            <div class="modal-body">
+              <textarea class="form-control" id="inputContent" rows="8" v-model="thing.content" autofocus></textarea>
+            </div>
+            <div class="modal-footer">
+              <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+              <button type="button" class="btn btn-success" v-on:click="save">Save</button>
+            </div>
           </div>
         </div>
       </div>
-    </div>
 
-    <div class="settings" id="settings">
-      <div class="backdrop hide" v-on:click="toggleSettings" v-bind:class="{ 'open': open }"></div>
-      <div class="action">
-        <button class="btn btn-default btn-fab" v-on:click="toggleSettings"><i class="fa fa-cog"></i></button>
-      </div>
-      <div class="container" v-bind:class="{ 'open': open }">
-        <div class="row">
-          <div class="col-md-12">
-            <h4>Interface</h4>
+      <div class="modal fade" id="modalDel">
+        <div class="modal-dialog">
+          <div class="modal-content">
+            <div class="modal-header">
+              <h4 class="modal-title">Really Delete this Thing?</h4>
+            </div>
+            <div class="modal-footer">
+              <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+              <button type="button" class="btn btn-danger" v-on:click="del">Delete</button>
+            </div>
           </div>
         </div>
-        <div class="row">
-          <form class="form-horizontal">
-            <div class="form-group">
-              <label htmlFor="inputTitle" class="col-sm-4 control-label">Title</label>
-              <div class="col-sm-7">
-                <input type="text" class="form-control" id="inputTitle" v-model="settings.title" placeholder="Title" />
-              </div>
+      </div>
+
+      <div class="settings" id="settings">
+        <div class="backdrop hide" v-on:click="toggleSettings" v-bind:class="{ 'open': open }"></div>
+        <div class="action">
+          <button class="btn btn-default btn-fab" v-on:click="toggleSettings"><i class="fa fa-cog"></i></button>
+        </div>
+        <div class="container" v-bind:class="{ 'open': open }">
+          <div class="row">
+            <div class="col-md-12">
+              <h4>Interface</h4>
             </div>
-            <div class="form-group">
-              <label htmlFor="inputBackgroundImage" class="col-sm-4 control-label">Background</label>
-              <div class="col-sm-7">
-                <input type="text" class="form-control" id="inputBackgroundImage" v-model="settings.backgroundUrl" placeholder="url" />
+          </div>
+          <div class="row">
+            <form class="form-horizontal">
+              <div class="form-group">
+                <label htmlFor="inputTitle" class="col-sm-4 control-label">Title</label>
+                <div class="col-sm-7">
+                  <input type="text" class="form-control" id="inputTitle" v-model="settings.title" placeholder="Title" />
+                </div>
               </div>
-            </div>
-          </form>
-        </div>
-        <div class="row">
-          <div class="col-md-offset-1 col-md-5">
-            <button class="btn btn-default" v-on:click="toggleSettings">Cancel</button>
+              <div class="form-group">
+                <label htmlFor="inputBackgroundImage" class="col-sm-4 control-label">Background</label>
+                <div class="col-sm-7">
+                  <input type="text" class="form-control" id="inputBackgroundImage" v-model="settings.backgroundUrl" placeholder="url" />
+                </div>
+              </div>
+            </form>
           </div>
-          <div class="col-md-5">
-            <button class="btn btn-success pull-right" v-on:click="saveSettings">Save</button>
+          <div class="row">
+            <div class="col-md-offset-1 col-md-5">
+              <button class="btn btn-default" v-on:click="toggleSettings">Cancel</button>
+            </div>
+            <div class="col-md-5">
+              <button class="btn btn-success pull-right" v-on:click="saveSettings">Save</button>
+            </div>
           </div>
-        </div>
-        <br/>
-        <div class="row">
-          <div class="col-md-12">
-            <h4>Content</h4>
+          <br/>
+          <div class="row">
+            <div class="col-md-12">
+              <h4>Content</h4>
+            </div>
           </div>
-        </div>
-        <div class="row">
-          <div class="col-md-offset-1 col-md-10">
-            <button class="btn btn-primary pull-right" v-on:click="exportThings">Export</button>
+          <div class="row">
+            <div class="col-md-offset-1 col-md-10">
+              <button class="btn btn-primary pull-right" v-on:click="exportThings">Export</button>
+            </div>
           </div>
-        </div>
-        <div class="row">
-          <div class="col-md-offset-1 col-md-10">
-            <button class="btn btn-danger pull-right" v-on:click="logout">Logout</button>
+          <div class="row">
+            <div class="col-md-offset-1 col-md-10">
+              <button class="btn btn-danger pull-right" v-on:click="logout">Logout</button>
+            </div>
           </div>
         </div>
       </div>
-    </div>
 
-    <div class="container main">
-      <div class="row">
-        <div class="col-md-2 col-md-offset-5">
-            <button class="btn btn-raised btn-block btn-success" v-on:click="showThingAdd">Add</button>
-        </div>
-      </div>
-      <div class="row">
-        <div class="col-md-6 col-md-offset-3">
-          <div class="form-group">
-            <div class="input-group">
-              <input id="inputSearch" class="form-control" type="text" v-model="search" placeholder="Search" v-on:keyup.enter="doSearch">
-              <span class="input-group-btn">
-                <button type="button" class="btn btn-default" v-on:click="clearSearch()">
-                  <i class="fa fa-close"></i>
-                </button>
-              </span>
-            </div>
+      <div class="container main">
+        <div class="row">
+          <div class="col-md-2 col-md-offset-5">
+              <button class="btn btn-raised btn-block btn-success" v-on:click="showThingAdd">Add</button>
           </div>
         </div>
-      </div>
-      <div class="row">
-        <div class="col-md-2 tags">
-          <div v-show="!busyTags">
-            <h5>Tags</h5>
-            <div v-for="tag in tags | orderBy 'usage' -1">
-              <a href="{{'/#search?#' + tag.name}}" v-on:click="tagSearch(tag)" transition="present">#{{ tag.name }}</a>
+        <div class="row">
+          <div class="col-md-6 col-md-offset-3">
+            <div class="form-group">
+              <div class="input-group">
+                <input id="inputSearch" class="form-control" type="text" v-model="search" placeholder="Search" v-on:keyup.enter="doSearch">
+                <span class="input-group-btn">
+                  <button type="button" class="btn btn-default" v-on:click="clearSearch()">
+                    <i class="fa fa-close"></i>
+                  </button>
+                </span>
+              </div>
             </div>
-            <br/>
-          </div>
-          <div v-show="busyTags">
-            <br/>
-            <br/>
-            <br/>
-            <center><i class="spinner"></i></center>
           </div>
         </div>
-        <div class="col-md-8">
-          <div v-show="!busyThings">
-            <div class="well well-sm thing" v-for="thing in things">
-                <div class="col-md-12 thing-title-date">
-                  {{ thing.createdAt | prettyDateOffset }}
-                  <button class="btn btn-xs btn-default" v-on:click="showThingDel(thing)">delete</button>
-                  <button class="btn btn-xs btn-default" v-on:click="showThingEdit(thing)">edit</button>
+        <div class="row">
+          <div class="col-md-2 tags">
+            <div v-show="!busyTags">
+              <h5>Tags</h5>
+              <div v-for="tag in tags | orderBy 'usage' -1">
+                <a href="{{'/#search?#' + tag.name}}" v-on:click="tagSearch(tag)" transition="present">#{{ tag.name }}</a>
               </div>
-              <div class="content">{{{ thing.richContent | markdown }}}</div>
+              <br/>
+            </div>
+            <div v-show="busyTags">
+              <br/>
+              <br/>
+              <br/>
+              <center><i class="spinner"></i></center>
             </div>
           </div>
-          <div v-show="busyThings">
-            <br/>
-            <br/>
-            <br/>
-            <center><i class="spinner"></i></center>
+          <div class="col-md-8">
+            <div v-show="!busyThings">
+              <div class="well well-sm thing" v-for="thing in things">
+                  <div class="col-md-12 thing-title-date">
+                    {{ thing.createdAt | prettyDateOffset }}
+                    <button class="btn btn-xs btn-default" v-on:click="showThingDel(thing)">delete</button>
+                    <button class="btn btn-xs btn-default" v-on:click="showThingEdit(thing)">edit</button>
+                </div>
+                <div class="content">{{{ thing.richContent | markdown }}}</div>
+              </div>
+            </div>
+            <div v-show="busyThings">
+              <br/>
+              <br/>
+              <br/>
+              <center><i class="spinner"></i></center>
+            </div>
           </div>
         </div>
       </div>

+ 63 - 48
frontend/js/core.js

@@ -2,6 +2,9 @@
 
 var superagent = require('superagent');
 
+var g_server = '';
+var g_token = localStorage.token || '';
+
 function guid() {
     function s4() {
         return Math.floor((1 + Math.random()) * 0x10000).toString(16).substring(1);
@@ -12,15 +15,16 @@ function guid() {
 
 function errorWrapper(callback) {
     return function (error, result) {
-        if (error && error.status === 401) {
-            window.location.href = '/auth/login';
-            return;
-        }
+        if (error && error.status === 401) return module.exports.loginFailed();
 
         callback(error, result);
     };
 }
 
+function url(path) {
+    return g_server + path + '?token=' + g_token;
+}
+
 function Thing(id, createdAt, tags, content, richContent) {
     this.id = id;
     this.createdAt = createdAt || 0;
@@ -29,8 +33,7 @@ function Thing(id, createdAt, tags, content, richContent) {
     this.richContent = richContent;
 }
 
-function Things(server) {
-    this._server = server;
+function ThingsApi() {
     this._addCallbacks = [];
     this._editCallbacks = [];
     this._delCallbacks = [];
@@ -38,16 +41,16 @@ function Things(server) {
     this._operation = '';
 }
 
-Things.prototype.get = function (filter, callback) {
+ThingsApi.prototype.get = function (filter, callback) {
     var that = this;
-    var url = this._server + '/api/things';
+    var u = url('/api/things');
     var operation = guid();
 
     this._operation = operation;
 
-    if (filter) url += '?filter=' + encodeURIComponent(filter);
+    if (filter) u += '&filter=' + encodeURIComponent(filter);
 
-    superagent.get(url).end(errorWrapper(function (error, result) {
+    superagent.get(u).end(errorWrapper(function (error, result) {
         // ignore this if we moved on
         if (that._operation !== operation) {
             console.log('ignore this call');
@@ -65,11 +68,10 @@ Things.prototype.get = function (filter, callback) {
     }));
 };
 
-Things.prototype.add = function (content, callback) {
+ThingsApi.prototype.add = function (content, callback) {
     var that = this;
-    var url = this._server + '/api/things';
 
-    superagent.post(url).send({ content: content }).end(errorWrapper(function (error, result) {
+    superagent.post(url('/api/things')).send({ content: content }).end(errorWrapper(function (error, result) {
         if (error) return callback(error);
         if (result.status !== 201) return callback(new Error('Failed: ' + result.status + '. ' + result.text));
 
@@ -81,11 +83,10 @@ Things.prototype.add = function (content, callback) {
     }));
 };
 
-Things.prototype.edit = function (thing, callback) {
+ThingsApi.prototype.edit = function (thing, callback) {
     var that = this;
-    var url = this._server + '/api/things/' + thing.id;
 
-    superagent.put(url).send({ content: thing.content }).end(errorWrapper(function (error, result) {
+    superagent.put(url('/api/things/' + thing.id)).send({ content: thing.content }).end(errorWrapper(function (error, result) {
         if (error) return callback(error);
         if (result.status !== 201) return callback(new Error('Failed: ' + result.status + '. ' + result.text));
 
@@ -97,11 +98,10 @@ Things.prototype.edit = function (thing, callback) {
     }));
 };
 
-Things.prototype.del = function (thing, callback) {
+ThingsApi.prototype.del = function (thing, callback) {
     var that = this;
-    var url = this._server + '/api/things/' + thing.id;
 
-    superagent.del(url).end(errorWrapper(function (error, result) {
+    superagent.del(url('/api/things/' + thing.id)).end(errorWrapper(function (error, result) {
         if (error) return callback(error);
         if (result.status !== 200) return callback(new Error('Failed: ' + result.status + '. ' + result.text));
 
@@ -113,24 +113,23 @@ Things.prototype.del = function (thing, callback) {
     }));
 };
 
-Things.prototype.onAdded = function (callback) {
+ThingsApi.prototype.onAdded = function (callback) {
     this._addCallbacks.push(callback);
 };
 
-Things.prototype.onEdited = function (callback) {
+ThingsApi.prototype.onEdited = function (callback) {
     this._editCallbacks.push(callback);
 };
 
-Things.prototype.onDeleted = function (callback) {
+ThingsApi.prototype.onDeleted = function (callback) {
     this._delCallbacks.push(callback);
 };
 
-Things.prototype.export = function () {
+ThingsApi.prototype.export = function () {
     window.location.href = this._server + '/api/export';
 };
 
-function Settings(server) {
-    this._server = server;
+function SettingsApi() {
     this._changeCallbacks = [];
     this.data = {
         title: '',
@@ -138,10 +137,8 @@ function Settings(server) {
     };
 }
 
-Settings.prototype.save = function (callback) {
-    var url = this._server + '/api/settings';
-
-    superagent.post(url).send({ settings: this.data }).end(errorWrapper(function (error, result) {
+SettingsApi.prototype.save = function (callback) {
+    superagent.post(url('/api/settings')).send({ settings: this.data }).end(errorWrapper(function (error, result) {
         if (error) return callback(error);
         if (result.status !== 202) return callback(new Error('Failed: ' + result.status + '. ' + result.text));
 
@@ -149,11 +146,10 @@ Settings.prototype.save = function (callback) {
     }));
 };
 
-Settings.prototype.get = function (callback) {
+SettingsApi.prototype.get = function (callback) {
     var that = this;
-    var url = this._server + '/api/settings';
 
-    superagent.get(url).end(errorWrapper(function (error, result) {
+    superagent.get(url('/api/settings')).end(errorWrapper(function (error, result) {
         if (error) return callback(error);
         if (result.status !== 200) return callback(new Error('Failed: ' + result.status + '. ' + result.text));
 
@@ -163,7 +159,7 @@ Settings.prototype.get = function (callback) {
     }));
 };
 
-Settings.prototype.set = function (data) {
+SettingsApi.prototype.set = function (data) {
     var that = this;
 
     this.data.title = data.title;
@@ -174,18 +170,14 @@ Settings.prototype.set = function (data) {
     });
 };
 
-Settings.prototype.onChanged = function (callback) {
+SettingsApi.prototype.onChanged = function (callback) {
     this._changeCallbacks.push(callback);
 };
 
-function Tags(server) {
-    this._server = server;
-}
-
-Tags.prototype.get = function (callback) {
-    var url = this._server + '/api/tags';
+function TagsApi() {}
 
-    superagent.get(url).end(errorWrapper(function (error, result) {
+TagsApi.prototype.get = function (callback) {
+    superagent.get(url('/api/tags')).end(errorWrapper(function (error, result) {
         if (error) return callback(error);
         if (result.status !== 200) return callback(new Error('Failed: ' + result.status + '. ' + result.text));
 
@@ -193,15 +185,38 @@ Tags.prototype.get = function (callback) {
     }));
 };
 
-function Core() {
-    this._server = '';
+function SessionApi() {}
 
-    this.settings = new Settings(this._server);
-    this.things = new Things(this._server);
-    this.tags = new Tags(this._server);
-}
+SessionApi.prototype.login = function (username, password, callback) {
+    superagent.post(g_server + '/api/login').send({ username: username, password: password }).end(function (error, result) {
+        if (error) return callback(error);
+        if (result.status !== 201) return callback(new Error('Login failed. ' + result.status + '. ' + result.text));
+
+        g_token = result.body.token;
+        localStorage.token = g_token;
+
+        callback(null);
+    });
+};
+
+SessionApi.prototype.logout = function () {
+    superagent.get(url('/api/logout')).end(function (error, result) {
+        if (error) console.error(error);
+        if (result.status !== 200) console.error('Logout failed.', result.status, result.text);
+
+        g_token = '';
+        delete localStorage.token;
+
+        module.exports.onLogout();
+    });
+};
 
 module.exports = {
+    loginFailed: function () {},
+    onLogout: function () {},
     Thing: Thing,
-    Core: new Core()
+    session: new SessionApi(),
+    settings: new SettingsApi(),
+    things: new ThingsApi(),
+    tags: new TagsApi()
 };

+ 60 - 17
frontend/js/main.js

@@ -1,7 +1,7 @@
 'use strict';
 
 var Vue = require('vue'),
-    Core = require('./core.js').Core;
+    Core = require('./core.js');
 
 require('./filter.js');
 var vueThings = require('./thing.js');
@@ -16,7 +16,10 @@ var vue = new Vue({
         things: [],
         busyThings: true,
         busyTags: true,
-        search: ''
+        search: '',
+        username: '',
+        password: '',
+        mainView: ''
     },
     methods: {
         showThingAdd: function () {
@@ -28,6 +31,25 @@ var vue = new Vue({
         showThingDel: function (thing) {
             vueThings.del.open(thing);
         },
+        showLogin: function () {
+            this.mainView = 'login';
+            setTimeout(function () {
+                $('#inputUsername').focus();
+            }, 0);
+        },
+        doLogin: function () {
+            Core.session.login(this.username, this.password, function (error) {
+                if (error) {
+                    vue.username = '';
+                    vue.password = '';
+                    $('#inputUsername').focus();
+
+                    return console.error('Login failed:', error.status ? error.status : error);
+                }
+
+                main();
+            });
+        },
         doSearch: function () {
             window.location.href = '/#search?' + encodeURIComponent(this.search);
         },
@@ -65,6 +87,35 @@ function hashChangeHandler() {
 
 window.addEventListener('hashchange', hashChangeHandler, false);
 
+function reset() {
+    vue.mainView = '';
+    vue.things = [];
+    vue.tags = [];
+    vue.search = '';
+    vue.username = '';
+    vue.password = '';
+}
+
+function main() {
+    Core.settings.get(function (error) {
+        if (error) return console.error(error);
+
+        Core.tags.get(function (error, tags) {
+            if (error) return console.error(error);
+
+            vue.tags = tags;
+
+            vue.busyTags = false;
+
+            vue.mainView = 'content';
+
+            $('#inputSearch').focus();
+
+            hashChangeHandler();
+        });
+    });
+}
+
 function refresh(search) {
     vue.busyThings = true;
 
@@ -82,21 +133,13 @@ Core.things.onAdded(refresh);
 Core.things.onEdited(refresh);
 Core.things.onDeleted(refresh);
 
+Core.loginFailed = vue.showLogin;
+Core.onLogout = function () {
+    reset();
+    vue.showLogin();
+};
+
 // Main
 $.material.init();
 
-Core.settings.get(function (error) {
-    if (error) return console.error(error);
-
-    Core.tags.get(function (error, tags) {
-        if (error) return console.error(error);
-
-        vue.tags = tags;
-
-        vue.busyTags = false;
-
-        $('#inputSearch').focus();
-
-        hashChangeHandler();
-    });
-});
+main();

+ 3 - 2
frontend/js/settings.js

@@ -1,7 +1,7 @@
 'use strict';
 
 var Vue = require('vue'),
-    Core = require('./core.js').Core;
+    Core = require('./core.js');
 
 var vueSettings = new Vue({
     el: '#settings',
@@ -42,7 +42,8 @@ var vueSettings = new Vue({
             vueSettings.hide();
         },
         logout: function () {
-            window.location.href = '/auth/logout';
+            vueSettings.hide();
+            Core.session.logout();
         }
     }
 });

+ 1 - 1
frontend/js/thing.js

@@ -1,7 +1,7 @@
 'use strict';
 
 var Vue = require('vue'),
-    Core = require('./core.js').Core;
+    Core = require('./core.js');
 
 var vueThingAdd = new Vue({
     el: '#modalAdd',

+ 2 - 1
package.json

@@ -25,7 +25,8 @@
     "passport-cloudron": "^0.3.1",
     "serve-static": "^1.10.0",
     "superagent": "^1.5.0",
-    "supererror": "^0.7.1"
+    "supererror": "^0.7.1",
+    "uuid": "^2.0.1"
   },
   "devDependencies": {
     "bootstrap": "^3.3.6",

+ 61 - 1
src/routes.js

@@ -4,14 +4,20 @@
 
 var fs = require('fs'),
     async = require('async'),
-    things = require('./things.js'),
+    uuid = require('uuid'),
     tags = require('./tags.js'),
+    things = require('./things.js'),
+    tokens = require('./tokens.js'),
     settings = require('./settings.js'),
+    superagent = require('superagent'),
     HttpError = require('connect-lastmile').HttpError,
     HttpSuccess = require('connect-lastmile').HttpSuccess;
 
 exports = module.exports = {
     init: init,
+    auth: auth,
+    login: login,
+    logout: logout,
     getAll: getAll,
     get: get,
     add: add,
@@ -25,12 +31,66 @@ exports = module.exports = {
 
 function init(callback) {
     async.series([
+        tokens.init,
         things.init,
         tags.init,
         settings.init
     ], callback);
 }
 
+function auth(req, res, next) {
+    if (!req.query.token) return res.status(401).send('missing token');
+
+    tokens.exists(req.query.token, function (error, result) {
+        if (error) return res.status(500).send('internal error');
+        if (!result) return res.status(401).send('invalid credentials');
+
+        req.token = req.query.token;
+
+        next();
+    });
+}
+
+var simpleAuth = process.env.SIMPLE_AUTH_URL && process.env.SIMPLE_AUTH_CLIENT_ID;
+
+function verifyUser(username, password, callback) {
+    if (!simpleAuth) return callback(null, username === 'test' && password === 'test');
+
+    var authPayload = {
+        clientId: process.env.SIMPLE_AUTH_CLIENT_ID,
+        username: username,
+        password: password
+    };
+
+    superagent.post(process.env.SIMPLE_AUTH_URL).send(authPayload).end(function (error, result) {
+        if (error) return callback(error);
+        callback(null, result.status === 200);
+    });
+}
+
+function login(req, res, next) {
+    if (typeof req.body.username !== 'string' || !req.body.username) return next(new HttpError(400, 'missing username'));
+    if (typeof req.body.password !== 'string' || !req.body.password) return next(new HttpError(400, 'missing password'));
+
+    verifyUser(req.body.username, req.body.password, function (error, valid) {
+        if (error) return next(new HttpError(500, error));
+        if (!valid) return next(new HttpError(401, 'invalid credentials'));
+
+        var token = uuid.v4();
+        tokens.add(token, function (error) {
+            if (error) return next(new HttpError(500, error));
+            next(new HttpSuccess(201, { token: token }));
+        });
+    });
+}
+
+function logout(req, res, next) {
+    tokens.remove(req.token, function (error) {
+        if (error) return next(new HttpError(500, error));
+        next(new HttpSuccess(200, {}));
+    });
+}
+
 function getAll(req, res, next) {
     var query = {};