feat: upgrade to body-parser 2.x (#572)

Author: pleary

lib/controllers/v1/computervision_controller.js

@@ -96,7 +96,7 @@ const ComputervisionController = class ComputervisionController {
     if ( !req.userSession && !req.applicationSession ) {
       throw util.httpError( 401, "Unauthorized" );
     }
-    const photoURL = req.query.image_url || req.body.image_url;
+    const photoURL = req.query.image_url || req.body?.image_url;
     if ( !photoURL ) {
       throw util.httpError( 422, "No scorable photo" );
     }
@@ -164,7 +164,7 @@ const ComputervisionController = class ComputervisionController {
     if ( !req.userSession && !req.applicationSession ) {
       throw util.httpError( 401, "Unauthorized" );
     }
-    if ( req.userSession?.isAdmin && req.body.image_url ) {
+    if ( req.userSession?.isAdmin && req.body?.image_url ) {
       return ComputervisionController.scoreImageURL( req );
     }
     req.file = req.file || (
@@ -192,33 +192,33 @@ const ComputervisionController = class ComputervisionController {
     } );
     formData.append( "geomodel", "true" );
     formData.append( "format", "object" );
-    if ( req.body.taxon_id ) {
+    if ( req.body?.taxon_id ) {
       formData.append( "taxon_id", req.body.taxon_id );
     }
-    if ( req.body.aggregated || req.query.aggregated ) {
+    if ( req.body?.aggregated || req.query.aggregated ) {
       formData.append( "aggregated", "true" );
     }
-    const testFeature = req.body.test_feature || req.query.test_feature;
+    const testFeature = req.body?.test_feature || req.query.test_feature;
     if ( testFeature === "ancestor_unrestricted" ) {
       formData.append( "common_ancestor_rank_type", "unrestricted" );
     } else if ( testFeature === "ancestor_major_ranks" ) {
       formData.append( "common_ancestor_rank_type", "major" );
     }
-    if ( !req.body.skip_frequencies && req.body.lat && req.body.lng ) {
+    if ( !req.body?.skip_frequencies && req.body?.lat && req.body?.lng ) {
       formData.append( "lat", req.body.lat );
       formData.append( "lng", req.body.lng );
     }
 
-    if ( req.body.include_representative_photos
+    if ( req.body?.include_representative_photos
       || req.query.include_representative_photos
     ) {
       formData.append( "return_embedding", "true" );
     }
 
-    if ( req.body.human_exclusion
+    if ( req.body?.human_exclusion
       || req.query.human_exclusion
     ) {
-      formData.append( "human_exclusion", req.body.human_exclusion || req.query.human_exclusion );
+      formData.append( "human_exclusion", req.body?.human_exclusion || req.query.human_exclusion );
     }
 
     const requestAbortController = new AbortController( );
@@ -354,7 +354,7 @@ const ComputervisionController = class ComputervisionController {
       s.frequency_score = s.geo_score >= s.geo_threshold ? 1 : 0;
       s.taxon_id = s.id;
       delete s.id;
-      if ( !( req.body.aggregated || req.query.aggregated ) ) {
+      if ( !( req.body?.aggregated || req.query.aggregated ) ) {
         s.original_geo_score = s.geo_score;
         s.original_combined_score = s.combined_score;
         delete s.geo_threshold;
@@ -366,13 +366,13 @@ const ComputervisionController = class ComputervisionController {
     await ESModel.fetchBelongsTo( withTaxa, Taxon, taxonOpts );
     await Taxon.preloadIntoTaxonPhotos( _.map( _.filter( withTaxa, "taxon" ), "taxon" ), { localeOpts } );
 
-    if ( !( req.body.aggregated || req.query.aggregated ) ) {
+    if ( !( req.body?.aggregated || req.query.aggregated ) ) {
       _.each( withTaxa, s => {
         delete s.taxon_id;
       } );
     }
 
-    if ( req.body.include_representative_photos
+    if ( req.body?.include_representative_photos
       || req.query.include_representative_photos
     ) {
       await ComputervisionController.addRepresentativePhotos(

lib/controllers/v1/taxa_controller.js

@@ -917,7 +917,7 @@ TaxaController.suggestifyRequest = async req => {
   req.suggestParams = _.cloneDeep( req.query );
   // For a POST request, all the relevant params may be in the POST body instead
   // of the query
-  if ( _.isEmpty( req.suggestParams ) ) {
+  if ( _.isEmpty( req.suggestParams ) && !_.isEmpty( req.body ) ) {
     req.suggestParams = _.cloneDeep( req.body );
     delete req.suggestParams.image;
   }

lib/controllers/v2/identifications_controller.js

@@ -29,6 +29,7 @@ const destroy = async req => {
   delete req.params.uuid;
   // Override the crazy thing in the Rails API that just withdraws when you
   // try to delete. DELETE should really delete.
+  req.body ||= { };
   req.body.delete = true;
   return ctrlv1.delete( req );
 };

lib/controllers/v2/log_controller.js

@@ -1,5 +1,5 @@
 const create = async req => {
-  if ( req.body.level === "error" ) {
+  if ( req.body?.level === "error" ) {
     req._logClientError = true;
     req.body.error_message = req.body.message;
   } else {

lib/controllers/v2/observations_controller.js

@@ -78,7 +78,9 @@ const taxonSummary = async req => {
   }
   delete req.params.uuid;
   delete req.query.fields;
-  delete req.body.fields;
+  if ( !_.isEmpty( req.body ) ) {
+    delete req.body.fields;
+  }
   const r = await InaturalistAPI.iNatJSWrap( inatjs.observations.taxonSummary, req );
   // Prune the Rails response to match the API schema
   // TODO make a re-usable method that coerces an object something that fits a Joi schema

lib/inaturalist_api_v2.js

@@ -390,7 +390,7 @@ const InaturalistAPIV2 = class InaturalistAPIV2 {
 
   // Extract the requested response fields
   static requestFields( req ) {
-    const fields = req.body.fields || req.query.fields;
+    const fields = req.body?.fields || req.query.fields;
     // fields may already be an object, if so return
     if ( _.isObject( fields ) ) {
       return fields;

lib/logstasher.js

@@ -154,7 +154,7 @@ const Logstasher = class Logstasher {
       return;
     }
 
-    _.each( req.body.extra, ( v, k ) => {
+    _.each( req.body?.extra, ( v, k ) => {
       if ( !_.isObject( v ) ) {
         payload.extra ||= { };
         payload.extra[k] = v;