@dvrd/dvr-controls 1.0.35 → 1.0.37

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dvrd/dvr-controls",
-  "version": "1.0.35",
+  "version": "1.0.37",
   "description": "Custom web controls",
   "main": "index.ts",
   "files": [

package/src/js/util/jwtUtil.ts

@@ -19,12 +19,13 @@ export const getJwt = (): string | null => {
     return null;
 };
 
-export const setJwt = (token: string | null, preserveOnNull: boolean = false, includeStorage: boolean = true) => {
+export const setJwt = (token: string | null, preserveOnNull: boolean = false, includeStorage: boolean = true, _options?: CookieAttributes) => {
     console.debug('Settings JWT token', {token, preserveOnNull, includeStorage, allowCookies: window.allowCookies});
     jwtToken = token;
     if (window.allowCookies || !token) {
         if (token) {
             let options: CookieAttributes = {expires: 1, sameSite: 'strict'};
+            if (_options) options = Object.assign({}, options, _options);
             if (getSetting('mode') !== 'dev') {
                 options.secure = true;
                 options.sameSite = 'strict';
@@ -68,6 +69,7 @@ const getJwtFromStorage = (): string | null => {
             if (item === null) return null;
             return JSON.parse(item);
         }
-    } catch {}
+    } catch {
+    }
     return null;
 };

package/src/js/util/miscUtil.ts

@@ -136,7 +136,11 @@ export const shuffleArray = (arr: any[]): any[] => {
     return arr;
 };
 
-export const nullify = <T extends string | Array<any> | Set<any>>(value?: T | null): T | null => {
+export function nullify<T extends string | Array<any> | Set<any> | number>(value?: T | null): T | null {
+    if (typeof value === 'number') {
+        if (value > 0) return value;
+        return null;
+    }
     if (!value) return null;
     else if (Array.isArray(value) || typeof value === 'string')
         return value.length ? value : null;