@driveflux/api-functions 1.0.52 → 1.0.53

package/dist/reservation/agree.js

@@ -19,4 +19,5 @@ export const handleAgreeToTerms = async ({ agreedToTerms, subscribingUser, ipAdd
             }
         });
     }
+    return subscribingUser;
 };

package/dist/reservation/checks.js

@@ -1,12 +1,9 @@
-import { ForbiddenError, subject } from '@casl/ability';
 import { buildOrDefineAbility } from '@driveflux/auth/authorization';
 import { makeProblem, PROBLEM_CONDITION_FAILED, PROBLEM_RESOURCE_BUSY } from '@driveflux/problem';
 import { Err, Ok } from '@driveflux/result';
-export const checkIfUserCanReserve = async ({ requestUser, subscribingUser })=>{
+export const getUserAbility = async ({ requestUser })=>{
     // Check if the user can reserve
     const requestUserAbility = await buildOrDefineAbility(requestUser);
-    // Check if user can reserve
-    ForbiddenError.from(requestUserAbility).throwUnlessCan('reserveVehicle', subject('User', subscribingUser));
     return requestUserAbility;
 };
 export const checkIfVehicleIsAvailableForReservation = async (vehicle, plan, allowDelisted)=>{

package/dist/reservation/reserve.js

@@ -1,6 +1,7 @@
-import { Ok } from '@driveflux/result';
+import { makeProblem, PROBLEM_UNAUTHORIZED } from '@driveflux/problem';
+import { Err, Ok } from '@driveflux/result';
 import { handleAgreeToTerms } from './agree.js';
-import { checkIfUserCanReserve } from './checks.js';
+import { getUserAbility } from './checks.js';
 import { ensureUserBillingAddress } from './ensure-user-billing-address.js';
 import { fetchOrCreateReservation } from './fetch-or-create.js';
 import { getPayer } from './payer.js';
@@ -16,9 +17,12 @@ const processBody = (body)=>{
 export const reserveVehicle = async (vehicleId, unprocessed)=>{
     const body = processBody(unprocessed);
     // Agree to terms if not done yet
-    await handleAgreeToTerms(body);
+    body.subscribingUser = await handleAgreeToTerms(body);
     // Check if the user can reserve
-    const requesterAbility = await checkIfUserCanReserve(body);
+    const requesterAbility = await getUserAbility(body);
+    if (body.subscribingUser.banned) {
+        return new Err(makeProblem(PROBLEM_UNAUTHORIZED, 'You are banned from reserving vehicles'));
+    }
     // Payer
     const payerResult = await getPayer(body);
     if (payerResult.err) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@driveflux/api-functions",
-  "version": "1.0.52",
+  "version": "1.0.53",
   "type": "module",
   "exports": {
     "./notion": {