ag-common 0.0.351 → 0.0.352

package/dist/api/openapi-postfix.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/api/openapi-postfix.js

@@ -0,0 +1,27 @@
+"use strict";
+/* eslint-disable import/no-extraneous-dependencies */
+/* eslint-disable @typescript-eslint/no-var-requires */
+/* eslint-disable no-console */
+const fs = require('fs');
+const process = require('process');
+var pathV = require('path');
+var cwd = process.cwd();
+var resolvePath = (p) => pathV.resolve(cwd, p);
+function run() {
+    var files = fs
+        .readdirSync(resolvePath('./dist/api'))
+        .filter((r) => r.endsWith('.js'))
+        .map((s) => `./dist/api/${s}`);
+    files.forEach((f) => {
+        if (fs.existsSync(f)) {
+            console.log('removing url_1 from ' + f);
+            var c = fs.readFileSync(f).toString();
+            c = c.replace(/url_1\./gi, '');
+            fs.writeFileSync(f, c);
+        }
+    });
+    if (!files.length) {
+        console.log('error: no files to url fix');
+    }
+}
+run();

package/dist/api/openapi-prefix.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/api/openapi-prefix.js

@@ -0,0 +1,85 @@
+"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());
+    });
+};
+/* eslint-disable import/no-extraneous-dependencies */
+/* eslint-disable @typescript-eslint/no-var-requires */
+/* eslint-disable no-console */
+var { load } = require('js-yaml');
+const SwaggerParser = require('swagger-parser');
+const fs = require('fs');
+const process = require('process');
+var pathV = require('path');
+var cwd = process.cwd();
+var resolvePath = (p) => pathV.resolve(cwd, p);
+//
+function cleanSrc() {
+    // eslint-disable-next-line no-console
+    console.log('fixing colons in field names');
+    let files = fs
+        .readdirSync(resolvePath('./src/api'))
+        .filter((r) => r.endsWith('.ts'))
+        .map((s) => `./src/api/${s}`);
+    files.forEach((f) => {
+        let c = fs.readFileSync(f).toString();
+        c = c.replace(/cognitopreferred_role/, "'cognito:preferred_role'");
+        c = c.replace(/cognitousername/, "'cognito:username'");
+        c = c.replace(/cognitogroups/, "'cognito:groups'");
+        c = `import {URL, URLSearchParams} from 'url'
+    ${c}`;
+        fs.writeFileSync(f, c);
+    });
+    //disable all errors
+    console.log('disable all api ts errors');
+    files = fs
+        .readdirSync(resolvePath('./src/api'))
+        .filter((r) => r.endsWith('.ts'))
+        .map((s) => `./src/api/${s}`);
+    files.forEach((f) => {
+        var c = fs.readFileSync(f);
+        c = '/* eslint-disable */\n// @ts-nocheck\n' + c;
+        fs.writeFileSync(f, c);
+    });
+    [resolvePath('./src/api/runtime.ts')].forEach((f) => {
+        if (fs.existsSync(f)) {
+            console.log('fix middleware');
+            let c = fs.readFileSync(f).toString();
+            c = c.replace('= configuration.middleware;', '= configuration.middleware || [];');
+            fs.writeFileSync(f, c);
+        }
+        else {
+            console.warn('no middleware to fix (src/api/runtime)');
+        }
+    });
+}
+//
+function generateJs() {
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            console.log('generating openapi ts');
+            const yml = load(fs.readFileSync(resolvePath('./openapi.yml'), 'utf8'));
+            // eslint-disable-next-line
+            const schema = yield SwaggerParser.validate(yml);
+            const content = `var ret=${JSON.stringify(schema)};\nmodule.exports.default=ret`;
+            fs.writeFileSync(resolvePath('./openapi.generated.js'), content);
+        }
+        catch (e) {
+            // eslint-disable-next-line no-console
+            console.log('err=', e);
+        }
+    });
+}
+function run() {
+    return __awaiter(this, void 0, void 0, function* () {
+        console.log('start openapi fix in ' + cwd);
+        cleanSrc();
+        yield generateJs();
+    });
+}
+void run();

package/dist/ui/components/DashboardAuthValidation/index.d.ts

