ag-common 0.0.281 → 0.0.284

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

@@ -9,5 +9,6 @@ export interface IButton {
     onKeyPress?: KeyboardEventHandler<HTMLButtonElement>;
     children: string | JSX.Element;
     href?: string;
+    colourTheme?: 'green' | 'red';
 }
 export declare const Button: (props: IButton) => JSX.Element;

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

@@ -49,18 +49,30 @@ exports.ButtonBase = (0, styled_components_1.css) `
   }
   padding-left: 1rem;
   padding-right: 1rem;
-  background-color: ${colours_1.colours.darkGreen};
   color: white;
-  &[data-invert='true'] {
-    color: ${colours_1.colours.darkGreen};
-    background-color: white;
-    border: solid 1px ${colours_1.colours.darkGreen};
-  }
 
   &[data-disabled='true'] {
     cursor: default;
     background-color: #888;
   }
+
+  &[data-theme='green'] {
+    background-color: ${colours_1.colours.darkGreen};
+    &[data-invert='true'] {
+      color: ${colours_1.colours.darkGreen};
+      background-color: white;
+      border: solid 1px ${colours_1.colours.darkGreen};
+    }
+  }
+
+  &[data-theme='red'] {
+    background-color: ${colours_1.colours.orangeRed};
+    &[data-invert='true'] {
+      color: ${colours_1.colours.orangeRed};
+      background-color: white;
+      border: solid 1px ${colours_1.colours.orangeRed};
+    }
+  }
 `;
 const BaseButton = styled_components_1.default.button `
   ${exports.ButtonBase}
@@ -75,6 +87,6 @@ const Button = (props) => {
         ? // eslint-disable-next-line @typescript-eslint/no-explicit-any
             BaseA
         : BaseButton;
-    return (react_1.default.createElement(Component, Object.assign({ className: props.className, "data-invert": props.invert, "data-disabled": (_a = props.disabled) !== null && _a !== void 0 ? _a : false, role: "button", title: props.title || undefined }, props), props.children));
+    return (react_1.default.createElement(Component, Object.assign({ className: props.className, "data-invert": props.invert, "data-disabled": (_a = props.disabled) !== null && _a !== void 0 ? _a : false, role: "button", title: props.title || undefined, "data-theme": props.colourTheme || 'green' }, props), props.children));
 };
 exports.Button = Button;

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

@@ -17,6 +17,6 @@ const LoginButton = ({ className, text, invert, savePath, loginPath, style, }) =
             redirect: savePath,
         };
     const lp = loginPath(state);
-    return (react_1.default.createElement(Base, { style: style, href: lp, title: text, "data-invert": invert, "data-disabled": false, className: className }, text));
+    return (react_1.default.createElement(Base, { style: style, href: lp, title: text, "data-invert": invert, "data-disabled": false, className: className, "data-theme": "green" }, text));
 };
 exports.LoginButton = LoginButton;

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

@@ -14,7 +14,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.callOpenApiCached = exports.callOpenApiCachedRaw = exports.setOpenApiCacheRaw = void 0;
 const direct_1 = require("./direct");
-const cookie_1 = require("../cookie");
 const string_1 = require("../../../common/helpers/string");
 const common_1 = require("../../../common");
 const node_cache_1 = __importDefault(require("node-cache"));
@@ -25,11 +24,9 @@ let callOpenApiCache;
  * @returns
  */
 function getCacheKey({ cacheKey, overrideAuth, ssrCacheItems, }) {
-    const authkeyPrefix1 = (overrideAuth === null || overrideAuth === void 0 ? void 0 : overrideAuth.id_token) ||
-        (0, cookie_1.getCookieString)({
-            name: 'id_token',
-            defaultValue: '',
-        });
+    const authkeyPrefix1 = (0, direct_1.getIdTokenAuthHeaderRaw)({
+        overrideAuth: overrideAuth,
+    });
     const authPref = !authkeyPrefix1 ? '' : (0, common_1.hashCode)((0, string_1.toBase64)(authkeyPrefix1));
     const ssrCachePref = !ssrCacheItems
         ? ''

package/dist/ui/helpers/callOpenApi/direct.d.ts

@@ -1,3 +1,9 @@
-import { ICallOpenApi } from './types';
+import { ICallOpenApi, OverrideAuth } from './types';
 import { AxiosWrapperLite } from '../jwt';
+/**
+ * get the id_token from provided value, or cookie, or LS
+ */
+export declare function getIdTokenAuthHeaderRaw({ overrideAuth, }: {
+    overrideAuth?: OverrideAuth;
+}): string;
 export declare const callOpenApi: <T, TDefaultApi>(p: ICallOpenApi<T, TDefaultApi>) => Promise<AxiosWrapperLite<T>>;

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

@@ -9,29 +9,48 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.callOpenApi = void 0;
+exports.callOpenApi = exports.getIdTokenAuthHeaderRaw = void 0;
 const cookie_1 = require("../cookie");
 const sleep_1 = require("../../../common/helpers/sleep");
 const array_1 = require("../../../common/helpers/array");
+const useLocalStorage_1 = require("../useLocalStorage");
+/**
+ * get the id_token from provided value, or cookie, or LS
+ */
+function getIdTokenAuthHeaderRaw({ overrideAuth, }) {
+    var _a;
+    let idToken;
+    //if override supplied will only use that and not refresh
+    if (overrideAuth === null || overrideAuth === void 0 ? void 0 : overrideAuth.id_token) {
+        idToken = overrideAuth === null || overrideAuth === void 0 ? void 0 : overrideAuth.id_token;
+    }
+    else {
+        idToken = (0, cookie_1.getCookieString)({
+            name: 'id_token',
+            defaultValue: '',
+        });
+        if (!idToken) {
+            const userLs = (0, useLocalStorage_1.getLocalStorageItem)('user', undefined);
+            if ((_a = userLs === null || userLs === void 0 ? void 0 : userLs.jwt) === null || _a === void 0 ? void 0 : _a.id_token) {
+                idToken = userLs.jwt.id_token;
+            }
+        }
+    }
+    return idToken;
+}
+exports.getIdTokenAuthHeaderRaw = getIdTokenAuthHeaderRaw;
+/**
+ * get id_token, and then refresh
+ */
 function getIdTokenAuthHeader({ overrideAuth, refreshToken, }) {
     var _a, _b;
     return __awaiter(this, void 0, void 0, function* () {
-        let idToken;
-        //if override supplied will only use that and not refresh
-        if (overrideAuth === null || overrideAuth === void 0 ? void 0 : overrideAuth.id_token) {
-            idToken = overrideAuth === null || overrideAuth === void 0 ? void 0 : overrideAuth.id_token;
-        }
-        else {
-            idToken = (0, cookie_1.getCookieString)({
-                name: 'id_token',
-                defaultValue: '',
-            });
-            //if we have a cookie token, can try to refresh
-            if (idToken) {
-                const updated = yield refreshToken();
-                if ((_a = updated === null || updated === void 0 ? void 0 : updated.jwt) === null || _a === void 0 ? void 0 : _a.id_token) {
-                    idToken = (_b = updated === null || updated === void 0 ? void 0 : updated.jwt) === null || _b === void 0 ? void 0 : _b.id_token;
-                }
+        let idToken = getIdTokenAuthHeaderRaw({ overrideAuth });
+        //if we have a cookie token, can try to refresh
+        if (idToken) {
+            const updated = yield refreshToken();
+            if ((_a = updated === null || updated === void 0 ? void 0 : updated.jwt) === null || _a === void 0 ? void 0 : _a.id_token) {
+                idToken = (_b = updated === null || updated === void 0 ? void 0 : updated.jwt) === null || _b === void 0 ? void 0 : _b.id_token;
             }
         }
         return idToken;

package/package.json

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