@spytecgps/lambda-utils 2.3.15 → 2.3.16

package/dist/index.js

@@ -166,6 +166,35 @@ const SpytecJoi = Joi__namespace.extend((joi) => ({
     },
 }));
 
+const getAuthorizerValidator = (params = {}) => {
+    return Joi__namespace.object({
+        clientId: Joi__namespace.number(),
+        resources: json.object({}),
+        scope: Joi__namespace.string().optional(),
+        //       .error(() => new UnauthorizedError(`missing scope ${scope}`))
+        type: Joi__namespace.string().optional(),
+        //       .error(() => new UnauthorizedError(`missing user type ${type}`))
+        enterprise: Joi__namespace.boolean().default(false),
+        maintenanceModule: Joi__namespace.boolean().default(false),
+        billingMethod: Joi__namespace.string().optional(),
+        customerSegment: Joi__namespace.string().optional(),
+        securityGroupTagId: Joi__namespace.number().optional().allow(null),
+        securityRole: Joi__namespace.string().optional().allow(null),
+        ...params,
+    });
+};
+/**
+ * @deprecated
+ */
+const requestContextValidator = Joi__namespace.object({
+    authorizer: getAuthorizerValidator(),
+});
+const getRequestContextValidator = (params = {}) => {
+    return Joi__namespace.object({
+        authorizer: getAuthorizerValidator(params),
+    });
+};
+
 class HttpError extends Error {
 }
 
@@ -204,40 +233,6 @@ class UnauthorizedError extends HttpError {
     name = 'UnauthorizedError';
 }
 
-const getAuthorizerValidator = ({ scope, type } = {}) => {
-    return Joi__namespace.object({
-        clientId: Joi__namespace.number(),
-        resources: json.object({}),
-        scope: scope
-            ? Joi__namespace.string()
-                .pattern(new RegExp(`${scope}`))
-                .error(() => new UnauthorizedError(`missing scope ${scope}`))
-            : Joi__namespace.optional(),
-        type: type
-            ? Joi__namespace.any()
-                .valid(type)
-                .error(() => new UnauthorizedError(`missing user type ${type}`))
-            : Joi__namespace.optional(),
-        enterprise: Joi__namespace.boolean().default(false),
-        maintenanceModule: Joi__namespace.boolean().default(false),
-        billingMethod: Joi__namespace.string().optional(),
-        customerSegment: Joi__namespace.string().optional(),
-        securityGroupTagId: Joi__namespace.number().optional().allow(null),
-        securityRole: Joi__namespace.string().optional().allow(null),
-    });
-};
-/**
- * @deprecated
- */
-const requestContextValidator = Joi__namespace.object({
-    authorizer: getAuthorizerValidator(),
-});
-const getRequestContextValidator = (params = {}) => {
-    return Joi__namespace.object({
-        authorizer: getAuthorizerValidator(params),
-    });
-};
-
 const validateEvent = (event, schema, validateOptions) => {
     if (!schema) {
         sdkLogger.logger.warn(`skipping validation`);

package/dist/validation/requestContext.d.ts

@@ -1,11 +1,8 @@
 import { APIGatewayEventRequestContextWithAuthorizer } from 'aws-lambda/common/api-gateway';
 import * as Joi from 'joi';
-import { AuthClass, SpytecAuthContext } from '../types';
-interface GetAuthorizerValidatorParams {
-    scope?: string;
-    type?: AuthClass;
-}
-export declare const getAuthorizerValidator: ({ scope, type }?: GetAuthorizerValidatorParams) => Joi.ObjectSchema<SpytecAuthContext>;
+import { SpytecAuthContext } from '../types';
+type GetAuthorizerValidatorParams = Partial<Record<keyof SpytecAuthContext, Joi.AnySchema>>;
+export declare const getAuthorizerValidator: (params?: GetAuthorizerValidatorParams) => Joi.ObjectSchema<SpytecAuthContext>;
 /**
  * @deprecated
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spytecgps/lambda-utils",
-  "version": "2.3.15",
+  "version": "2.3.16",
   "description": "Lambda Utils",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",