ag-common 0.0.6 → 0.0.10

package/LICENSE.md

@@ -0,0 +1,7 @@
+ISC License
+
+Copyright 2021 Andrei Gec
+
+Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

package/README.md

@@ -0,0 +1,22 @@
+# ag-common
+
+> Various reusable libaries for: common ts/js / api (aws cognito, aws-cdk) / ui (react)
+
+[![NPM Version][npm-image]][npm-url]
+
+## Install
+
+```bash
+npm i -S ag-common
+```
+
+## Usage
+
+Please raise any issues or requests you might have [here](https://github.com/andreigec/ag-common/issues)
+
+## License
+
+[ISC](./LICENSE.md)
+
+[npm-image]: https://img.shields.io/npm/v/ag-common.svg
+[npm-url]: https://www.npmjs.com/package/ag-common

package/dist/api/helpers/dynamo.js

@@ -28,7 +28,7 @@ const putDynamo = (item, tableName) => __awaiter(void 0, void 0, void 0, functio
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         Item: item,
     };
-    (0, log_1.info)(`running dynamo put=${JSON.stringify(params)}`);
+    (0, log_1.info)(`running dynamo put=${JSON.stringify(params, null, 2)}`);
     // write the todo to the database
     const put = yield exports.dynamoDb.put(params).promise();
     if (put.$response.error &&
@@ -138,7 +138,7 @@ const getItemDynamo = ({ tableName, pkName, pkValue, }) => __awaiter(void 0, voi
     try {
         const res = yield exports.dynamoDb.get(params).promise();
         const ret = res.Item;
-        (0, log_1.debug)(`got dynamo getitem=${JSON.stringify(params)}`);
+        (0, log_1.debug)(`got dynamo getitem=${JSON.stringify(params, null, 2)}`);
         return ret;
     }
     catch (e) {
@@ -158,14 +158,19 @@ const getItemsDynamo = ({ tableName, items, }) => __awaiter(void 0, void 0, void
             },
         },
     };
+    const dbRaw = new aws_sdk_1.default.DynamoDB({ apiVersion: '2012-10-08' });
     try {
-        const res = yield exports.dynamoDb.batchGet(params).promise();
-        (0, log_1.debug)(`got dynamo getitems=${JSON.stringify(res)}`);
-        let ret = ((_f = (_e = res.Responses) === null || _e === void 0 ? void 0 : _e[tableName]) === null || _f === void 0 ? void 0 : _f.map((s) => s)) || [];
+        const res = yield dbRaw.batchGetItem(params).promise();
+        (0, log_1.debug)(`got dynamo getitems=${JSON.stringify(res, null, 2)}`);
+        let ret = ((_f = (_e = res.Responses) === null || _e === void 0 ? void 0 : _e[tableName]) === null || _f === void 0 ? void 0 : _f.map((s) => aws_sdk_1.default.DynamoDB.Converter.unmarshall(s))) || [];
         return ret;
     }
     catch (e) {
-        (0, log_1.error)(e);
+        let msg = `error with getitems query:` +
+            JSON.stringify(params, null, 2) +
+            '\n' +
+            e.toString();
+        (0, log_1.error)(msg);
         throw e;
     }
 });

package/dist/api/helpers/validations.js

@@ -68,12 +68,12 @@ const getAndValidateToken = ({ tokenRaw, COGNITO_USER_POOL_ID, }) => __awaiter(v
                 error: (0, api_1.returnCode)(403, 'auth failed'),
             };
         }
