Changing /logout such that it works without being a protected route

avoidwork · Sep 18, 2014 · 4dc3e9e · 4dc3e9e
1 parent 0182190
commit 4dc3e9e
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Change Log
 
+## 0.9.4
+- Changing `/logout` such that it works without being a protected route
+
 ## 0.9.3
 - Made `hypermedia()` smartr by not mutating the result when it's an Array of URIs, for obvious data modeling issues!
 

diff --git a/doc/global.html b/doc/global.html
@@ -1826,7 +1826,7 @@ <h5>Returns:</h5>
 
 		<span class="jsdoc-message">
 		Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a>
-		on 2014-09-18T07:45:25-04:00 using the <a
+		on 2014-09-18T08:04:49-04:00 using the <a
 			href="https://github.com/terryweiss/docstrap">DocStrap template</a>.
 		</span>
 				</footer>

diff --git a/doc/index.html b/doc/index.html
@@ -384,7 +384,7 @@ <h2>License</h2>
 
 		<span class="jsdoc-message">
 		Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a>
-		on 2014-09-18T07:45:25-04:00 using the <a
+		on 2014-09-18T08:04:49-04:00 using the <a
 			href="https://github.com/terryweiss/docstrap">DocStrap template</a>.
 		</span>
 				</footer>

diff --git a/doc/module-tenso.html b/doc/module-tenso.html
@@ -125,7 +125,7 @@ <h2>
 	<dt class="tag-version">Version:</dt>
 	<dd class="tag-version">
 		<ul class="dummy">
-			<li>0.9.3</li>
+			<li>0.9.4</li>
 		</ul>
 	</dd>
 
@@ -218,7 +218,7 @@ <h2>
 
 		<span class="jsdoc-message">
 		Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a>
-		on 2014-09-18T07:45:25-04:00 using the <a
+		on 2014-09-18T08:04:50-04:00 using the <a
 			href="https://github.com/terryweiss/docstrap">DocStrap template</a>.
 		</span>
 				</footer>

diff --git a/doc/modules.list.html b/doc/modules.list.html
@@ -188,7 +188,7 @@ <h2>
 
 		<span class="jsdoc-message">
 		Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a>
-		on 2014-09-18T07:45:25-04:00 using the <a
+		on 2014-09-18T08:04:49-04:00 using the <a
 			href="https://github.com/terryweiss/docstrap">DocStrap template</a>.
 		</span>
 				</footer>

diff --git a/lib/tenso.js b/lib/tenso.js
@@ -6,13 +6,13 @@
  * @license BSD-3 <https://raw.github.com/avoidwork/tenso/master/LICENSE>
  * @link http://avoidwork.github.io/tenso
  * @module tenso
- * @version 0.9.3
+ * @version 0.9.4
  */
 ( function () {
 "use strict";
 
 var turtleio = require( "turtle.io" ),
-    SERVER   = "tenso/0.9.3",
+    SERVER   = "tenso/0.9.4",
     CONFIG   = require( __dirname + "/../config.json" ),
     keigai   = require( "keigai" ),
     util     = keigai.util,
@@ -63,7 +63,7 @@ function Tenso () {
 	this.rates        = {};
 	this.server       = turtleio();
 	this.server.tenso = this;
-	this.version      = "0.9.3";
+	this.version      = "0.9.4";
 }
 
 /**
@@ -327,14 +327,14 @@ function auth ( obj, config ) {
 				obj.server.use( regex, guard ).blacklist( guard );
 			} )();
 
-			config.routes.get["/login"]  = config.auth.local.enabled ? ( keys ? {login_uri: "/auth", instruction: "POST username/password to authenticate"} : {instruction: "POST username/password to authenticate"} ) : {login_uri: "/auth"};
+			config.routes.get["/login"]  = config.auth.local.enabled ? ( keys ? {login_uri: "/auth", instruction: "POST 'username' & 'password' to authenticate"} : {instruction: "POST 'username' & 'password' to authenticate"} ) : {login_uri: "/auth"};
 		}
 		else if ( config.auth.local.enabled ) {
-			config.routes.get["/login"]  = {instruction: "POST username/password to authenticate"};
+			config.routes.get["/login"]  = {instruction: "POST 'username' & 'password' to authenticate"};
 		}
 
 		config.routes.get["/logout"] = function ( req, res ) {
-			if (  req.session.isAuthorized() ) {
+			if (  req.session ) {
 				req.session.destroy();
 			}
 

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "tenso",
   "description": "Tensō is a REST API facade for node.js, designed to simplify the implementation of APIs.",
-  "version": "0.9.3",
+  "version": "0.9.4",
   "homepage": "http://avoidwork.github.io/tenso",
   "author": {
     "name": "Jason Mulligan",

diff --git a/src/auth.js b/src/auth.js
@@ -152,14 +152,14 @@ function auth ( obj, config ) {
 				obj.server.use( regex, guard ).blacklist( guard );
 			} )();
 
-			config.routes.get["/login"]  = config.auth.local.enabled ? ( keys ? {login_uri: "/auth", instruction: "POST username/password to authenticate"} : {instruction: "POST username/password to authenticate"} ) : {login_uri: "/auth"};
+			config.routes.get["/login"]  = config.auth.local.enabled ? ( keys ? {login_uri: "/auth", instruction: "POST 'username' & 'password' to authenticate"} : {instruction: "POST 'username' & 'password' to authenticate"} ) : {login_uri: "/auth"};
 		}
 		else if ( config.auth.local.enabled ) {
-			config.routes.get["/login"]  = {instruction: "POST username/password to authenticate"};
+			config.routes.get["/login"]  = {instruction: "POST 'username' & 'password' to authenticate"};
 		}
 
 		config.routes.get["/logout"] = function ( req, res ) {
-			if (  req.session.isAuthorized() ) {
+			if (  req.session ) {
 				req.session.destroy();
 			}
 

diff --git a/test/tenso_test.js b/test/tenso_test.js
@@ -401,7 +401,7 @@ describe("Local", function () {
 				.get("/login")
 				.expectStatus(200)
 				.expectValue("data.link", [{uri: "http://localhost:" + port, rel: "collection"}] )
-				.expectValue("data.result", {instruction: "POST username/password to authenticate"} )
+				.expectValue("data.result", {instruction: "POST 'username' & 'password' to authenticate"} )
 				.expectValue("error", null)
 				.expectValue("status", 200)
 				.end(function(err) {