@@ -0,0 +1,27 @@
+/// <reference types="react" />
+import { AuthedUserContext } from '../../helpers/jwt';
+import { IRequestCommon } from '../../helpers/routes';
+/**
+ *
+ * @param param0 handles auth loading/error
+ * @returns
+ */
+export declare const DashboardAuthValidation: ({ rc: { request, pushPath }, cac: { error: authError, loginWithRedirect, logout, isAuthenticated, loading: authLoading, }, getDashboardPath, getUnauthedPage, addToast, }: {
+    addToast: (m: string, options?: {
+        appearance: 'error' | 'success';
+        autoClose?: number;
+    } | undefined) => void;
+    getDashboardPath: () => string;
+    /**
+     * will goto when landing on page without auth. undefined will not redirect
+     */
+    getUnauthedPage: undefined | (() => string);
+    cac: AuthedUserContext;
+    rc: {
+        request: IRequestCommon;
+        pushPath: (p: string) => Promise<void>;
+    };
+}) => {
+    render?: JSX.Element | undefined;
+    openApiDisabled: boolean;
+};

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

@@ -0,0 +1,68 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DashboardAuthValidation = void 0;
+const react_1 = __importDefault(require("react"));
+const log_1 = require("../../../common/helpers/log");
+const string_1 = require("../../../common/helpers/string");
+const useGranularHook_1 = require("../../helpers/useGranularHook");
+const useQueryString_1 = require("../../helpers/useQueryString");
+const Loader_1 = require("../Loader");
+/**
+ *
+ * @param param0 handles auth loading/error
+ * @returns
+ */
+const DashboardAuthValidation = ({ rc: { request, pushPath }, cac: { error: authError, loginWithRedirect, logout, isAuthenticated, loading: authLoading, }, getDashboardPath, getUnauthedPage, addToast, }) => {
+    (0, useGranularHook_1.useGranularEffect)(() => {
+        if (authError) {
+            const emailOption = authError.message.includes('email')
+                ? ` We require the use of your email for the functionality of this app.
+        You can update your settings at https://www.facebook.com/settings?tab=applications`
+                : '';
+            addToast(`An Error has occured with your login attempt.${emailOption}`, {
+                appearance: 'error',
+            });
+            (0, log_1.error)(`auth error:`, JSON.stringify(authError, null, 2));
+            void logout();
+        }
+    }, [authError], [authError, addToast, logout]);
+    const forceLogin = Object.keys(request.url.query || {}).includes('login');
+    if (forceLogin) {
+        if (!isAuthenticated) {
+            void loginWithRedirect(request.url.query.state);
+            return { render: react_1.default.createElement(react_1.default.Fragment, null), openApiDisabled: true };
+        }
+        if (isAuthenticated) {
+            void pushPath(getDashboardPath());
+            return { render: react_1.default.createElement(react_1.default.Fragment, null), openApiDisabled: true };
+        }
+    }
+    if (request.url.query.state && isAuthenticated) {
+        const decoded = JSON.parse((0, string_1.fromBase64)(request.url.query.state));
+        if (decoded.redirect) {
+            void pushPath(decoded.redirect);
+            return { render: react_1.default.createElement(react_1.default.Fragment, null), openApiDisabled: true };
+        }
+    }
+    const serverAuthLoading = useQueryString_1.isServer &&
+        !authError &&
+        !authLoading &&
+        !isAuthenticated &&
+        Object.keys(request.url.query || {}).includes('code');
+    if (authLoading || serverAuthLoading) {
+        return {
+            render: react_1.default.createElement(Loader_1.Loader, { name: "authload" }),
+            openApiDisabled: true,
+        };
+    }
+    if (!isAuthenticated && !authLoading && !authError && getUnauthedPage) {
+        void pushPath(getUnauthedPage());
+        return { render: react_1.default.createElement(react_1.default.Fragment, null), openApiDisabled: true };
+    }
+    const openApiDisabled = !isAuthenticated || authLoading || !!authError;
+    return { openApiDisabled };
+};
+exports.DashboardAuthValidation = DashboardAuthValidation;

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

@@ -3,6 +3,7 @@ export * from './Button';
 export * from './Chevron';
 export * from './Close';
 export * from './Confirm';
+export * from './DashboardAuthValidation';
 export * from './DropdownList';
 export * from './FlexColumn';
 export * from './FlexRow';

package/dist/ui/components/index.js

@@ -19,6 +19,7 @@ __exportStar(require("./Button"), exports);
 __exportStar(require("./Chevron"), exports);
 __exportStar(require("./Close"), exports);
 __exportStar(require("./Confirm"), exports);
+__exportStar(require("./DashboardAuthValidation"), exports);
 __exportStar(require("./DropdownList"), exports);
 __exportStar(require("./FlexColumn"), exports);
 __exportStar(require("./FlexRow"), exports);

package/dist/ui/helpers/axiosHelper.js

