From 51ec3db5ed4d9841d124dd32d8d885d4325985e4 Mon Sep 17 00:00:00 2001 From: Johannes Zellner Date: Thu, 3 Apr 2014 08:32:51 -0700 Subject: [PATCH] Make ejs views work --- auth/server.js | 8 ++- auth/site.js | 3 +- authserver.js | 4 +- npm-shrinkwrap.json | 170 ++++++++++++++++++++++++-------------------- package.json | 3 +- 5 files changed, 103 insertions(+), 85 deletions(-) diff --git a/auth/server.js b/auth/server.js index 3a360d120..8ae8eb5ad 100644 --- a/auth/server.js +++ b/auth/server.js @@ -3,6 +3,7 @@ var express = require('express'), http = require('http'), once = require('once'), + path = require('path'), passport = require('passport'), oauth2 = require('./oauth2'), site = require('./site'), @@ -63,6 +64,7 @@ function serverErrorHandler(err, req, res, next) { function Server(port, configDir, silent) { assert(typeof port === 'number'); assert(typeof configDir === 'string'); + assert(typeof silent === 'boolean'); this._port = port; this._routePrefix = '/api/v1'; @@ -84,7 +86,9 @@ Server.prototype._initialize = function (callback) { var UPLOAD_LIMIT = '1mb'; // catch all max size for any type of request that.app.disable('x-powered-by'); + that.app.set('views', path.join(__dirname, './views')); that.app.set('view engine', 'ejs'); + that.app.set('view options', { layout: false }); var json = express.json({ strict: true, limit: QUERY_LIMIT }); // application/json @@ -92,7 +96,7 @@ Server.prototype._initialize = function (callback) { that.app.use(express.cookieParser()); that.app.use(express.limit(UPLOAD_LIMIT)); that.app.use(middleware.cors({ origins: [ '*' ], allowCredentials: true })); - that.app.use(middleware.contentType('application/json; charset=utf-8')); + // that.app.use(middleware.contentType('application/json; charset=utf-8')); that.app.use(express.session({ secret: 'yellow is blue' })); that.app.use(passport.initialize()); that.app.use(passport.session()); @@ -102,8 +106,6 @@ Server.prototype._initialize = function (callback) { that.app.use(serverErrorHandler); // routes controlled by app.router - require('./auth'); - that.app.get('/', site.index); that.app.get('/login', site.loginForm); that.app.post('/login', site.login); diff --git a/auth/site.js b/auth/site.js index 2613a71b3..573ee9b43 100644 --- a/auth/site.js +++ b/auth/site.js @@ -8,7 +8,8 @@ var passport = require('passport'), login = require('connect-ensure-login'); exports.index = function(req, res) { - res.send('OAuth 2.0 Server'); + // probably some redirect to the main server + res.send('Yellowtent Auth Server'); }; exports.loginForm = function(req, res) { diff --git a/authserver.js b/authserver.js index f4282e7af..3b1425797 100755 --- a/authserver.js +++ b/authserver.js @@ -36,8 +36,8 @@ console.log('=========================================='); console.log(); var server = new Server(parseInt(app.port, 10), - app.configDir, - app.silent + app.configDirectory, + !!app.silent ); server.start(function (error) { diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 851b2b15a..0099c752c 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -4,51 +4,56 @@ "dependencies": { "async": { "version": "0.6.2", - "from": "async@*", + "from": "https://registry.npmjs.org/async/-/async-0.6.2.tgz", "resolved": "https://registry.npmjs.org/async/-/async-0.6.2.tgz" }, "commander": { "version": "2.2.0", - "from": "commander@^2.2.0" + "from": "commander@2.2.0" }, "connect-ensure-login": { "version": "0.1.1", - "from": "connect-ensure-login@^0.1.1" + "from": "connect-ensure-login@0.1.1" }, "debug": { "version": "0.8.0", - "from": "debug@*", + "from": "https://registry.npmjs.org/debug/-/debug-0.8.0.tgz", "resolved": "https://registry.npmjs.org/debug/-/debug-0.8.0.tgz" }, + "ejs": { + "version": "1.0.0", + "from": "ejs@" + }, "encfs": { "version": "0.1.0", - "from": "encfs@*", + "from": "encfs@0.1.0", + "resolved": "https://registry.npmjs.org/encfs/-/encfs-0.1.0.tgz", "dependencies": { "debug": { "version": "0.7.4", - "from": "debug@~0.7.2", + "from": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz", "resolved": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz" } } }, "express": { "version": "3.5.1", - "from": "express@*", + "from": "https://registry.npmjs.org/express/-/express-3.5.1.tgz", "resolved": "https://registry.npmjs.org/express/-/express-3.5.1.tgz", "dependencies": { "connect": { "version": "2.14.1", - "from": "connect@2.14.1", + "from": "https://registry.npmjs.org/connect/-/connect-2.14.1.tgz", "resolved": "https://registry.npmjs.org/connect/-/connect-2.14.1.tgz", "dependencies": { "basic-auth-connect": { "version": "1.0.0", - "from": "basic-auth-connect@1.0.0", + "from": "https://registry.npmjs.org/basic-auth-connect/-/basic-auth-connect-1.0.0.tgz", "resolved": "https://registry.npmjs.org/basic-auth-connect/-/basic-auth-connect-1.0.0.tgz" }, "cookie-parser": { "version": "1.0.1", - "from": "cookie-parser@1.0.1", + "from": "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.0.1.tgz", "resolved": "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.0.1.tgz", "dependencies": { "cookie": { @@ -59,7 +64,7 @@ }, "compression": { "version": "1.0.0", - "from": "compression@1.0.0", + "from": "https://registry.npmjs.org/compression/-/compression-1.0.0.tgz", "resolved": "https://registry.npmjs.org/compression/-/compression-1.0.0.tgz", "dependencies": { "negotiator": { @@ -68,40 +73,40 @@ }, "compressible": { "version": "1.0.0", - "from": "compressible@1.0.0", + "from": "https://registry.npmjs.org/compressible/-/compressible-1.0.0.tgz", "resolved": "https://registry.npmjs.org/compressible/-/compressible-1.0.0.tgz" } } }, "connect-timeout": { "version": "1.0.0", - "from": "connect-timeout@1.0.0", + "from": "https://registry.npmjs.org/connect-timeout/-/connect-timeout-1.0.0.tgz", "resolved": "https://registry.npmjs.org/connect-timeout/-/connect-timeout-1.0.0.tgz" }, "csurf": { "version": "1.0.0", - "from": "csurf@1.0.0", + "from": "https://registry.npmjs.org/csurf/-/csurf-1.0.0.tgz", "resolved": "https://registry.npmjs.org/csurf/-/csurf-1.0.0.tgz", "dependencies": { "uid2": { "version": "0.0.3", - "from": "uid2@~0.0.2" + "from": "uid2@0.0.3" } } }, "errorhandler": { "version": "1.0.0", - "from": "errorhandler@1.0.0", + "from": "https://registry.npmjs.org/errorhandler/-/errorhandler-1.0.0.tgz", "resolved": "https://registry.npmjs.org/errorhandler/-/errorhandler-1.0.0.tgz" }, "express-session": { "version": "1.0.2", - "from": "express-session@1.0.2", + "from": "https://registry.npmjs.org/express-session/-/express-session-1.0.2.tgz", "resolved": "https://registry.npmjs.org/express-session/-/express-session-1.0.2.tgz", "dependencies": { "utils-merge": { "version": "1.0.0", - "from": "utils-merge@1.0.0", + "from": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz", "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz" }, "cookie": { @@ -110,24 +115,24 @@ }, "uid2": { "version": "0.0.3", - "from": "uid2@0.0.3", + "from": "https://registry.npmjs.org/uid2/-/uid2-0.0.3.tgz", "resolved": "https://registry.npmjs.org/uid2/-/uid2-0.0.3.tgz" }, "debug": { "version": "0.7.4", - "from": "debug@0.7.4", + "from": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz", "resolved": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz" } } }, "method-override": { "version": "1.0.0", - "from": "method-override@1.0.0", + "from": "https://registry.npmjs.org/method-override/-/method-override-1.0.0.tgz", "resolved": "https://registry.npmjs.org/method-override/-/method-override-1.0.0.tgz" }, "morgan": { "version": "1.0.0", - "from": "morgan@1.0.0", + "from": "https://registry.npmjs.org/morgan/-/morgan-1.0.0.tgz", "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.0.0.tgz" }, "qs": { @@ -136,12 +141,12 @@ }, "response-time": { "version": "1.0.0", - "from": "response-time@1.0.0", + "from": "https://registry.npmjs.org/response-time/-/response-time-1.0.0.tgz", "resolved": "https://registry.npmjs.org/response-time/-/response-time-1.0.0.tgz" }, "serve-index": { "version": "1.0.1", - "from": "serve-index@1.0.1", + "from": "https://registry.npmjs.org/serve-index/-/serve-index-1.0.1.tgz", "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.0.1.tgz", "dependencies": { "batch": { @@ -150,24 +155,24 @@ }, "negotiator": { "version": "0.4.2", - "from": "negotiator@0.4.2", + "from": "https://registry.npmjs.org/negotiator/-/negotiator-0.4.2.tgz", "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.4.2.tgz" } } }, "serve-static": { "version": "1.0.2", - "from": "serve-static@1.0.2", + "from": "https://registry.npmjs.org/serve-static/-/serve-static-1.0.2.tgz", "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.0.2.tgz" }, "static-favicon": { "version": "1.0.0", - "from": "static-favicon@1.0.0", + "from": "https://registry.npmjs.org/static-favicon/-/static-favicon-1.0.0.tgz", "resolved": "https://registry.npmjs.org/static-favicon/-/static-favicon-1.0.0.tgz" }, "vhost": { "version": "1.0.0", - "from": "vhost@1.0.0", + "from": "https://registry.npmjs.org/vhost/-/vhost-1.0.0.tgz", "resolved": "https://registry.npmjs.org/vhost/-/vhost-1.0.0.tgz" }, "bytes": { @@ -180,7 +185,7 @@ }, "raw-body": { "version": "1.1.3", - "from": "raw-body@1.1.3", + "from": "https://registry.npmjs.org/raw-body/-/raw-body-1.1.3.tgz", "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-1.1.3.tgz" }, "multiparty": { @@ -189,31 +194,31 @@ "dependencies": { "readable-stream": { "version": "1.1.12", - "from": "readable-stream@~1.1.9", + "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.12.tgz", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.12.tgz", "dependencies": { "core-util-is": { "version": "1.0.1", - "from": "core-util-is@~1.0.0" + "from": "core-util-is@1.0.1" }, "isarray": { "version": "0.0.1", - "from": "isarray@0.0.1", + "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz" }, "string_decoder": { "version": "0.10.25-1", - "from": "string_decoder@~0.10.x" + "from": "string_decoder@0.10.25-1" }, "inherits": { "version": "2.0.1", - "from": "inherits@^2.0.1" + "from": "inherits@2.0.1" } } }, "stream-counter": { "version": "0.2.0", - "from": "stream-counter@~0.2.0" + "from": "stream-counter@0.2.0" } } } @@ -221,33 +226,33 @@ }, "commander": { "version": "1.3.2", - "from": "commander@1.3.2", + "from": "https://registry.npmjs.org/commander/-/commander-1.3.2.tgz", "resolved": "https://registry.npmjs.org/commander/-/commander-1.3.2.tgz", "dependencies": { "keypress": { "version": "0.1.0", - "from": "keypress@0.1.x" + "from": "keypress@0.1.0" } } }, "range-parser": { "version": "1.0.0", - "from": "range-parser@1.0.0", + "from": "https://registry.npmjs.org/range-parser/-/range-parser-1.0.0.tgz", "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.0.0.tgz" }, "cookie": { "version": "0.1.1", - "from": "cookie@0.1.1", + "from": "https://registry.npmjs.org/cookie/-/cookie-0.1.1.tgz", "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.1.1.tgz" }, "buffer-crc32": { "version": "0.2.1", - "from": "buffer-crc32@0.2.1", + "from": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.1.tgz", "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.1.tgz" }, "fresh": { "version": "0.2.2", - "from": "fresh@0.2.2", + "from": "https://registry.npmjs.org/fresh/-/fresh-0.2.2.tgz", "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.2.2.tgz" }, "methods": { @@ -256,77 +261,83 @@ }, "send": { "version": "0.2.0", - "from": "send@0.2.0", + "from": "https://registry.npmjs.org/send/-/send-0.2.0.tgz", "resolved": "https://registry.npmjs.org/send/-/send-0.2.0.tgz" }, "cookie-signature": { "version": "1.0.3", - "from": "cookie-signature@1.0.3", + "from": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.3.tgz", "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.3.tgz" }, "merge-descriptors": { "version": "0.0.2", - "from": "merge-descriptors@0.0.2", + "from": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-0.0.2.tgz", "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-0.0.2.tgz" } } }, "mime": { "version": "1.2.11", - "from": "mime@*" + "from": "mime@1.2.11", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz" }, "mkdirp": { "version": "0.3.5", - "from": "mkdirp@*" + "from": "mkdirp@0.3.5", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz" }, "node-uuid": { "version": "1.4.1", - "from": "node-uuid@^1.4.1" + "from": "node-uuid@1.4.1", + "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz" }, "oauth2orize": { "version": "1.0.1", - "from": "oauth2orize@^1.0.1", + "from": "oauth2orize@1.0.1", "dependencies": { "uid2": { "version": "0.0.3", - "from": "uid2@0.0.x" + "from": "uid2@0.0.3" }, "utils-merge": { "version": "1.0.0", - "from": "utils-merge@1.x.x" + "from": "utils-merge@1.0.0" }, "debug": { "version": "0.7.4", - "from": "debug@~0.7.2", + "from": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz", "resolved": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz" } } }, "once": { "version": "1.3.0", - "from": "once@^1.3.0" + "from": "once@1.3.0" }, "optimist": { "version": "0.6.1", - "from": "optimist@*", + "from": "optimist@0.6.1", + "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", "dependencies": { "wordwrap": { "version": "0.0.2", - "from": "wordwrap@~0.0.2" + "from": "wordwrap@0.0.2", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz" }, "minimist": { "version": "0.0.8", - "from": "minimist@~0.0.1" + "from": "minimist@0.0.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz" } } }, "passport": { "version": "0.2.0", - "from": "passport@^0.2.0", + "from": "passport@0.2.0", "dependencies": { "passport-strategy": { "version": "1.0.0", - "from": "passport-strategy@1.x.x" + "from": "passport-strategy@1.0.0" }, "pause": { "version": "0.0.1", @@ -336,48 +347,48 @@ }, "readdirp": { "version": "1.0.1", - "from": "readdirp@*", + "from": "https://registry.npmjs.org/readdirp/-/readdirp-1.0.1.tgz", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-1.0.1.tgz", "dependencies": { "graceful-fs": { "version": "2.0.3", - "from": "graceful-fs@~2.0.0" + "from": "graceful-fs@2.0.3" }, "minimatch": { "version": "0.2.14", - "from": "minimatch@~0.2.12", + "from": "minimatch@0.2.14", "dependencies": { "lru-cache": { "version": "2.5.0", - "from": "lru-cache@2" + "from": "lru-cache@2.5.0" }, "sigmund": { "version": "1.0.0", - "from": "sigmund@~1.0.0" + "from": "sigmund@1.0.0" } } }, "readable-stream": { "version": "1.0.26-4", - "from": "readable-stream@~1.0.26-2", + "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.26-4.tgz", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.26-4.tgz", "dependencies": { "core-util-is": { "version": "1.0.1", - "from": "core-util-is@~1.0.0" + "from": "core-util-is@1.0.1" }, "isarray": { "version": "0.0.1", - "from": "isarray@0.0.1", + "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz" }, "string_decoder": { "version": "0.10.25-1", - "from": "string_decoder@~0.10.x" + "from": "string_decoder@0.10.25-1" }, "inherits": { "version": "2.0.1", - "from": "inherits@~2.0.1" + "from": "inherits@2.0.1" } } } @@ -385,35 +396,36 @@ }, "rimraf": { "version": "2.2.6", - "from": "rimraf@*" + "from": "rimraf@2.2.6", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.6.tgz" }, "safetydance": { "version": "0.0.10", - "from": "safetydance@*" + "from": "safetydance@0.0.10" }, "superagent": { "version": "0.17.0", - "from": "superagent@*", + "from": "https://registry.npmjs.org/superagent/-/superagent-0.17.0.tgz", "resolved": "https://registry.npmjs.org/superagent/-/superagent-0.17.0.tgz", "dependencies": { "qs": { "version": "0.6.5", - "from": "qs@0.6.5", + "from": "https://registry.npmjs.org/qs/-/qs-0.6.5.tgz", "resolved": "https://registry.npmjs.org/qs/-/qs-0.6.5.tgz" }, "formidable": { "version": "1.0.14", - "from": "formidable@1.0.14", + "from": "https://registry.npmjs.org/formidable/-/formidable-1.0.14.tgz", "resolved": "https://registry.npmjs.org/formidable/-/formidable-1.0.14.tgz" }, "mime": { "version": "1.2.5", - "from": "mime@1.2.5", + "from": "https://registry.npmjs.org/mime/-/mime-1.2.5.tgz", "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.5.tgz" }, "emitter-component": { "version": "1.0.0", - "from": "emitter-component@1.0.0", + "from": "https://registry.npmjs.org/emitter-component/-/emitter-component-1.0.0.tgz", "resolved": "https://registry.npmjs.org/emitter-component/-/emitter-component-1.0.0.tgz" }, "methods": { @@ -426,7 +438,7 @@ }, "debug": { "version": "0.7.4", - "from": "debug@~0.7.2", + "from": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz", "resolved": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz" }, "reduce-component": { @@ -435,17 +447,19 @@ }, "extend": { "version": "1.2.1", - "from": "extend@~1.2.1" + "from": "extend@1.2.1" } } }, "upnp-ssdp": { "version": "0.0.2", - "from": "upnp-ssdp@*" + "from": "upnp-ssdp@0.0.2", + "resolved": "https://registry.npmjs.org/upnp-ssdp/-/upnp-ssdp-0.0.2.tgz" }, "ursa": { "version": "0.8.0", - "from": "ursa@~0.8.0" + "from": "ursa@0.8.0", + "resolved": "https://registry.npmjs.org/ursa/-/ursa-0.8.0.tgz" } } } diff --git a/package.json b/package.json index 3c5755994..22301e018 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,8 @@ "once": "^1.3.0", "passport": "^0.2.0", "oauth2orize": "^1.0.1", - "connect-ensure-login": "^0.1.1" + "connect-ensure-login": "^0.1.1", + "ejs": "^1.0.0" }, "devDependencies": { "mocha": "*",