ag-common 0.0.283 → 0.0.286

package/dist/api/helpers/dynamo.js

@@ -246,6 +246,12 @@ filterOperator = '=', }) => __awaiter(void 0, void 0, void 0, function* () {
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
             eav[`:${skName2}`] = sp1;
         }
+        else if (skOperator === 'BEGINS_WITH') {
+            kce += ` and ${skOperator.toLowerCase()}(#${skName.toLowerCase()}, :${skName.toLowerCase()})`;
+            ean[`#${skName.toLowerCase()}`] = skName;
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            eav[`:${skName.toLowerCase()}`] = skValue;
+        }
         else {
             kce += ` and #${skName.toLowerCase()} ${skOperator} :${skName.toLowerCase()}`;
             ean[`#${skName.toLowerCase()}`] = skName;

package/dist/api/types/index.d.ts

@@ -50,7 +50,7 @@ export interface ILambdaConfigs {
         default?: ILambdaConfig;
     };
 }
-export declare type TSkOperator = 'BETWEEN' | '<' | '<=' | '=' | '>=' | '>';
+export declare type TSkOperator = 'BETWEEN' | '<' | '<=' | '=' | '>=' | '>' | 'BEGINS_WITH';
 export interface IQueryDynamo {
     pkName: string;
     pkValue: string | number;

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.283",
+  "version": "0.0.286",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "author": "Andrei Gec <@andreigec> (https://gec.dev/)",
@@ -46,8 +46,8 @@
     "@types/react": "18.0.15",
     "@types/react-dom": "18.0.6",
     "@types/styled-components": "5.1.25",
-    "@typescript-eslint/eslint-plugin": "5.30.5",
-    "@typescript-eslint/parser": "5.30.5",
+    "@typescript-eslint/eslint-plugin": "5.30.6",
+    "@typescript-eslint/parser": "5.30.6",
     "cross-env": "7.0.3",
     "eslint": "8.19.0",
     "eslint-config-airbnb-typescript": "17.0.0",