-        token = tokenRaw.substr(tokenRaw.indexOf(' ') + 1);
+        token = tokenRaw.substring(tokenRaw.indexOf(' ') + 1);
         let subject;
         try {
             yield jwtVerify({ token, COGNITO_USER_POOL_ID });
             const decoded = (0, jsonwebtoken_1.decode)(token);
-            (0, log_1.debug)(`decoded=${JSON.stringify(decoded)}`);
+            (0, log_1.debug)(`decoded=${JSON.stringify(decoded, null, 2)}`);
             subject = decoded === null || decoded === void 0 ? void 0 : decoded.sub;
             if (!subject) {
                 const mess = 'user should have responded with subject (sub) field';

package/dist/common/helpers/array.js

@@ -27,10 +27,8 @@ const chunk = (array, max) => {
     let row = [];
     for (const k in array) {
         const item = array[k];
-        if (row.length < max) {
-            row = [...row, item];
-        }
-        else {
+        row.push(item);
+        if (row.length >= max) {
             rows.push(row);
             row = [];
         }

package/dist/common/helpers/string.d.ts

@@ -6,4 +6,13 @@ export interface ISite {
     siteUrl: string;
     niceSiteUrl: string;
 }
+/**
+ * removes protocol, and trailing slashes
+ */
 export declare const niceUrl: (siteUrl: string) => string | ISite;
+/**
+ * string -> String
+ * @param str
+ * @returns
+ */
+export declare function toTitleCase(str: string): string;

package/dist/common/helpers/string.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.niceUrl = exports.truncate = exports.trim = exports.trimSide = exports.csvJSON = void 0;
+exports.toTitleCase = exports.niceUrl = exports.truncate = exports.trim = exports.trimSide = exports.csvJSON = void 0;
 const csvJSON = (csv) => {
     const lines = csv.split('\n');
     const result = [];
@@ -47,12 +47,15 @@ function truncate(str, n, ellip) {
     return str.length > n ? str.substr(0, n - 1) + ellip : str;
 }
 exports.truncate = truncate;
+/**
+ * removes protocol, and trailing slashes
+ */
 const niceUrl = (siteUrl) => {
     if (!siteUrl) {
         return siteUrl;
     }
     let niceSiteUrl = siteUrl
-        .substr(siteUrl.indexOf(':') + 1)
+        .substring(siteUrl.indexOf(':') + 1)
         .replace('sc-domain:', '')
         .replace('https://', '')
         .replace('http://', '');
@@ -60,3 +63,15 @@ const niceUrl = (siteUrl) => {
     return { siteUrl, niceSiteUrl };
 };
 exports.niceUrl = niceUrl;
+/**
+ * string -> String
+ * @param str
+ * @returns
+ */
+function toTitleCase(str) {
+    if (!str) {
+        return str;
+    }
+    return str.replace(/\w\S*/g, (txt) => txt && txt.charAt(0).toUpperCase() + txt.substring(1).toLowerCase());
+}
+exports.toTitleCase = toTitleCase;

package/dist/ui/components/LoginButton/index.js

@@ -21,7 +21,7 @@ const LoginButton = ({ className, text = text_1.getstarted, invert, title, saveP
     const lp = loginPath(!savePath || typeof window === 'undefined'
         ? undefined
         : {
-            redirect: window.location.href.substr(window.location.origin.length),
+            redirect: window.location.href.substring(window.location.origin.length),
         });
     return (react_1.default.createElement(Button_1.Button, { lang: lang, title: title, invert: invert, className: className, onKeyPress: () => __awaiter(void 0, void 0, void 0, function* () {
             yield pushPath(lp);

package/dist/ui/helpers/axiosHelper.d.ts

@@ -0,0 +1,11 @@
+import { AxiosResponse } from 'axios';
+export declare const axiosHelper: <TOut>({ verb, url, data, headers, timeout, retryMax, }: {
+    headers?: {
+        [a: string]: string;
+    } | undefined;
+    verb: 'put' | 'post' | 'get' | 'patch' | 'delete';
+    url: string;
+    data?: unknown;
+    timeout?: number | undefined;
+    retryMax?: number | undefined;
+}) => Promise<AxiosResponse<TOut, any>>;

package/dist/ui/helpers/axiosHelper.js

@@ -0,0 +1,82 @@
+"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());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.axiosHelper = void 0;
+const axios_1 = __importDefault(require("axios"));
+const object_1 = require("../../common/helpers/object");
+const axiosHelper = ({ verb, url, data, headers, timeout = 30000, retryMax = 0, }) => __awaiter(void 0, void 0, void 0, function* () {
+    let retry = 0;
+    do {
+        try {
+            const setHeaders = Object.assign({ accept: 'application/json' }, headers);
+            if (verb === 'get') {
+                const ret = yield axios_1.default.get(url, {
+                    headers: setHeaders,
+                    timeout,
+                    timeoutErrorMessage: `${url} timeout`,
+                });
+                return ret;
+            }
+            let noBody = false;
+            let func = axios_1.default.post;
+            if (verb === 'put') {
+                func = axios_1.default.put;
+            }
+            else if (verb === 'post') {
+                func = axios_1.default.post;
+            }
+            else if (verb === 'patch') {
+                func = axios_1.default.patch;
+            }
+            else if (verb === 'delete') {
+                func = axios_1.default.delete;
+                noBody = true;
+            }
+            let ret;
+            if (noBody) {
+                ret = yield func(url, {
+                    headers: setHeaders,
+                    timeout,
+                    timeoutErrorMessage: `${url} timeout`,
+                });
+            }
+            else {
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                if (data && (0, object_1.isJson)(data)) {
+                    setHeaders['Content-Type'] = 'application/json';
+                }
+                ret = yield func(url, data, { headers: setHeaders });
+            }
+            return ret;
+        }
+        catch (e) {
+            const em = e;
+            // jwt expired or bad response
+            // 403 returned for old token - will be refreshed
+            if (em.code === '401' || em.code === '403') {
+                // eslint-disable-next-line no-console
+                console.log('auth expired, reset');
+                // retry current page
+                window.location.reload();
+                retry = retryMax;
+            }
+            if (retry >= retryMax) {
+                throw em;
+            }
+        }
+        retry += 1;
+    } while (retry <= retryMax);
+    throw new Error('unexpected');
+});
+exports.axiosHelper = axiosHelper;

package/dist/ui/helpers/cookie.js

@@ -26,7 +26,7 @@ function getCookie({ cname, cookieDocument, }) {
     const ca = ca1.split(';').map((t) => t.trim());
     for (const c of ca) {
         if (c.indexOf(name) === 0) {
-            return c.substring(name.length, c.length);
+            return c.substr(name.length, c.length);
         }
     }
     return undefined;

package/dist/ui/helpers/index.d.ts

@@ -1,3 +1,4 @@
+export * from './axiosHelper';
 export * from './browserHelpers';
 export * from './callOpenApi';
 export * from './cookie';

package/dist/ui/helpers/index.js

@@ -10,6 +10,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./axiosHelper"), exports);
 __exportStar(require("./browserHelpers"), exports);
 __exportStar(require("./callOpenApi"), exports);
 __exportStar(require("./cookie"), exports);

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "ag-common",
-  "version": "0.0.6",
+  "version": "0.0.10",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "author": "Andrei Gec <@andreigec> (https://gec.dev/)",
   "repository": "github:andreigec/ag-common",
+  "license": "ISC",
   "dependencies": {
     "aws-lambda": "1.0.7",
     "styled-components": "5.3.3",
@@ -50,6 +51,8 @@
     "start": "tsc --watch"
   },
   "files": [
-    "dist/**/*"
+    "dist/**/*",
+    "README.md",
+    "LICENSE.md"
   ]
 }