@hitchy/plugin-odem-rest 0.7.0 → 0.7.2

package/index.js

@@ -160,7 +160,7 @@ module.exports = function() {
 		const modelUrl = resolve( urlPrefix, routeName );
 
 		const reqBadModel = Model.prototype instanceof BaseModel ? null : ( _, res ) => {
-			res.status( 500 ).json( { error: "incomplete discovery of model on server-side, looks like hitchy-plugin-odem issue" } );
+			res.status( 500 ).json( { error: "incomplete discovery of model on server-side, looks like a hitchy-plugin-odem issue" } );
 		};
 
 		if ( includeConvenienceRoutes ) {
@@ -202,7 +202,7 @@ module.exports = function() {
 		 * @returns {void}
 		 */
 		function reqSuccess( req, res ) {
-			if ( Services.OdemSchema.mayBeExposed( req, Model ) ) {
+			if ( Schema.mayBeExposed( req, Model ) ) {
 				res.status( 200 ).send();
 			} else {
 				res.status( 403 ).send();
@@ -232,13 +232,13 @@ module.exports = function() {
 		async function reqFetchSchema( req, res ) {
 			logDebug( "got request fetching schema" );
 
-			if ( api.plugins.authentication && !await Services.Authorization.mayAccess( req.user, `@hitchy.odem.model.${modelName}.schema` ) ) {
-				resAccessForbidden( res );
+			if ( !Schema.mayBeExposed( req, Model ) ) {
+				res.status( 403 ).json( { error: "access forbidden by model" } );
 				return;
 			}
 
-			if ( !Services.OdemSchema.mayBeExposed( req, Model ) ) {
-				res.status( 403 ).json( { error: "access forbidden by model" } );
+			if ( api.plugins.authentication && !await Services.Authorization.mayAccess( req.user, `@hitchy.odem.model.${modelName}.schema` ) ) {
+				resAccessForbidden( res );
 				return;
 			}
 
@@ -256,13 +256,13 @@ module.exports = function() {
 		async function reqCheckItem( req, res ) {
 			logDebug( "got request checking if some item exists" );
 
-			if ( api.plugins.authentication && !await Services.Authorization.mayAccess( req.user, `@hitchy.odem.model.${modelName}.check` ) ) {
-				resAccessForbidden( res );
+			if ( !Schema.mayBeExposed( req, Model ) ) {
+				res.status( 403 ).json( { error: "access forbidden by model" } );
 				return;
 			}
 
-			if ( !Schema.mayBeExposed( req, Model ) ) {
-				res.status( 403 ).json( { error: "access forbidden by model" } );
+			if ( api.plugins.authentication && !await Services.Authorization.mayAccess( req.user, `@hitchy.odem.model.${modelName}.check` ) ) {
+				resAccessForbidden( res );
 				return;
 			}
 
@@ -280,7 +280,7 @@ module.exports = function() {
 				} )
 				.catch( error => {
 					logError( "checking %s:", routeName, error );
-					res.status( 500 ).json( { error: error.message } );
+					res.status( error.statusCode || 500 ).json( { error: error.message } );
 				} );
 		}
 
@@ -294,13 +294,13 @@ module.exports = function() {
 		async function reqFetchItem( req, res ) {
 			logDebug( "got request fetching some item" );
 
-			if ( api.plugins.authentication && !await Services.Authorization.mayAccess( req.user, `@hitchy.odem.model.${modelName}.read` ) ) {
-				resAccessForbidden( res );
+			if ( !Schema.mayBeExposed( req, Model ) ) {
+				res.status( 403 ).json( { error: "access forbidden by model" } );
 				return;
 			}
 
-			if ( !Schema.mayBeExposed( req, Model ) ) {
-				res.status( 403 ).json( { error: "access forbidden by model" } );
+			if ( api.plugins.authentication && !await Services.Authorization.mayAccess( req.user, `@hitchy.odem.model.${modelName}.read` ) ) {
+				resAccessForbidden( res );
 				return;
 			}
 
@@ -324,7 +324,7 @@ module.exports = function() {
 						}
 
 						default : {
-							res.status( 500 ).json( { error: error.message } );
+							res.status( error.statusCode || 500 ).json( { error: error.message } );
 						}
 					}
 				} );
@@ -341,13 +341,13 @@ module.exports = function() {
 		async function reqFetchItems( req, res ) {
 			logDebug( "got request fetching items" );
 
-			if ( api.plugins.authentication && !await Services.Authorization.mayAccess( req.user, `@hitchy.odem.model.${modelName}.list` ) ) {
-				resAccessForbidden( res );
+			if ( !Schema.mayBeExposed( req, Model ) ) {
+				res.status( 403 ).json( { error: "access forbidden by model" } );
 				return;
 			}
 
-			if ( !Schema.mayBeExposed( req, Model ) ) {
-				res.status( 403 ).json( { error: "access forbidden by model" } );
+			if ( api.plugins.authentication && !await Services.Authorization.mayAccess( req.user, `@hitchy.odem.model.${modelName}.list` ) ) {
+				resAccessForbidden( res );
 				return;
 			}
 
@@ -406,11 +406,6 @@ module.exports = function() {
 		async function reqListMatches( req, res ) {
 			logDebug( "got request listing matching items" );
 
-			if ( !Schema.mayBeExposed( req, Model ) ) {
-				res.status( 403 ).json( { error: "access forbidden by model" } );
-				return;
-			}
-
 			const {
 				q: simpleQuery = "",
 				offset = 0,
@@ -481,7 +476,7 @@ module.exports = function() {
 				.catch( error => {
 					logError( "querying %s:", routeName, error );
 
-					res.status( 500 ).json( { error: error.message } );
+					res.status( error.statusCode || 500 ).json( { error: error.message } );
 				} );
 		}
 
@@ -496,11 +491,6 @@ module.exports = function() {
 		async function reqListAll( req, res ) {
 			logDebug( "got request listing all items" );
 
-			if ( !Schema.mayBeExposed( req, Model ) ) {
-				res.status( 403 ).json( { error: "access forbidden by model" } );
-				return;
-			}
-
 			const { offset = 0, limit = Infinity, sortBy = null, descending = false, loadRecords = true, count = false } = req.query;
 			const meta = count || req.headers["x-count"] ? {} : null;
 
@@ -525,7 +515,7 @@ module.exports = function() {
 				.catch( error => {
 					logError( "listing %s:", routeName, error );
 
-					res.status( 500 ).json( { error: error.message } );
+					res.status( error.statusCode || 500 ).json( { error: error.message } );
 				} );
 		}
 
@@ -539,13 +529,13 @@ module.exports = function() {
 		async function reqCreateItem( req, res ) {
 			logDebug( "got request creating item" );
 
-			if ( api.plugins.authentication && !await Services.Authorization.mayAccess( req.user, `@hitchy.odem.model.${modelName}.create` ) ) {
-				resAccessForbidden( res );
+			if ( !Schema.mayBeExposed( req, Model ) ) {
+				res.status( 403 ).json( { error: "access forbidden by model" } );
 				return;
 			}
 
-			if ( !Schema.mayBeExposed( req, Model ) ) {
-				res.status( 403 ).json( { error: "access forbidden by model" } );
+			if ( api.plugins.authentication && !await Services.Authorization.mayAccess( req.user, `@hitchy.odem.model.${modelName}.create` ) ) {
+				resAccessForbidden( res );
 				return;
 			}
 
@@ -578,7 +568,7 @@ module.exports = function() {
 				} )
 				.catch( error => {
 					logError( "creating %s:", routeName, error );
-					res.status( 500 ).json( { error: error.message } );
+					res.status( error.statusCode || 500 ).json( { error: error.message } );
 				} );
 		}
 
@@ -592,13 +582,13 @@ module.exports = function() {
 		async function reqModifyItem( req, res ) {
 			logDebug( "got request to modify some item" );
 
-			if ( api.plugins.authentication && !await Services.Authorization.mayAccess( req.user, `@hitchy.odem.model.${modelName}.write` ) ) {
-				resAccessForbidden( res );
+			if ( !Schema.mayBeExposed( req, Model ) ) {
+				res.status( 403 ).json( { error: "access forbidden by model" } );
 				return;
 			}
 
-			if ( !Schema.mayBeExposed( req, Model ) ) {
-				res.status( 403 ).json( { error: "access forbidden by model" } );
+			if ( api.plugins.authentication && !await Services.Authorization.mayAccess( req.user, `@hitchy.odem.model.${modelName}.write` ) ) {
+				resAccessForbidden( res );
 				return;
 			}
 
@@ -642,7 +632,7 @@ module.exports = function() {
 				} )
 				.catch( error => {
 					logError( "updating %s:", routeName, error );
-					res.status( 500 ).json( { error: error.message } );
+					res.status( error.statusCode || 500 ).json( { error: error.message } );
 				} );
 		}
 
@@ -657,13 +647,13 @@ module.exports = function() {
 		async function reqReplaceItem( req, res ) {
 			logDebug( "got request replacing some item" );
 
-			if ( api.plugins.authentication && !await Services.Authorization.mayAccess( req.user, `@hitchy.odem.model.${modelName}.write` ) ) {
-				resAccessForbidden( res );
+			if ( !Schema.mayBeExposed( req, Model ) ) {
+				res.status( 403 ).json( { error: "access forbidden by model" } );
 				return;
 			}
 
-			if ( !Schema.mayBeExposed( req, Model ) ) {
-				res.status( 403 ).json( { error: "access forbidden by model" } );
+			if ( api.plugins.authentication && !await Services.Authorization.mayAccess( req.user, `@hitchy.odem.model.${modelName}.write` ) ) {
+				resAccessForbidden( res );
 				return;
 			}
 
@@ -707,7 +697,7 @@ module.exports = function() {
 				} )
 				.catch( error => {
 					logError( "updating %s:", routeName, error );
-					res.status( 500 ).json( { error: error.message } );
+					res.status( error.statusCode || 500 ).json( { error: error.message } );
 				} );
 		}
 
@@ -721,13 +711,13 @@ module.exports = function() {
 		async function reqRemoveItem( req, res ) {
 			logDebug( "got request removing some item" );
 
-			if ( api.plugins.authentication && !await Services.Authorization.mayAccess( req.user, `@hitchy.odem.model.${modelName}.remove` ) ) {
-				resAccessForbidden( res );
+			if ( !Schema.mayBeExposed( req, Model ) ) {
+				res.status( 403 ).json( { error: "access forbidden by model" } );
 				return;
 			}
 
-			if ( !Schema.mayBeExposed( req, Model ) ) {
-				res.status( 403 ).json( { error: "access forbidden by model" } );
+			if ( api.plugins.authentication && !await Services.Authorization.mayAccess( req.user, `@hitchy.odem.model.${modelName}.remove` ) ) {
+				resAccessForbidden( res );
 				return;
 			}
 
@@ -750,7 +740,7 @@ module.exports = function() {
 							} ) )
 							.catch( error => {
 								logError( "removing %s:", routeName, error );
-								res.status( 500 ).json( { error: error.message } );
+								res.status( error.statusCode || 500 ).json( { error: error.message } );
 							} );
 					}
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@hitchy/plugin-odem-rest",
-	"version": "0.7.0",
+	"version": "0.7.2",
 	"description": "HTTP REST API for Hitchy's document-oriented database",
 	"main": "index.js",
 	"scripts": {

package/readme.md

@@ -2,7 +2,7 @@
 
 HTTP REST API for [Hitchy's](https://core.hitchy.org/) [document-oriented database](https://odem.hitchy.org/)
 
-[Hitchy](http://core.hitchy.org/) is a server-side framework for developing web applications with [Node.js](https://nodejs.org/). [Odem](https://www.npmjs.com/package/@hitchy/plugin-odem) is a plugin for Hitchy implementing a document-oriented database using data backends like regular file systems, LevelDBs and temporary in-memory databases.
+[Hitchy](http://core.hitchy.org/) is a server-side framework for developing web applications with [Node.js](https://nodejs.org/). [Odem](https://www.npmjs.com/package/@hitchy/plugin-odem) is a plugin for Hitchy implementing a document-oriented database using data backends like regular file systems, temporary in-memory databases and third-party key-value stores.
  
 This plugin is defining blueprint routes for accessing data managed in document-oriented database using REST API.