@churchapps/apihelper 0.0.22 → 0.0.24

package/.prettierrc.json

@@ -0,0 +1,13 @@
+{
+  "printWidth": 120,
+  "tabWidth": 2,
+  "useTabs": false,
+  "semi": true,
+  "singleQuote": false,
+  "quoteProps": "as-needed",
+  "trailingComma": "none",
+  "bracketSpacing": true,
+  "bracketSameLine": false,
+  "arrowParens": "avoid",
+  "endOfLine": "lf"
+}

package/CLAUDE.md

@@ -0,0 +1,110 @@
+# CLAUDE.md
+
+This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
+
+## Project Overview
+
+This is the `@churchapps/apihelper` package - a Node.js/Express.js server-side utility library that provides common functionality for ChurchApps API projects. It serves as a foundation layer for building REST APIs with authentication, database access, AWS integration, and error handling.
+
+## Key Dependencies
+
+- **Core**: Express.js with Inversify for dependency injection
+- **AWS SDK v3**: S3, SES, CloudWatch Logs, SSM Parameter Store
+- **Database**: MySQL2 with connection pooling
+- **Authentication**: JSON Web Tokens (JWT)
+- **Depends on**: `@churchapps/helpers` (base utilities package)
+
+## Common Development Commands
+
+```bash
+# Build the package
+npm run clean      # Remove dist folder
+npm run tsc        # TypeScript compilation only  
+npm run build      # Full build (clean + tsc + copy-assets)
+
+# Code quality
+npm run lint       # Run ESLint
+npm run lint:fix   # Auto-fix lint issues
+npm run format     # Format code with Prettier
+npm run format:check # Check formatting
+
+# Local development
+npm run build
+npm link
+
+# In consuming project
+npm link @churchapps/apihelper
+
+# Publishing
+npm run build
+npm publish --access=public
+```
+
+## Architecture Overview
+
+### Core Components
+
+1. **Authentication System** (`/auth`)
+   - `CustomAuthProvider`: Inversify-based authentication provider
+   - `AuthenticatedUser`: User session management with JWT
+   - `Principal`: Security principal for authorization checks
+
+2. **Base Controllers** (`/controllers`)
+   - `CustomBaseController`: Extends Inversify's BaseHttpController
+     - Provides error handling (`internalServerError`, `notFound`, `conflict`)
+     - Authentication helpers (`loadUser`, `checkAccess`)
+     - Request utilities (`getNumber`, `getBoolean`, `getDate`)
+   - `ErrorController`: Centralized error logging to database
+
+3. **AWS Integration** (`/helpers`)
+   - `AwsHelper`: S3 operations, SSM parameter reading, presigned URLs
+   - `FileStorageHelper`: Abstraction for file storage operations
+   - `EmailHelper`: Dual support for SMTP and AWS SES
+   - `LoggingHelper`: Winston logging with CloudWatch integration
+
+4. **Database Layer** (`/helpers`)
+   - `DB`: Promise-based MySQL query wrapper
+   - `Pool`: MySQL connection pooling management
+   - `MySqlHelper`: MySQL-specific utilities
+   - `DBCreator`: Database schema creation utilities
+
+### Key Technical Details
+
+- **Inversify Decorators**: Controllers use `@controller`, `@httpGet`, etc.
+- **Environment Configuration**: `EnvironmentBase` class handles env vars with SSM fallback
+- **Email Templates**: HTML templates copied to dist/templates during build
+- **TypeScript**: Targets ES2020 with decorators enabled, declaration files generated
+
+### Important Notes
+
+- **Build Process Issue**: The copy-assets script references `src/apiBase/tools/templates/*` but the actual path is `src/tools/templates/*`
+- **No Test Suite**: Currently no tests configured in package.json
+- **Environment Variables**: Expects `CONNECTION_STRING`, `ENCRYPTION_KEY`, `JWT_SECRET`, `SMTP_*` configs
+
+## Usage Pattern
+
+This package is designed to be extended by API projects:
+
+```typescript
+// Example controller
+import { controller, httpGet } from "inversify-express-utils";
+import { CustomBaseController } from "@churchapps/apihelper";
+
+@controller("/api/example")
+export class ExampleController extends CustomBaseController {
+    @httpGet("/")
+    public async getAll(req: express.Request, res: express.Response): Promise<any> {
+        return this.actionWrapper(req, res, async () => {
+            // Implementation
+        });
+    }
+}
+```
+
+## Development Workflow
+
+1. Controllers extend `CustomBaseController` for built-in error handling and utilities
+2. Use `EnvironmentBase` for configuration management
+3. Database queries through `DB.query()` or `DB.queryOne()`
+4. AWS operations via `AwsHelper` static methods
+5. Logging through `LoggingHelper.getInstance()` singleton