@@ -50,6 +50,7 @@ const axiosHelper = ({ verb, url, body, headers, timeout = 30000, retryMax = 0,
                 axios = axios_1.default.patch;
             }
             else if (verb === 'delete') {
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
                 axios = axios_1.default.delete;
                 noBody = true;
             }

package/dist/ui/helpers/callOpenApi/direct.js

@@ -14,6 +14,7 @@ const cookie_1 = require("../cookie");
 const sleep_1 = require("../../../common/helpers/sleep");
 const array_1 = require("../../../common/helpers/array");
 const useLocalStorage_1 = require("../useLocalStorage");
+const axios_1 = require("axios");
 const const_1 = require("../../../common/const");
 /**
  * get the id_token from provided value, or cookie, or LS
@@ -58,7 +59,7 @@ function getIdTokenAuthHeader({ overrideAuth, refreshToken, }) {
     });
 }
 const callOpenApi = (p) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
     const { func, apiUrl, logout, newDefaultApi, headers } = p;
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     let error;
@@ -66,10 +67,19 @@ const callOpenApi = (p) => __awaiter(void 0, void 0, void 0, function* () {
     const config = {
         basePath: apiUrl,
         baseOptions: { headers: Object.assign({ authorization: '' }, (headers || {})) },
+        middleware: [],
     };
     const idToken = yield getIdTokenAuthHeader(p);
     if (idToken) {
         config.baseOptions.headers.authorization = `Bearer ${idToken}`;
+        config.middleware = [
+            {
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                pre: (oldFetchParams) => {
+                    oldFetchParams.init.headers = Object.assign({ authorization: `Bearer ${idToken}` }, oldFetchParams.init.headers);
+                },
+            },
+        ];
     }
     const cl = newDefaultApi(config);
     let errorCount = 0;
@@ -83,18 +93,19 @@ const callOpenApi = (p) => __awaiter(void 0, void 0, void 0, function* () {
                 data = resp.data;
                 break;
             }
-            throw new Error(JSON.stringify(resp.data) || resp.statusText);
+            throw new axios_1.AxiosError(resp.statusText, ((_a = resp.status) === null || _a === void 0 ? void 0 : _a.toString()) || '500');
         }
         catch (e) {
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
             const ae = e;
-            const status = (_b = (_a = ae.response) === null || _a === void 0 ? void 0 : _a.status) !== null && _b !== void 0 ? _b : 500;
+            const status = Number((_d = (_b = ae.code) !== null && _b !== void 0 ? _b : (_c = ae.response) === null || _c === void 0 ? void 0 : _c.status) !== null && _d !== void 0 ? _d : 500);
             const errorMessage = [
+                (_e = ae.status) !== null && _e !== void 0 ? _e : '',
                 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                (_e = (_d = (_c = ae.response) === null || _c === void 0 ? void 0 : _c.data) === null || _d === void 0 ? void 0 : _d.toString()) !== null && _e !== void 0 ? _e : '',
-                (_h = (_g = (_f = ae.response) === null || _f === void 0 ? void 0 : _f.statusText) === null || _g === void 0 ? void 0 : _g.toString()) !== null && _h !== void 0 ? _h : '',
-                (_l = (_k = (_j = ae.response) === null || _j === void 0 ? void 0 : _j.status) === null || _k === void 0 ? void 0 : _k.toString()) !== null && _l !== void 0 ? _l : '',
-                (_o = (_m = ae.message) === null || _m === void 0 ? void 0 : _m.toString()) !== null && _o !== void 0 ? _o : '',
+                (_h = (_g = (_f = ae.response) === null || _f === void 0 ? void 0 : _f.data) === null || _g === void 0 ? void 0 : _g.toString()) !== null && _h !== void 0 ? _h : '',
+                (_l = (_k = (_j = ae.response) === null || _j === void 0 ? void 0 : _j.statusText) === null || _k === void 0 ? void 0 : _k.toString()) !== null && _l !== void 0 ? _l : '',
+                (_p = (_o = (_m = ae.response) === null || _m === void 0 ? void 0 : _m.status) === null || _o === void 0 ? void 0 : _o.toString()) !== null && _p !== void 0 ? _p : '',
+                (_r = (_q = ae.message) === null || _q === void 0 ? void 0 : _q.toString()) !== null && _r !== void 0 ? _r : '',
             ]
                 .filter(array_1.notEmpty)
                 .sort((a, b) => (a.length < b.length ? -1 : 1))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ag-common",
-  "version": "0.0.351",
+  "version": "0.0.352",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "author": "Andrei Gec <@andreigec> (https://gec.dev/)",