package/dist/auth/AuthenticatedUser.js

@@ -16,12 +16,11 @@ class AuthenticatedUser {
         this.groupIds = principal.details.groupIds;
     }
     checkAccess(permission) {
-        var _a;
         const key = (permission.apiName)
             ? permission.apiName + "_" + permission.contentType + "__" + permission.action
             : permission.contentType + "__" + permission.action;
         let result = false;
-        (_a = this.permissions) === null || _a === void 0 ? void 0 : _a.forEach((p) => {
+        this.permissions?.forEach((p) => {
             if (p === key)
                 result = true;
         });

package/dist/auth/AuthenticatedUser.js.map

@@ -1 +1 @@
-{"version":3,"file":"AuthenticatedUser.js","sourceRoot":"","sources":["../../src/auth/AuthenticatedUser.ts"],"names":[],"mappings":";;;AAGA,MAAa,iBAAiB;IAa5B,YAAmB,SAAoB;QACrC,IAAI,CAAC,GAAG,GAAG,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC;QACjC,IAAI,CAAC,EAAE,GAAG,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC;QAC/B,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC;QAC3C,IAAI,CAAC,WAAW,GAAG,SAAS,CAAC,OAAO,CAAC,WAAW,CAAC;QACjD,IAAI,CAAC,OAAO,GAAG,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC;QACzC,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC;QACrC,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC;QAC3C,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC,SAAS,CAAC;QAC7C,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC;QAC3C,IAAI,CAAC,gBAAgB,GAAG,SAAS,CAAC,OAAO,CAAC,gBAAgB,CAAC;QAC3D,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC;IAC7C,CAAC;IAEM,WAAW,CAAC,UAAuB;;QACxC,MAAM,GAAG,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC;YAC9B,CAAC,CAAC,UAAU,CAAC,OAAO,GAAG,GAAG,GAAG,UAAU,CAAC,WAAW,GAAG,IAAI,GAAG,UAAU,CAAC,MAAM;YAC9E,CAAC,CAAC,UAAU,CAAC,WAAW,GAAG,IAAI,GAAG,UAAU,CAAC,MAAM,CAAC;QAEtD,IAAI,MAAM,GAAG,KAAK,CAAC;QACnB,MAAA,IAAI,CAAC,WAAW,0CAAE,OAAO,CAAC,CAAC,CAAS,EAAE,EAAE;YACtC,IAAI,CAAC,KAAK,GAAG;gBAAE,MAAM,GAAG,IAAI,CAAC;QAC/B,CAAC,CAAC,CAAC;QACH,OAAO,MAAM,CAAC;IAChB,CAAC;CACF;AAtCD,8CAsCC"}
+{"version":3,"file":"AuthenticatedUser.js","sourceRoot":"","sources":["../../src/auth/AuthenticatedUser.ts"],"names":[],"mappings":";;;AAGA,MAAa,iBAAiB;IAa5B,YAAmB,SAAoB;QACrC,IAAI,CAAC,GAAG,GAAG,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC;QACjC,IAAI,CAAC,EAAE,GAAG,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC;QAC/B,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC;QAC3C,IAAI,CAAC,WAAW,GAAG,SAAS,CAAC,OAAO,CAAC,WAAW,CAAC;QACjD,IAAI,CAAC,OAAO,GAAG,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC;QACzC,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC;QACrC,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC;QAC3C,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC,SAAS,CAAC;QAC7C,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC;QAC3C,IAAI,CAAC,gBAAgB,GAAG,SAAS,CAAC,OAAO,CAAC,gBAAgB,CAAC;QAC3D,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC;IAC7C,CAAC;IAEM,WAAW,CAAC,UAAuB;QACxC,MAAM,GAAG,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC;YAC9B,CAAC,CAAC,UAAU,CAAC,OAAO,GAAG,GAAG,GAAG,UAAU,CAAC,WAAW,GAAG,IAAI,GAAG,UAAU,CAAC,MAAM;YAC9E,CAAC,CAAC,UAAU,CAAC,WAAW,GAAG,IAAI,GAAG,UAAU,CAAC,MAAM,CAAC;QAEtD,IAAI,MAAM,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC,CAAS,EAAE,EAAE;YACtC,IAAI,CAAC,KAAK,GAAG;gBAAE,MAAM,GAAG,IAAI,CAAC;QAC/B,CAAC,CAAC,CAAC;QACH,OAAO,MAAM,CAAC;IAChB,CAAC;CACF;AAtCD,8CAsCC"}

package/dist/auth/CustomAuthProvider.d.ts

@@ -2,6 +2,6 @@ import { interfaces } from "inversify-express-utils";
 import express from "express";
 import { Principal } from "./";
 export declare class CustomAuthProvider implements interfaces.AuthProvider {
-    getUser(req: express.Request, res: express.Response, next: express.NextFunction): Promise<Principal>;
+    getUser(req: express.Request, _res: express.Response, _next: express.NextFunction): Promise<Principal>;
 }
 //# sourceMappingURL=CustomAuthProvider.d.ts.map

package/dist/auth/CustomAuthProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CustomAuthProvider.d.ts","sourceRoot":"","sources":["../../src/auth/CustomAuthProvider.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,OAAO,MAAM,SAAS,CAAC;AAE9B,OAAO,EAAE,SAAS,EAAE,MAAM,IAAI,CAAC;AAG/B,qBACa,kBAAmB,YAAW,UAAU,CAAC,YAAY;IAEnD,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,QAAQ,EAAE,IAAI,EAAE,OAAO,CAAC,YAAY,GAAG,OAAO,CAAC,SAAS,CAAC;CAclH"}
+{"version":3,"file":"CustomAuthProvider.d.ts","sourceRoot":"","sources":["../../src/auth/CustomAuthProvider.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,OAAO,MAAM,SAAS,CAAC;AAE9B,OAAO,EAAE,SAAS,EAAE,MAAM,IAAI,CAAC;AAG/B,qBACa,kBAAmB,YAAW,UAAU,CAAC,YAAY;IAEnD,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,QAAQ,EAAE,KAAK,EAAE,OAAO,CAAC,YAAY,GAAG,OAAO,CAAC,SAAS,CAAC;CAcpH"}

package/dist/auth/CustomAuthProvider.js

@@ -5,15 +5,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -25,21 +16,19 @@ const _1 = require("./");
 const __1 = require("..");
 let CustomAuthProvider = class CustomAuthProvider {
     // public async getUser(req: express.Request, res: express.Response, next: express.NextFunction): Promise<interfaces.Principal> {
-    getUser(req, res, next) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const authHeader = req.headers.authorization;
-            if (authHeader) {
-                const token = authHeader.split(" ")[1];
-                if (!token)
-                    return null;
-                const decoded = jsonwebtoken_1.default.verify(token, __1.EnvironmentBase.jwtSecret);
-                const result = decoded ? new _1.Principal(decoded) : null;
-                if (result)
-                    result.details.jwt = token;
-                return result;
-            }
-            return null;
-        });
+    async getUser(req, _res, _next) {
+        const authHeader = req.headers.authorization;
+        if (authHeader) {
+            const token = authHeader.split(" ")[1];
+            if (!token)
+                return null;
+            const decoded = jsonwebtoken_1.default.verify(token, __1.EnvironmentBase.jwtSecret);
+            const result = decoded ? new _1.Principal(decoded) : null;
+            if (result)
+                result.details.jwt = token;
+            return result;
+        }
+        return null;
     }
 };
 exports.CustomAuthProvider = CustomAuthProvider;

package/dist/auth/CustomAuthProvider.js.map

@@ -1 +1 @@
-{"version":3,"file":"CustomAuthProvider.js","sourceRoot":"","sources":["../../src/auth/CustomAuthProvider.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA,yCAAuC;AAGvC,gEAA+B;AAC/B,yBAA+B;AAC/B,0BAAqC;AAG9B,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAC7B,iIAAiI;IACpH,OAAO,CAAC,GAAoB,EAAE,GAAqB,EAAE,IAA0B;;YAC1F,MAAM,UAAU,GAAG,GAAG,CAAC,OAAO,CAAC,aAAa,CAAC;YAC7C,IAAI,UAAU,EAAE,CAAC;gBACf,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;gBACvC,IAAI,CAAC,KAAK;oBAAE,OAAO,IAAI,CAAC;gBACxB,MAAM,OAAO,GAAG,sBAAG,CAAC,MAAM,CAAC,KAAK,EAAE,mBAAe,CAAC,SAAS,CAAC,CAAC;gBAE7D,MAAM,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,IAAI,YAAS,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;gBACvD,IAAI,MAAM;oBAAE,MAAM,CAAC,OAAO,CAAC,GAAG,GAAG,KAAK,CAAC;gBACvC,OAAO,MAAM,CAAC;YAChB,CAAC;YAED,OAAO,IAAI,CAAC;QACd,CAAC;KAAA;CACF,CAAA;AAhBY,gDAAkB;6BAAlB,kBAAkB;IAD9B,IAAA,sBAAU,GAAE;GACA,kBAAkB,CAgB9B"}
+{"version":3,"file":"CustomAuthProvider.js","sourceRoot":"","sources":["../../src/auth/CustomAuthProvider.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yCAAuC;AAGvC,gEAA+B;AAC/B,yBAA+B;AAC/B,0BAAqC;AAG9B,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAC7B,iIAAiI;IAC1H,KAAK,CAAC,OAAO,CAAC,GAAoB,EAAE,IAAsB,EAAE,KAA2B;QAC5F,MAAM,UAAU,GAAG,GAAG,CAAC,OAAO,CAAC,aAAa,CAAC;QAC7C,IAAI,UAAU,EAAE,CAAC;YACf,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;YACvC,IAAI,CAAC,KAAK;gBAAE,OAAO,IAAI,CAAC;YACxB,MAAM,OAAO,GAAG,sBAAG,CAAC,MAAM,CAAC,KAAK,EAAE,mBAAe,CAAC,SAAS,CAAC,CAAC;YAE7D,MAAM,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,IAAI,YAAS,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;YACvD,IAAI,MAAM;gBAAE,MAAM,CAAC,OAAO,CAAC,GAAG,GAAG,KAAK,CAAC;YACvC,OAAO,MAAM,CAAC;QAChB,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;CACF,CAAA;AAhBY,gDAAkB;6BAAlB,kBAAkB;IAD9B,IAAA,sBAAU,GAAE;GACA,kBAAkB,CAgB9B"}

package/dist/controllers/CustomBaseController.d.ts

@@ -5,11 +5,11 @@ import { AuthenticatedUser } from "../auth";
 export declare class CustomBaseController extends BaseHttpController {
     logger: LoggingHelper;
     constructor();
-    error(errors: string[]): import("inversify-express-utils/lib/results").JsonResult;
-    denyAccess(errors: string[]): import("inversify-express-utils/lib/results").JsonResult;
+    error(errors: string[]): import("inversify-express-utils/lib/cjs/results").JsonResult;
+    denyAccess(errors: string[]): import("inversify-express-utils/lib/cjs/results").JsonResult;
     authUser(): AuthenticatedUser;
     include(req: express.Request, item: string): boolean;
-    actionWrapper(req: express.Request, res: express.Response, fetchFunction: (au: AuthenticatedUser) => any): Promise<any>;
-    actionWrapperAnon(req: express.Request, res: express.Response, fetchFunction: () => any): Promise<any>;
+    actionWrapper(_req: express.Request, _res: express.Response, fetchFunction: (_au: AuthenticatedUser) => any): Promise<any>;
+    actionWrapperAnon(_req: express.Request, _res: express.Response, fetchFunction: () => any): Promise<any>;
 }
 //# sourceMappingURL=CustomBaseController.d.ts.map

package/dist/controllers/CustomBaseController.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CustomBaseController.d.ts","sourceRoot":"","sources":["../../src/controllers/CustomBaseController.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAAE,iBAAiB,EAAa,MAAM,SAAS,CAAA;AAEtD,qBAAa,oBAAqB,SAAQ,kBAAkB;IAEjD,MAAM,EAAE,aAAa,CAAC;;IAOtB,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE;IAItB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE;IAI3B,QAAQ,IAAI,iBAAiB;IAK7B,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM;IAUpC,aAAa,CAAC,GAAG,EAAE,OAAO,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,QAAQ,EAAE,aAAa,EAAE,CAAC,EAAE,EAAE,iBAAiB,KAAK,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;IAiBvH,iBAAiB,CAAC,GAAG,EAAE,OAAO,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,QAAQ,EAAE,aAAa,EAAE,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;CAmBtH"}
+{"version":3,"file":"CustomBaseController.d.ts","sourceRoot":"","sources":["../../src/controllers/CustomBaseController.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAAE,iBAAiB,EAAa,MAAM,SAAS,CAAA;AAEtD,qBAAa,oBAAqB,SAAQ,kBAAkB;IAEjD,MAAM,EAAE,aAAa,CAAC;;IAOtB,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE;IAItB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE;IAI3B,QAAQ,IAAI,iBAAiB;IAK7B,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM;IAUpC,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,QAAQ,EAAE,aAAa,EAAE,CAAC,GAAG,EAAE,iBAAiB,KAAK,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;IAiB1H,iBAAiB,CAAC,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,QAAQ,EAAE,aAAa,EAAE,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;CAmBxH"}

package/dist/controllers/CustomBaseController.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CustomBaseController = void 0;
 const inversify_express_utils_1 = require("inversify-express-utils");
@@ -40,43 +31,39 @@ class CustomBaseController extends inversify_express_utils_1.BaseHttpController
         }
         return result;
     }
-    actionWrapper(req, res, fetchFunction) {
-        return __awaiter(this, void 0, void 0, function* () {
+    async actionWrapper(_req, _res, fetchFunction) {
+        try {
+            const result = await fetchFunction(this.authUser());
+            await this.logger.flush();
+            return result;
+        }
+        catch (e) {
             try {
-                const result = yield fetchFunction(this.authUser());
-                yield this.logger.flush();
-                return result;
+                this.logger.error(e);
+                await this.logger.flush();
             }
             catch (e) {
-                try {
-                    this.logger.error(e);
-                    yield this.logger.flush();
-                }
-                catch (e) {
-                    console.log(e);
-                }
-                return this.internalServerError(e);
+                console.log(e);
             }
-        });
+            return this.internalServerError(e);
+        }
     }
-    actionWrapperAnon(req, res, fetchFunction) {
-        return __awaiter(this, void 0, void 0, function* () {
+    async actionWrapperAnon(_req, _res, fetchFunction) {
+        try {
+            const result = await fetchFunction();
+            await this.logger.flush();
+            return result;
+        }
+        catch (e) {
             try {
-                const result = yield fetchFunction();
-                yield this.logger.flush();
-                return result;
+                this.logger.error(e);
+                await this.logger.flush();
             }
             catch (e) {
-                try {
-                    this.logger.error(e);
-                    yield this.logger.flush();
-                }
-                catch (e) {
-                    console.log(e);
-                }
-                return this.internalServerError(e);
+                console.log(e);
             }
-        });
+            return this.internalServerError(e);
+        }
     }
 }
 exports.CustomBaseController = CustomBaseController;

package/dist/controllers/CustomBaseController.js.map

@@ -1 +1 @@
-{"version":3,"file":"CustomBaseController.js","sourceRoot":"","sources":["../../src/controllers/CustomBaseController.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qEAA6D;AAE7D,4DAAyD;AACzD,kCAAsD;AAEtD,MAAa,oBAAqB,SAAQ,4CAAkB;IAIxD;QACI,KAAK,EAAE,CAAA;QACP,IAAI,CAAC,MAAM,GAAG,6BAAa,CAAC,UAAU,EAAE,CAAC;IAC7C,CAAC;IAEM,KAAK,CAAC,MAAgB;QACzB,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,GAAG,CAAC,CAAC;IACtC,CAAC;IAEM,UAAU,CAAC,MAAgB;QAC9B,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,GAAG,CAAC,CAAC;IACtC,CAAC;IAEM,QAAQ;QACX,IAAI,IAAI,CAAC,WAAW,CAAC,IAAI,KAAK,IAAI;YAAE,OAAO,IAAI,wBAAiB,CAAC,IAAI,gBAAS,CAAC,EAAE,CAAC,CAAC,CAAC;;YAC/E,OAAO,IAAI,wBAAiB,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IAC7D,CAAC;IAEM,OAAO,CAAC,GAAoB,EAAE,IAAY;QAC7C,IAAI,MAAM,GAAG,KAAK,CAAC;QACnB,IAAI,GAAG,CAAC,KAAK,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;YAClC,MAAM,KAAK,GAAW,GAAG,CAAC,KAAK,CAAC,OAAiB,CAAC;YAClD,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC/B,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBAAE,MAAM,GAAG,IAAI,CAAC;QAChD,CAAC;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IAEY,aAAa,CAAC,GAAoB,EAAE,GAAqB,EAAE,aAA6C;;YACjH,IAAI,CAAC;gBACD,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;gBACpD,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;gBAC1B,OAAO,MAAM,CAAC;YAClB,CAAC;YAAC,OAAO,CAAK,EAAE,CAAC;gBACb,IAAI,CAAC;oBACD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;oBACrB,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;gBAC9B,CAAC;gBAAC,OAAO,CAAC,EAAE,CAAC;oBACT,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;gBACnB,CAAC;gBAED,OAAO,IAAI,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC;YACvC,CAAC;QACL,CAAC;KAAA;IAEY,iBAAiB,CAAC,GAAoB,EAAE,GAAqB,EAAE,aAAwB;;YAChG,IAAI,CAAC;gBACD,MAAM,MAAM,GAAG,MAAM,aAAa,EAAE,CAAC;gBACrC,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;gBAC1B,OAAO,MAAM,CAAC;YAClB,CAAC;YAAC,OAAO,CAAK,EAAE,CAAC;gBACb,IAAI,CAAC;oBACD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;oBACrB,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;gBAC9B,CAAC;gBAAC,OAAO,CAAC,EAAE,CAAC;oBACT,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;gBACnB,CAAC;gBAED,OAAO,IAAI,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC;YACvC,CAAC;QACL,CAAC;KAAA;CAIJ;AApED,oDAoEC"}
+{"version":3,"file":"CustomBaseController.js","sourceRoot":"","sources":["../../src/controllers/CustomBaseController.ts"],"names":[],"mappings":";;;AAAA,qEAA6D;AAE7D,4DAAyD;AACzD,kCAAsD;AAEtD,MAAa,oBAAqB,SAAQ,4CAAkB;IAIxD;QACI,KAAK,EAAE,CAAA;QACP,IAAI,CAAC,MAAM,GAAG,6BAAa,CAAC,UAAU,EAAE,CAAC;IAC7C,CAAC;IAEM,KAAK,CAAC,MAAgB;QACzB,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,GAAG,CAAC,CAAC;IACtC,CAAC;IAEM,UAAU,CAAC,MAAgB;QAC9B,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,GAAG,CAAC,CAAC;IACtC,CAAC;IAEM,QAAQ;QACX,IAAI,IAAI,CAAC,WAAW,CAAC,IAAI,KAAK,IAAI;YAAE,OAAO,IAAI,wBAAiB,CAAC,IAAI,gBAAS,CAAC,EAAE,CAAC,CAAC,CAAC;;YAC/E,OAAO,IAAI,wBAAiB,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IAC7D,CAAC;IAEM,OAAO,CAAC,GAAoB,EAAE,IAAY;QAC7C,IAAI,MAAM,GAAG,KAAK,CAAC;QACnB,IAAI,GAAG,CAAC,KAAK,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;YAClC,MAAM,KAAK,GAAW,GAAG,CAAC,KAAK,CAAC,OAAiB,CAAC;YAClD,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC/B,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBAAE,MAAM,GAAG,IAAI,CAAC;QAChD,CAAC;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IAEM,KAAK,CAAC,aAAa,CAAC,IAAqB,EAAE,IAAsB,EAAE,aAA8C;QACpH,IAAI,CAAC;YACD,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;YACpD,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;YAC1B,OAAO,MAAM,CAAC;QAClB,CAAC;QAAC,OAAO,CAAK,EAAE,CAAC;YACb,IAAI,CAAC;gBACD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBACrB,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;YAC9B,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACT,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YACnB,CAAC;YAED,OAAO,IAAI,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC;QACvC,CAAC;IACL,CAAC;IAEM,KAAK,CAAC,iBAAiB,CAAC,IAAqB,EAAE,IAAsB,EAAE,aAAwB;QAClG,IAAI,CAAC;YACD,MAAM,MAAM,GAAG,MAAM,aAAa,EAAE,CAAC;YACrC,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;YAC1B,OAAO,MAAM,CAAC;QAClB,CAAC;QAAC,OAAO,CAAK,EAAE,CAAC;YACb,IAAI,CAAC;gBACD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBACrB,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;YAC9B,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACT,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YACnB,CAAC;YAED,OAAO,IAAI,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC;QACvC,CAAC;IACL,CAAC;CAIJ;AApED,oDAoEC"}

package/dist/controllers/ErrorController.d.ts

@@ -2,6 +2,6 @@ import express from "express";
 import { CustomBaseController } from "./CustomBaseController";
 import { ErrorLog } from "../models";
 export declare class ErrorController extends CustomBaseController {
-    save(req: express.Request<{}, {}, ErrorLog[]>, res: express.Response): Promise<any>;
+    save(req: express.Request<{}, {}, ErrorLog[]>, _res: express.Response): Promise<any>;
 }
 //# sourceMappingURL=ErrorController.d.ts.map

package/dist/controllers/ErrorController.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ErrorController.d.ts","sourceRoot":"","sources":["../../src/controllers/ErrorController.ts"],"names":[],"mappings":"AACA,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAC7D,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAA;AAGpC,qBACa,eAAgB,SAAQ,oBAAoB;IAGxC,IAAI,CAAC,GAAG,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC;CAsBnG"}
+{"version":3,"file":"ErrorController.d.ts","sourceRoot":"","sources":["../../src/controllers/ErrorController.ts"],"names":[],"mappings":"AACA,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAC7D,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAA;AAGpC,qBACa,eAAgB,SAAQ,oBAAoB;IAGxC,IAAI,CAAC,GAAG,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC;CAsBpG"}

package/dist/controllers/ErrorController.js

@@ -8,15 +8,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -26,28 +17,26 @@ const inversify_express_utils_1 = require("inversify-express-utils");
 const express_1 = __importDefault(require("express"));
 const CustomBaseController_1 = require("./CustomBaseController");
 let ErrorController = class ErrorController extends CustomBaseController_1.CustomBaseController {
-    save(req, res) {
-        return __awaiter(this, void 0, void 0, function* () {
-            // try {
-            /*
-            try {
-                au = this.authUser();
-            } catch (e) {
-                this.logger.log(req.body[0].application, "info", e);
-            }*/
-            req.body.forEach(error => {
-                let fullMessage = error.message;
-                if (error.additionalDetails !== undefined)
-                    fullMessage += "\n" + error.additionalDetails;
-                // if (au !== null) fullMessage += "\nUser: " + au.id + " Church: " + au.churchId;
-                this.logger.log(error.application, error.level, fullMessage);
-            });
-            yield this.logger.flush();
-            return req.body;
-            // } catch (e) {
-            // console.log(e)
-            // };
+    async save(req, _res) {
+        // try {
+        /*
+        try {
+            au = this.authUser();
+        } catch (e) {
+            this.logger.log(req.body[0].application, "info", e);
+        }*/
+        req.body.forEach(error => {
+            let fullMessage = error.message;
+            if (error.additionalDetails !== undefined)
+                fullMessage += "\n" + error.additionalDetails;
+            // if (au !== null) fullMessage += "\nUser: " + au.id + " Church: " + au.churchId;
+            this.logger.log(error.application, error.level, fullMessage);
         });
+        await this.logger.flush();
+        return req.body;
+        // } catch (e) {
+        // console.log(e)
+        // };
     }
 };
 exports.ErrorController = ErrorController;

package/dist/controllers/ErrorController.js.map

@@ -1 +1 @@
-{"version":3,"file":"ErrorController.js","sourceRoot":"","sources":["../../src/controllers/ErrorController.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAAA,qEAA8G;AAC9G,sDAA8B;AAC9B,iEAA6D;AAKtD,IAAM,eAAe,GAArB,MAAM,eAAgB,SAAQ,2CAAoB;IAGxC,IAAI,CAAC,GAAwC,EAAE,GAAqB;;YAC7E,QAAQ;YACR;;;;;eAKG;YACH,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;gBACrB,IAAI,WAAW,GAAG,KAAK,CAAC,OAAO,CAAC;gBAChC,IAAI,KAAK,CAAC,iBAAiB,KAAK,SAAS;oBAAE,WAAW,IAAI,IAAI,GAAG,KAAK,CAAC,iBAAiB,CAAC;gBACzF,kFAAkF;gBAClF,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,WAAW,EAAE,KAAK,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;YACjE,CAAC,CAAC,CAAC;YACH,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;YAC1B,OAAO,GAAG,CAAC,IAAI,CAAC;YAChB,gBAAgB;YAChB,iBAAiB;YACjB,KAAK;QAET,CAAC;KAAA;CAEJ,CAAA;AAzBY,0CAAe;AAGX;IADZ,IAAA,kCAAQ,EAAC,GAAG,CAAC;;;;2CAqBb;0BAvBQ,eAAe;IAD3B,IAAA,oCAAU,EAAC,SAAS,CAAC;GACT,eAAe,CAyB3B"}
+{"version":3,"file":"ErrorController.js","sourceRoot":"","sources":["../../src/controllers/ErrorController.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,qEAA+D;AAC/D,sDAA8B;AAC9B,iEAA6D;AAKtD,IAAM,eAAe,GAArB,MAAM,eAAgB,SAAQ,2CAAoB;IAGxC,AAAN,KAAK,CAAC,IAAI,CAAC,GAAwC,EAAE,IAAsB;QAC9E,QAAQ;QACR;;;;;WAKG;QACH,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YACrB,IAAI,WAAW,GAAG,KAAK,CAAC,OAAO,CAAC;YAChC,IAAI,KAAK,CAAC,iBAAiB,KAAK,SAAS;gBAAE,WAAW,IAAI,IAAI,GAAG,KAAK,CAAC,iBAAiB,CAAC;YACzF,kFAAkF;YAClF,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,WAAW,EAAE,KAAK,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;QACjE,CAAC,CAAC,CAAC;QACH,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QAC1B,OAAO,GAAG,CAAC,IAAI,CAAC;QAChB,gBAAgB;QAChB,iBAAiB;QACjB,KAAK;IAET,CAAC;CAEJ,CAAA;AAzBY,0CAAe;AAGX;IADZ,IAAA,kCAAQ,EAAC,GAAG,CAAC;;;;2CAqBb;0BAvBQ,eAAe;IAD3B,IAAA,oCAAU,EAAC,SAAS,CAAC;GACT,eAAe,CAyB3B"}

package/dist/helpers/AwsHelper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AwsHelper.d.ts","sourceRoot":"","sources":["../../src/helpers/AwsHelper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAA8I,MAAM,oBAAoB,CAAC;AAK1L,qBAAa,SAAS;WAGP,aAAa,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAelE,OAAO,CAAC,MAAM,CAAC,OAAO,CAAW;IAEjC,OAAO,CAAC,MAAM,CAAC,SAAS;WAOX,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;WAczC,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;WAY3E,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;WASpC,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAMpE,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;WAI/C,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;WAUrD,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;WAIvC,eAAe,CAAC,EAAE,EAAC,QAAQ,EAAE,MAAM,EAAC,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;mBAapE,YAAY;WAUpB,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;CAczD"}
+{"version":3,"file":"AwsHelper.d.ts","sourceRoot":"","sources":["../../src/helpers/AwsHelper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAyH,MAAM,oBAAoB,CAAC;AAKrK,qBAAa,SAAS;WAGP,aAAa,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAelE,OAAO,CAAC,MAAM,CAAC,OAAO,CAAW;IAEjC,OAAO,CAAC,MAAM,CAAC,SAAS;WAOX,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;WAczC,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;WAY3E,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;WASpC,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAMpE,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;WAI/C,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;WAUrD,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;WAIvC,eAAe,CAAC,EAAE,EAAC,QAAQ,EAAE,MAAM,EAAC,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;mBAapE,YAAY;WAUpB,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;CAczD"}