@auxilium/datalynk-client 1.0.8 → 1.0.11

package/README.md

@@ -184,12 +184,13 @@ This library comes with some logic to automatically handle the login flow & shou
 2. It will check the localStorage for a saved token
 3. It will prompt the user to login via UI
 4. Reload page if token changed
+
 ```js
 await api.auth.handleLogin('spoke', {
-  background: 'url("...")', // CSS URL or hex color
-  color: '#ff0000', // hex color
-  title: '<img alt="logo" src="..." />', // text or HTML
-  titleColor: '#ffffff' // Color of title text
+    background: 'url("...")', // CSS URL or hex color
+    color: '#ff0000', // hex color
+    title: '<img alt="logo" src="..." />', // text or HTML
+    textColor: '#ffffff' // Color of title text
 });
 ```
 

package/dist/api.d.ts

@@ -40,6 +40,8 @@ export interface ApiRequestOptions {
     noOptimize?: boolean;
     /** Skip the token translating step */
     raw?: boolean;
+    /** Set request token */
+    token?: string;
 }
 /** API error response */
 export interface ApiError {

package/dist/api.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../src/api.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../src/api.ts"],"names":[],"mappings":"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"}

package/dist/auth.d.ts

@@ -44,7 +44,7 @@ export declare class Auth {
      *
      * @return {Promise<User | null>}
      */
-    current(): Promise<null | User>;
+    current(token?: string | null, set?: boolean): Promise<null | User>;
     /**
      * Automatically handle sessions by checking localStorage & URL parameters for a token & prompting
      * user with a login screen if required
@@ -91,7 +91,7 @@ export declare class Auth {
      * @param {string} password Password for account
      * @param {string} spoke Override login spoke
      * @param {twoFactor?: string, expire?: string} opts 2FA code & expire date (YYYY-MM-DD)
-     * @returns {Promise<any>} Session information returned from login request
+     * @returns {Promise<User>} User account
      */
     login(spoke: string, login: string, password: string, opts?: {
         twoFactor?: string;
@@ -100,9 +100,9 @@ export declare class Auth {
     /**
      * Login as guest user
      *
-     * @return {Promise<any>}
+     * @return {Promise<User>} Guest account
      */
-    loginGuest(): Promise<any>;
+    loginGuest(): Promise<User>;
     /**
      * Create Login UI
      *

package/dist/auth.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../src/auth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAyB,MAAM,MAAM,CAAC;AAC7D,OAAO,EAAC,GAAG,EAAC,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAC,WAAW,EAAE,kBAAkB,EAAC,MAAM,gBAAgB,CAAC;AAE/D,mBAAmB;AACnB,MAAM,MAAM,IAAI,GAAG;IAClB,cAAc;IACd,EAAE,EAAE,MAAM,CAAC;IACX,4BAA4B;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,4CAA4C;IAC5C,KAAK,EAAE,OAAO,CAAC;IACf,kCAAkC;IAClC,QAAQ,EAAE,OAAO,CAAC;IAClB,gCAAgC;IAChC,UAAU,EAAE,MAAM,CAAC;IACnB,+BAA+B;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,4BAA4B;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,8BAA8B;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,2BAA2B;IAC3B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,4BAA4B;IAC5B,KAAK,EAAE,MAAM,CAAC;CACd,CAAA;AAED;;GAEG;AACH,qBAAa,IAAI;IAUJ,OAAO,CAAC,QAAQ,CAAC,GAAG;IAThC,oCAAoC;IACpC,KAAK,2CAA2D;IAChE,mBAAmB;IACnB,IAAI,IAAI,IAEO,IAAI,GAAG,IAAI,GAAG,SAAS,CAFM;IAC5C,4BAA4B;IAC5B,IAAI,IAAI,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,GAAG,SAAS,EAA4B;IAElE,IAAI,KAAK,kBAAiD;gBAE7B,GAAG,EAAE,GAAG;IAIrC;;;;OAIG;IACH,OAAO,IAAI,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;IAW/B;;;;;;;OAOG;IACG,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IAgB7E;;;;OAIG;IACH,eAAe;IAEf;;;;OAIG;IACH,OAAO;IAEP;;;;OAIG;IACG,UAAU,IAAI,OAAO,CAAC,OAAO,CAAC;IAOpC;;;;OAIG;IACG,YAAY,IAAI,OAAO,CAAC,OAAO,CAAC;IAOtC;;;;OAIG;IACG,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAOrC;;;;;;;;OAQG;IACH,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE;QAAC,SAAS,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,IAAI,GAAG,MAAM,CAAA;KAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAsBzH;;;;OAIG;IACH,UAAU,IAAI,OAAO,CAAC,GAAG,CAAC;IAS1B;;;;;;OAMG;IACH,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,kBAAkB,GAAG,WAAW;IAIrE;;;;OAIG;IACH,MAAM;gBAC6B,MAAM;aAAO,MAAM;;IAOtD;;;;;;;OAOG;IACH,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM;IAWvD;;;;;;OAMG;IACH,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,GAAG,KAAK,GAAG,OAAO;CAI3D"}
+{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../src/auth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAyB,MAAM,MAAM,CAAC;AAC7D,OAAO,EAAC,GAAG,EAAC,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAC,WAAW,EAAE,kBAAkB,EAAC,MAAM,gBAAgB,CAAC;AAE/D,mBAAmB;AACnB,MAAM,MAAM,IAAI,GAAG;IAClB,cAAc;IACd,EAAE,EAAE,MAAM,CAAC;IACX,4BAA4B;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,4CAA4C;IAC5C,KAAK,EAAE,OAAO,CAAC;IACf,kCAAkC;IAClC,QAAQ,EAAE,OAAO,CAAC;IAClB,gCAAgC;IAChC,UAAU,EAAE,MAAM,CAAC;IACnB,+BAA+B;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,4BAA4B;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,8BAA8B;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,2BAA2B;IAC3B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,4BAA4B;IAC5B,KAAK,EAAE,MAAM,CAAC;CACd,CAAA;AAED;;GAEG;AACH,qBAAa,IAAI;IAUJ,OAAO,CAAC,QAAQ,CAAC,GAAG;IAThC,oCAAoC;IACpC,KAAK,2CAA2D;IAChE,mBAAmB;IACnB,IAAI,IAAI,IAEO,IAAI,GAAG,IAAI,GAAG,SAAS,CAFM;IAC5C,4BAA4B;IAC5B,IAAI,IAAI,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,GAAG,SAAS,EAA4B;IAElE,IAAI,KAAK,kBAAiD;gBAE7B,GAAG,EAAE,GAAG;IAIrC;;;;OAIG;IACG,OAAO,CAAC,KAAK,GAAE,MAAM,GAAG,IAAqB,EAAE,GAAG,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;IAiBzF;;;;;;;OAOG;IACG,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IAW7E;;;;OAIG;IACH,eAAe;IAEf;;;;OAIG;IACH,OAAO;IAEP;;;;OAIG;IACG,UAAU,IAAI,OAAO,CAAC,OAAO,CAAC;IAOpC;;;;OAIG;IACG,YAAY,IAAI,OAAO,CAAC,OAAO,CAAC;IAOtC;;;;OAIG;IACG,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAOrC;;;;;;;;OAQG;IACH,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE;QAAC,SAAS,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,IAAI,GAAG,MAAM,CAAA;KAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAqBzH;;;;OAIG;IACH,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAQ3B;;;;;;OAMG;IACH,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,kBAAkB,GAAG,WAAW;IAIrE;;;;OAIG;IACH,MAAM;gBAC6B,MAAM;aAAO,MAAM;;IAOtD;;;;;;;OAOG;IACH,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM;IAWvD;;;;;;OAMG;IACH,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,GAAG,KAAK,GAAG,OAAO;CAI3D"}

package/dist/index.cjs

@@ -31,6 +31,13 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       return value2;
     }, space);
   }
+  function blackOrWhite(background) {
+    const exploded = background == null ? void 0 : background.match(background.length >= 6 ? /\w\w/g : /\w/g);
+    if (!exploded) return "black";
+    const [r2, g, b2] = exploded.map((hex) => parseInt(hex, 16));
+    const luminance = (0.299 * r2 + 0.587 * g + 0.114 * b2) / 255;
+    return luminance > 0.5 ? "black" : "white";
+  }
   class PromiseProgress extends Promise {
     constructor(executor) {
       super((resolve, reject) => executor(
@@ -1308,38 +1315,6 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     };
     return BehaviorSubject2;
   }(Subject);
-  var EmptyError = createErrorClass(function(_super) {
-    return function EmptyErrorImpl() {
-      _super(this);
-      this.name = "EmptyError";
-      this.message = "no elements in sequence";
-    };
-  });
-  function firstValueFrom(source, config2) {
-    return new Promise(function(resolve, reject) {
-      var subscriber = new SafeSubscriber({
-        next: function(value) {
-          resolve(value);
-          subscriber.unsubscribe();
-        },
-        error: reject,
-        complete: function() {
-          {
-            reject(new EmptyError());
-          }
-        }
-      });
-      source.subscribe(subscriber);
-    });
-  }
-  function filter(predicate, thisArg) {
-    return operate(function(source, subscriber) {
-      var index = 0;
-      source.subscribe(createOperatorSubscriber(subscriber, function(value) {
-        return predicate.call(thisArg, value, index++) && subscriber.next(value);
-      }));
-    });
-  }
   function distinctUntilChanged(comparator, keySelector) {
     if (keySelector === void 0) {
       keySelector = identity;
@@ -1369,6 +1344,7 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       __publicField(this, "password");
       __publicField(this, "persist");
       __publicField(this, "username");
+      __publicField(this, "options");
       __publicField(this, "_done");
       /** Promise which resolves once login is complete */
       __publicField(this, "done", new Promise((res) => {
@@ -1376,9 +1352,16 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       }));
       this.api = api;
       this.spoke = spoke;
-      this.options = options;
-      document.head.innerHTML += _LoginPrompt.css(options.background, options.color, options.titleColor);
-      document.body.innerHTML += _LoginPrompt.template(options.title || this.spoke);
+      this.options = {
+        title: this.spoke,
+        background: "#ffffff",
+        color: "#c83232",
+        textColor: "#000000",
+        ...options
+      };
+      this.close();
+      document.head.innerHTML += _LoginPrompt.css(this.options);
+      document.body.innerHTML += _LoginPrompt.template(this.options);
       this.alert = document.querySelector("#datalynk-login-alert");
       this.button = document.querySelector("#datalynk-login-form button");
       this.form = document.querySelector("#datalynk-login-form");
@@ -1388,9 +1371,7 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       this.form.onsubmit = (event) => this.login(event);
       if (options.persist === false) this.persist.parentElement.style.display = "none";
     }
-    /**
-     * Close the login prompt
-     */
+    /** Close the login prompt */
     close() {
       var _a, _b;
       (_a = document.querySelector("#datalynk-login-css")) == null ? void 0 : _a.remove();
@@ -1430,14 +1411,16 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     }
   };
   /** Dynamically create CSS style */
-  __publicField(_LoginPrompt, "css", (background = "#ffffff", color = "#000000cc", titleColor = "#000000") => `
+  __publicField(_LoginPrompt, "css", (options) => `
 	<style id="datalynk-login-styles">
 		@import url('https://fonts.cdnfonts.com/css/ar-blanca');
 		
 		#datalynk-login {
-			--theme-background: ${background};
-			--theme-primary: ${color};
-			--theme-title: ${titleColor};
+			--theme-background: ${options.background};
+			--theme-container: #000000cc;
+			--theme-glow: ${options.glow || options.color};
+			--theme-primary: ${options.color};
+			--theme-text: ${options.textColor};;
 			
 			position: fixed;
 			left: 0;
@@ -1450,6 +1433,19 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
 			font-family: sans-serif;
 			z-index: 1000;
 		}
+		
+		#datalynk-login .added-links {
+			color: var(--theme-text);
+			position: fixed;
+			bottom: 0;
+			right: 0;
+			padding: 0.25rem;
+		}
+		
+		#datalynk-login .added-links a, #datalynk-login .added-links a:hover, #datalynk-login .added-links a:visited {
+			color: var(--theme-text);
+			text-shadow: 0 0 10px black;
+		}
 	
 		#datalynk-login-alert {
 			padding: 0.75rem;
@@ -1457,6 +1453,7 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
 			color: white;
 			border-radius: 5px;
 			margin-bottom: 1rem;
+			border: grey 1px solid;
 		}
 	
 		#datalynk-login label {
@@ -1474,30 +1471,6 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
 			color: black;
 		}
 	
-		#datalynk-login input:disabled {
-			color: #333;
-			background-color: #ccc;
-		}
-	
-		#datalynk-login button {
-			background-color: #e03a3e;
-			background-image: none;
-			border: 0;
-			color: #fff;
-			padding: 8px 24px;
-			border-radius: 5px;
-		}
-	
-		#datalynk-login button:disabled {
-			cursor: pointer;
-			filter: brightness(90%);
-		}
-	
-		#datalynk-login button:hover:not(:disabled) {
-			cursor: pointer;
-			filter: brightness(110%);
-		}
-	
 		#datalynk-login .login-container {
 			position: fixed;
 			top: 50%;
@@ -1507,7 +1480,7 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
 		}
 		
 		#datalynk-login .login-header {
-			color: var(--theme-title);
+			color: var(--theme-text);
 			text-align: center;
 			font-size: 32px;
 			margin-bottom: 2rem;
@@ -1517,23 +1490,58 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
 			display: flex;
 			flex-direction: column;
 			align-items: center;
-			background: var(--theme-primary);
+			background: var(--theme-container);
+			border-top: var(--theme-glow) 1px solid;
+			box-shadow: 0 -10px 20px -10px var(--theme-glow);
 		}
 	
 		#datalynk-login .login-body {
-			padding: 3.5rem 0 0 0;
+			padding: ${options.hideApps ? "3.5rem 0" : "3.5rem 0 1.5rem 0"};
+			width: 100%;
+			max-width: 400px;;
 			color: white;
 		}
+		
+		#datalynk-login input:disabled {
+			color: #333;
+			background-color: #ccc;
+		}
+		
+		#datalynk-login input[type="checkbox"] {
+		    height: 15px;
+		    margin: 0;
+		    padding: 0;
+		    accent-color: var(--theme-primary);
+		}
+		
+		#datalynk-login button {
+			background-color: var(--theme-primary);
+			background-image: none;
+			border: 0;
+			color: ${blackOrWhite(options.color)};
+			padding: 8px 24px;
+			border-radius: 5px;
+		}
 	
-		#datalynk-login .login-footer{
-			padding: 1.5rem 0;
+		#datalynk-login button:disabled {
+			cursor: pointer;
+			filter: brightness(90%);
 		}
 	
-		#datalynk-login .login-footer a {
+		#datalynk-login button:hover:not(:disabled) {
+			cursor: pointer;
+			filter: ${blackOrWhite(options.color) == "black" ? "brightness(105%)" : "brightness(80%)"};
+		}
+	
+		#datalynk-login .login-links{
+			padding: 0 0 1.5rem 0;
+		}
+	
+		#datalynk-login .login-links a {
 			text-decoration: none;
 		}
 	
-		#datalynk-login .login-footer img {
+		#datalynk-login .login-links img {
 			width: 150px;
 			height: auto;
 		}
@@ -1542,26 +1550,27 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
 			display: none;
 		}
 		
+		#datalynk-login .login-footer {
+			transform: translateY(-18px);
+		}
+		
 		#datalynk-login .sloped-div {
-			margin-left:auto;
-			margin-right: auto;
-			display: inline-flex;
-			padding: 0 3rem 0.5rem 3rem;
-			justify-content: center;
-			align-items: center;
-			background: var(--theme-primary);
-			clip-path: polygon(0 0, 100% 0, 80% 100%, 20% 100%);
 			position: absolute;
-			left: 50%;
-			transform: translate(-50%, -1px);
+			height: 45px;
+			width: 200px;
+			background: var(--theme-container);
+			clip-path: polygon(0 20px, 100% 20px, 85% 60px, 15% 60px);
 		}
 	</style>`);
   /** Dynamically create HTML */
-  __publicField(_LoginPrompt, "template", (title = "Datalynk") => `
+  __publicField(_LoginPrompt, "template", (options) => `
 	<div id="datalynk-login">
+		<div class="added-links">
+			${(options.addLinks || []).map((link) => `<a href="${link.url}" target="_blank">${link.text}</a>`).join(" | ")}
+		</div>
 		<div class="login-container">
 			<div class="login-header">
-				${title}
+				${options.title}
 			</div>
 			<div class="login-content">
 				<div class="login-body" style="max-width: 300px">
@@ -1584,7 +1593,8 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
 						<button>Login</button>
 					</form>
 				</div>
-				<div class="login-footer" style="text-align: center">
+				${options.hideApps ? "" : `
+				<div class="login-links" style="text-align: center">
 					<a href="https://itunes.apple.com/ca/app/auxilium-mobile/id1166379280?mt=8" target="_blank">
 						<img alt="App Store" src="https://datalynk.auxiliumgroup.com/api/js/auxilium/dijits/templates/login/_common/mobile_apple_transparent.png">
 					</a>
@@ -1592,14 +1602,14 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
 						<img alt="Playstore" src="https://datalynk.auxiliumgroup.com/api/js/auxilium/dijits/templates/login/_common/mobile_google_transparent.png">
 					</a>
 				</div>
+				`}
 			</div>
-			<div class="sloped-div">
-				<div style="height: 36px">
-					<a href="https://auxiliumgroup.com" target="_blank" style="height: 40px; display: flex; align-items: center; text-decoration: none; font-family: 'AR BLANCA', serif; font-size: 26px; color: white; position: relative">
-						Au<span style="font-size: 52px; color: #c83232; margin-bottom: 5px">x</span>ilium
-						<span style="position: absolute; font-size: 10px; color: #c83232; top: 2px; right: 2px">Group</span>
-					</a>
-				</div>
+			<div class="login-footer" style="position: relative; display: flex; align-items: center; justify-content: center;">
+				<div class="sloped-div"></div>
+				<a href="https://auxiliumgroup.com" target="_blank" style="position: relative; height: 40px; display: flex; align-items: center; text-decoration: none; font-family: 'AR BLANCA', serif; font-size: 26px; color: white;">
+					Au<span style="font-size: 52px; color: #c83232; margin-bottom: 5px">x</span>ilium
+					<span style="position: absolute; font-size: 10px; color: #c83232; top: 2px; right: 2px">Group</span>
+				</a>
 			</div>
 		</div>
 	</div>
@@ -1610,7 +1620,7 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       /** Current user as an observable */
       __publicField(this, "user$", new BehaviorSubject(void 0));
       this.api = api;
-      this.api.token$.subscribe(() => this.current());
+      this.api.token$.subscribe((token) => this.current(token, true));
     }
     /** Current user */
     get user() {
@@ -1629,14 +1639,21 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
      *
      * @return {Promise<User | null>}
      */
-    current() {
-      if (!this.api.token) {
-        this.user = null;
-        return Promise.resolve(null);
+    async current(token = this.api.token, set) {
+      var _a;
+      if (!token) {
+        if (set && this.user != null) this.user = null;
+        return null;
+      } else if (token == ((_a = this.user) == null ? void 0 : _a.token)) {
+        return this.user;
       }
-      return this.api.request({ "$/auth/current": {} }).then((resp) => {
-        this.user = (resp == null ? void 0 : resp.login) ? resp : null;
-        return resp;
+      return this.api.request({ "$/auth/current": {} }, { token }).then((resp) => {
+        const u = (resp == null ? void 0 : resp.login) ? resp : null;
+        if (set) {
+          this.api.token = token;
+          this.user = u;
+        }
+        return u;
       });
     }
     /**
@@ -1652,12 +1669,7 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       if (urlToken) {
         this.api.token = urlToken;
         location.href = location.href.replace(/datalynkToken.*?(&|$)/gm, "");
-      } else if (this.api.token) {
-        await this.current().catch(() => {
-          this.api.token = null;
-          location.reload();
-        });
-      } else {
+      } else if (!this.api.token) {
         await this.loginPrompt(spoke, options).done;
         location.reload();
       }
@@ -1710,7 +1722,7 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
      * @param {string} password Password for account
      * @param {string} spoke Override login spoke
      * @param {twoFactor?: string, expire?: string} opts 2FA code & expire date (YYYY-MM-DD)
-     * @returns {Promise<any>} Session information returned from login request
+     * @returns {Promise<User>} User account
      */
     login(spoke, login, password, opts) {
       const date = /* @__PURE__ */ new Date();
@@ -1729,21 +1741,19 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       }).then(async (resp) => {
         const data = await resp.json().catch(() => ({}));
         if (!resp.ok || data["error"]) throw Object.assign(errorFromCode(resp.status, data.error) || {}, data);
-        this.api.token = data["token"];
-        return await firstValueFrom(this.user$.pipe(filter((u) => (u == null ? void 0 : u.token) == data["token"])));
+        return await this.current(data["token"], true);
       });
     }
     /**
      * Login as guest user
      *
-     * @return {Promise<any>}
+     * @return {Promise<User>} Guest account
      */
     loginGuest() {
       return fetch(`${this.api.url}guest`).then(async (resp) => {
         const data = await resp.json().catch(() => ({}));
         if (!resp.ok || data["error"]) throw Object.assign(errorFromCode(resp.status, data.error) || {}, data);
-        this.api.token = data["token"];
-        return data;
+        return await this.current(data["token"], true);
       });
     }
     /**
@@ -2490,7 +2500,7 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       } });
     }
   }
-  const version = "1.0.8";
+  const version = "1.0.11";
   class Api {
     /**
      * Connect to Datalynk & send requests
@@ -2561,10 +2571,11 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       return jwtDecode(this.token);
     }
     _request(req, options = {}) {
+      const token = options.token || this.token;
       return fetch(this.url, {
         method: "POST",
         headers: clean({
-          Authorization: this.token ? `Bearer ${this.token}` : void 0,
+          Authorization: token ? `Bearer ${token}` : void 0,
           "Content-Type": "application/json",
           "X-Date-Return-Format": this.options.legacyDates ? void 0 : "ISO8601"
         }),

package/dist/index.mjs

@@ -27,6 +27,13 @@ function JSONSanitize(obj, space) {
     return value2;
   }, space);
 }
+function blackOrWhite(background) {
+  const exploded = background == null ? void 0 : background.match(background.length >= 6 ? /\w\w/g : /\w/g);
+  if (!exploded) return "black";
+  const [r2, g, b2] = exploded.map((hex) => parseInt(hex, 16));
+  const luminance = (0.299 * r2 + 0.587 * g + 0.114 * b2) / 255;
+  return luminance > 0.5 ? "black" : "white";
+}
 class PromiseProgress extends Promise {
   constructor(executor) {
     super((resolve, reject) => executor(
@@ -1304,38 +1311,6 @@ var BehaviorSubject = function(_super) {
   };
   return BehaviorSubject2;
 }(Subject);
-var EmptyError = createErrorClass(function(_super) {
-  return function EmptyErrorImpl() {
-    _super(this);
-    this.name = "EmptyError";
-    this.message = "no elements in sequence";
-  };
-});
-function firstValueFrom(source, config2) {
-  return new Promise(function(resolve, reject) {
-    var subscriber = new SafeSubscriber({
-      next: function(value) {
-        resolve(value);
-        subscriber.unsubscribe();
-      },
-      error: reject,
-      complete: function() {
-        {
-          reject(new EmptyError());
-        }
-      }
-    });
-    source.subscribe(subscriber);
-  });
-}
-function filter(predicate, thisArg) {
-  return operate(function(source, subscriber) {
-    var index = 0;
-    source.subscribe(createOperatorSubscriber(subscriber, function(value) {
-      return predicate.call(thisArg, value, index++) && subscriber.next(value);
-    }));
-  });
-}
 function distinctUntilChanged(comparator, keySelector) {
   if (keySelector === void 0) {
     keySelector = identity;
@@ -1365,6 +1340,7 @@ const _LoginPrompt = class _LoginPrompt {
     __publicField(this, "password");
     __publicField(this, "persist");
     __publicField(this, "username");
+    __publicField(this, "options");
     __publicField(this, "_done");
     /** Promise which resolves once login is complete */
     __publicField(this, "done", new Promise((res) => {
@@ -1372,9 +1348,16 @@ const _LoginPrompt = class _LoginPrompt {
     }));
     this.api = api;
     this.spoke = spoke;
-    this.options = options;
-    document.head.innerHTML += _LoginPrompt.css(options.background, options.color, options.titleColor);
-    document.body.innerHTML += _LoginPrompt.template(options.title || this.spoke);
+    this.options = {
+      title: this.spoke,
+      background: "#ffffff",
+      color: "#c83232",
+      textColor: "#000000",
+      ...options
+    };
+    this.close();
+    document.head.innerHTML += _LoginPrompt.css(this.options);
+    document.body.innerHTML += _LoginPrompt.template(this.options);
     this.alert = document.querySelector("#datalynk-login-alert");
     this.button = document.querySelector("#datalynk-login-form button");
     this.form = document.querySelector("#datalynk-login-form");
@@ -1384,9 +1367,7 @@ const _LoginPrompt = class _LoginPrompt {
     this.form.onsubmit = (event) => this.login(event);
     if (options.persist === false) this.persist.parentElement.style.display = "none";
   }
-  /**
-   * Close the login prompt
-   */
+  /** Close the login prompt */
   close() {
     var _a, _b;
     (_a = document.querySelector("#datalynk-login-css")) == null ? void 0 : _a.remove();
@@ -1426,14 +1407,16 @@ const _LoginPrompt = class _LoginPrompt {
   }
 };
 /** Dynamically create CSS style */
-__publicField(_LoginPrompt, "css", (background = "#ffffff", color = "#000000cc", titleColor = "#000000") => `
+__publicField(_LoginPrompt, "css", (options) => `
 	<style id="datalynk-login-styles">
 		@import url('https://fonts.cdnfonts.com/css/ar-blanca');
 		
 		#datalynk-login {
-			--theme-background: ${background};
-			--theme-primary: ${color};
-			--theme-title: ${titleColor};
+			--theme-background: ${options.background};
+			--theme-container: #000000cc;
+			--theme-glow: ${options.glow || options.color};
+			--theme-primary: ${options.color};
+			--theme-text: ${options.textColor};;
 			
 			position: fixed;
 			left: 0;
@@ -1446,6 +1429,19 @@ __publicField(_LoginPrompt, "css", (background = "#ffffff", color = "#000000cc",
 			font-family: sans-serif;
 			z-index: 1000;
 		}
+		
+		#datalynk-login .added-links {
+			color: var(--theme-text);
+			position: fixed;
+			bottom: 0;
+			right: 0;
+			padding: 0.25rem;
+		}
+		
+		#datalynk-login .added-links a, #datalynk-login .added-links a:hover, #datalynk-login .added-links a:visited {
+			color: var(--theme-text);
+			text-shadow: 0 0 10px black;
+		}
 	
 		#datalynk-login-alert {
 			padding: 0.75rem;
@@ -1453,6 +1449,7 @@ __publicField(_LoginPrompt, "css", (background = "#ffffff", color = "#000000cc",
 			color: white;
 			border-radius: 5px;
 			margin-bottom: 1rem;
+			border: grey 1px solid;
 		}
 	
 		#datalynk-login label {
@@ -1470,30 +1467,6 @@ __publicField(_LoginPrompt, "css", (background = "#ffffff", color = "#000000cc",
 			color: black;
 		}
 	
-		#datalynk-login input:disabled {
-			color: #333;
-			background-color: #ccc;
-		}
-	
-		#datalynk-login button {
-			background-color: #e03a3e;
-			background-image: none;
-			border: 0;
-			color: #fff;
-			padding: 8px 24px;
-			border-radius: 5px;
-		}
-	
-		#datalynk-login button:disabled {
-			cursor: pointer;
-			filter: brightness(90%);
-		}
-	
-		#datalynk-login button:hover:not(:disabled) {
-			cursor: pointer;
-			filter: brightness(110%);
-		}
-	
 		#datalynk-login .login-container {
 			position: fixed;
 			top: 50%;
@@ -1503,7 +1476,7 @@ __publicField(_LoginPrompt, "css", (background = "#ffffff", color = "#000000cc",
 		}
 		
 		#datalynk-login .login-header {
-			color: var(--theme-title);
+			color: var(--theme-text);
 			text-align: center;
 			font-size: 32px;
 			margin-bottom: 2rem;
@@ -1513,23 +1486,58 @@ __publicField(_LoginPrompt, "css", (background = "#ffffff", color = "#000000cc",
 			display: flex;
 			flex-direction: column;
 			align-items: center;
-			background: var(--theme-primary);
+			background: var(--theme-container);
+			border-top: var(--theme-glow) 1px solid;
+			box-shadow: 0 -10px 20px -10px var(--theme-glow);
 		}
 	
 		#datalynk-login .login-body {
-			padding: 3.5rem 0 0 0;
+			padding: ${options.hideApps ? "3.5rem 0" : "3.5rem 0 1.5rem 0"};
+			width: 100%;
+			max-width: 400px;;
 			color: white;
 		}
+		
+		#datalynk-login input:disabled {
+			color: #333;
+			background-color: #ccc;
+		}
+		
+		#datalynk-login input[type="checkbox"] {
+		    height: 15px;
+		    margin: 0;
+		    padding: 0;
+		    accent-color: var(--theme-primary);
+		}
+		
+		#datalynk-login button {
+			background-color: var(--theme-primary);
+			background-image: none;
+			border: 0;
+			color: ${blackOrWhite(options.color)};
+			padding: 8px 24px;
+			border-radius: 5px;
+		}
 	
-		#datalynk-login .login-footer{
-			padding: 1.5rem 0;
+		#datalynk-login button:disabled {
+			cursor: pointer;
+			filter: brightness(90%);
 		}
 	
-		#datalynk-login .login-footer a {
+		#datalynk-login button:hover:not(:disabled) {
+			cursor: pointer;
+			filter: ${blackOrWhite(options.color) == "black" ? "brightness(105%)" : "brightness(80%)"};
+		}
+	
+		#datalynk-login .login-links{
+			padding: 0 0 1.5rem 0;
+		}
+	
+		#datalynk-login .login-links a {
 			text-decoration: none;
 		}
 	
-		#datalynk-login .login-footer img {
+		#datalynk-login .login-links img {
 			width: 150px;
 			height: auto;
 		}
@@ -1538,26 +1546,27 @@ __publicField(_LoginPrompt, "css", (background = "#ffffff", color = "#000000cc",
 			display: none;
 		}
 		
+		#datalynk-login .login-footer {
+			transform: translateY(-18px);
+		}
+		
 		#datalynk-login .sloped-div {
-			margin-left:auto;
-			margin-right: auto;
-			display: inline-flex;
-			padding: 0 3rem 0.5rem 3rem;
-			justify-content: center;
-			align-items: center;
-			background: var(--theme-primary);
-			clip-path: polygon(0 0, 100% 0, 80% 100%, 20% 100%);
 			position: absolute;
-			left: 50%;
-			transform: translate(-50%, -1px);
+			height: 45px;
+			width: 200px;
+			background: var(--theme-container);
+			clip-path: polygon(0 20px, 100% 20px, 85% 60px, 15% 60px);
 		}
 	</style>`);
 /** Dynamically create HTML */
-__publicField(_LoginPrompt, "template", (title = "Datalynk") => `
+__publicField(_LoginPrompt, "template", (options) => `
 	<div id="datalynk-login">
+		<div class="added-links">
+			${(options.addLinks || []).map((link) => `<a href="${link.url}" target="_blank">${link.text}</a>`).join(" | ")}
+		</div>
 		<div class="login-container">
 			<div class="login-header">
-				${title}
+				${options.title}
 			</div>
 			<div class="login-content">
 				<div class="login-body" style="max-width: 300px">
@@ -1580,7 +1589,8 @@ __publicField(_LoginPrompt, "template", (title = "Datalynk") => `
 						<button>Login</button>
 					</form>
 				</div>
-				<div class="login-footer" style="text-align: center">
+				${options.hideApps ? "" : `
+				<div class="login-links" style="text-align: center">
 					<a href="https://itunes.apple.com/ca/app/auxilium-mobile/id1166379280?mt=8" target="_blank">
 						<img alt="App Store" src="https://datalynk.auxiliumgroup.com/api/js/auxilium/dijits/templates/login/_common/mobile_apple_transparent.png">
 					</a>
@@ -1588,14 +1598,14 @@ __publicField(_LoginPrompt, "template", (title = "Datalynk") => `
 						<img alt="Playstore" src="https://datalynk.auxiliumgroup.com/api/js/auxilium/dijits/templates/login/_common/mobile_google_transparent.png">
 					</a>
 				</div>
+				`}
 			</div>
-			<div class="sloped-div">
-				<div style="height: 36px">
-					<a href="https://auxiliumgroup.com" target="_blank" style="height: 40px; display: flex; align-items: center; text-decoration: none; font-family: 'AR BLANCA', serif; font-size: 26px; color: white; position: relative">
-						Au<span style="font-size: 52px; color: #c83232; margin-bottom: 5px">x</span>ilium
-						<span style="position: absolute; font-size: 10px; color: #c83232; top: 2px; right: 2px">Group</span>
-					</a>
-				</div>
+			<div class="login-footer" style="position: relative; display: flex; align-items: center; justify-content: center;">
+				<div class="sloped-div"></div>
+				<a href="https://auxiliumgroup.com" target="_blank" style="position: relative; height: 40px; display: flex; align-items: center; text-decoration: none; font-family: 'AR BLANCA', serif; font-size: 26px; color: white;">
+					Au<span style="font-size: 52px; color: #c83232; margin-bottom: 5px">x</span>ilium
+					<span style="position: absolute; font-size: 10px; color: #c83232; top: 2px; right: 2px">Group</span>
+				</a>
 			</div>
 		</div>
 	</div>
@@ -1606,7 +1616,7 @@ class Auth {
     /** Current user as an observable */
     __publicField(this, "user$", new BehaviorSubject(void 0));
     this.api = api;
-    this.api.token$.subscribe(() => this.current());
+    this.api.token$.subscribe((token) => this.current(token, true));
   }
   /** Current user */
   get user() {
@@ -1625,14 +1635,21 @@ class Auth {
    *
    * @return {Promise<User | null>}
    */
-  current() {
-    if (!this.api.token) {
-      this.user = null;
-      return Promise.resolve(null);
+  async current(token = this.api.token, set) {
+    var _a;
+    if (!token) {
+      if (set && this.user != null) this.user = null;
+      return null;
+    } else if (token == ((_a = this.user) == null ? void 0 : _a.token)) {
+      return this.user;
     }
-    return this.api.request({ "$/auth/current": {} }).then((resp) => {
-      this.user = (resp == null ? void 0 : resp.login) ? resp : null;
-      return resp;
+    return this.api.request({ "$/auth/current": {} }, { token }).then((resp) => {
+      const u = (resp == null ? void 0 : resp.login) ? resp : null;
+      if (set) {
+        this.api.token = token;
+        this.user = u;
+      }
+      return u;
     });
   }
   /**
@@ -1648,12 +1665,7 @@ class Auth {
     if (urlToken) {
       this.api.token = urlToken;
       location.href = location.href.replace(/datalynkToken.*?(&|$)/gm, "");
-    } else if (this.api.token) {
-      await this.current().catch(() => {
-        this.api.token = null;
-        location.reload();
-      });
-    } else {
+    } else if (!this.api.token) {
       await this.loginPrompt(spoke, options).done;
       location.reload();
     }
@@ -1706,7 +1718,7 @@ class Auth {
    * @param {string} password Password for account
    * @param {string} spoke Override login spoke
    * @param {twoFactor?: string, expire?: string} opts 2FA code & expire date (YYYY-MM-DD)
-   * @returns {Promise<any>} Session information returned from login request
+   * @returns {Promise<User>} User account
    */
   login(spoke, login, password, opts) {
     const date = /* @__PURE__ */ new Date();
@@ -1725,21 +1737,19 @@ class Auth {
     }).then(async (resp) => {
       const data = await resp.json().catch(() => ({}));
       if (!resp.ok || data["error"]) throw Object.assign(errorFromCode(resp.status, data.error) || {}, data);
-      this.api.token = data["token"];
-      return await firstValueFrom(this.user$.pipe(filter((u) => (u == null ? void 0 : u.token) == data["token"])));
+      return await this.current(data["token"], true);
     });
   }
   /**
    * Login as guest user
    *
-   * @return {Promise<any>}
+   * @return {Promise<User>} Guest account
    */
   loginGuest() {
     return fetch(`${this.api.url}guest`).then(async (resp) => {
       const data = await resp.json().catch(() => ({}));
       if (!resp.ok || data["error"]) throw Object.assign(errorFromCode(resp.status, data.error) || {}, data);
-      this.api.token = data["token"];
-      return data;
+      return await this.current(data["token"], true);
     });
   }
   /**
@@ -2486,7 +2496,7 @@ class Superuser {
     } });
   }
 }
-const version = "1.0.8";
+const version = "1.0.11";
 class Api {
   /**
    * Connect to Datalynk & send requests
@@ -2557,10 +2567,11 @@ class Api {
     return jwtDecode(this.token);
   }
   _request(req, options = {}) {
+    const token = options.token || this.token;
     return fetch(this.url, {
       method: "POST",
       headers: clean({
-        Authorization: this.token ? `Bearer ${this.token}` : void 0,
+        Authorization: token ? `Bearer ${token}` : void 0,
         "Content-Type": "application/json",
         "X-Date-Return-Format": this.options.legacyDates ? void 0 : "ISO8601"
       }),

package/dist/login-prompt.d.ts

@@ -1,22 +1,30 @@
 import { Api } from './api';
 /** Styling options for login prompt */
 export type LoginPromptOptions = {
-    /** Background CSS property, could be a hex: `#fffff` or a url: `url("...")` */
+    /** Add links to top of page */
+    addLinks?: {
+        text: string;
+        url: string;
+    }[];
+    /** Background CSS property: url("...") #fff */
     background?: string;
-    /** Foreground color hex: `#000000` */
+    /** Primary color as hex: `#000000` */
     color?: string;
+    /** Change glow color, defaults to color or set to falsy to disable */
+    glow?: string;
+    /** Hide app links */
+    hideApps?: boolean;
     /** Allow users to stay logged in */
     persist?: boolean;
-    /** Header, could be a simple string: 'Datalynk' or HTML: `<img src="...">`*/
+    /** Header string or HTML: <img alt="logo" src="...">*/
     title?: string;
-    /** Text color of header, only valid when passing a string to title */
-    titleColor?: string;
+    /** Color of headers & links */
+    textColor?: string;
 };
 /** Create a login prompt */
 export declare class LoginPrompt {
     private readonly api;
     readonly spoke: string;
-    options: LoginPromptOptions;
     /** Dynamically create CSS style */
     private static css;
     /** Dynamically create HTML */
@@ -27,13 +35,12 @@ export declare class LoginPrompt {
     private readonly password;
     private readonly persist;
     private readonly username;
+    readonly options: LoginPromptOptions;
     private _done;
     /** Promise which resolves once login is complete */
     done: Promise<void>;
     constructor(api: Api, spoke: string, options?: LoginPromptOptions);
-    /**
-     * Close the login prompt
-     */
+    /** Close the login prompt */
     close(): void;
     /** Check if login prompt is still open */
     isOpen(): boolean;

package/dist/login-prompt.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"login-prompt.d.ts","sourceRoot":"","sources":["../src/login-prompt.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,GAAG,EAAC,MAAM,OAAO,CAAC;AAE1B,uCAAuC;AACvC,MAAM,MAAM,kBAAkB,GAAG;IAChC,+EAA+E;IAC/E,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,sCAAsC;IACtC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,oCAAoC;IACpC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,6EAA6E;IAC7E,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,sEAAsE;IACtE,UAAU,CAAC,EAAE,MAAM,CAAC;CACpB,CAAA;AAED,4BAA4B;AAC5B,qBAAa,WAAW;IA6LX,OAAO,CAAC,QAAQ,CAAC,GAAG;aAAuB,KAAK,EAAE,MAAM;IAAS,OAAO,EAAE,kBAAkB;IA5LxG,mCAAmC;IACnC,OAAO,CAAC,MAAM,CAAC,GAAG,CA6HR;IAEV,8BAA8B;IAC9B,OAAO,CAAC,MAAM,CAAC,QAAQ,CA8CrB;IAEF,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAO;IAC7B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAO;IAC9B,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAO;IAC5B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAO;IAChC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAO;IAC/B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAO;IAEhC,OAAO,CAAC,KAAK,CAAY;IACzB,oDAAoD;IACpD,IAAI,gBAAmD;gBAE1B,GAAG,EAAE,GAAG,EAAkB,KAAK,EAAE,MAAM,EAAS,OAAO,GAAE,kBAAuB;IAgB7G;;OAEG;IACH,KAAK;IAKL,0CAA0C;IAC1C,MAAM;IAIN,8BAA8B;IAC9B,KAAK,CAAC,KAAK,EAAE,GAAG;CA4BhB"}
+{"version":3,"file":"login-prompt.d.ts","sourceRoot":"","sources":["../src/login-prompt.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,GAAG,EAAC,MAAM,OAAO,CAAC;AAE1B,uCAAuC;AACvC,MAAM,MAAM,kBAAkB,GAAG;IAChC,+BAA+B;IAC/B,QAAQ,CAAC,EAAE;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAC,EAAE,CAAC;IACzC,+CAA+C;IAC/C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,sCAAsC;IACtC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,sEAAsE;IACtE,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,qBAAqB;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,oCAAoC;IACpC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,uDAAuD;IACvD,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,+BAA+B;IAC/B,SAAS,CAAC,EAAE,MAAM,CAAC;CACnB,CAAA;AAED,4BAA4B;AAC5B,qBAAa,WAAW;IA4NX,OAAO,CAAC,QAAQ,CAAC,GAAG;aAAuB,KAAK,EAAE,MAAM;IA3NpE,mCAAmC;IACnC,OAAO,CAAC,MAAM,CAAC,GAAG,CAsJR;IAEV,8BAA8B;IAC9B,OAAO,CAAC,MAAM,CAAC,QAAQ,CAkDrB;IAEF,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAO;IAC7B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAO;IAC9B,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAO;IAC5B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAO;IAChC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAO;IAC/B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAO;IAEhC,SAAgB,OAAO,EAAG,kBAAkB,CAAC;IAE7C,OAAO,CAAC,KAAK,CAAY;IACzB,oDAAoD;IACpD,IAAI,gBAAmD;gBAE1B,GAAG,EAAE,GAAG,EAAkB,KAAK,EAAE,MAAM,EAAE,OAAO,GAAE,kBAAuB;IAyBtG,6BAA6B;IAC7B,KAAK;IAKL,0CAA0C;IAC1C,MAAM;IAIN,8BAA8B;IAC9B,KAAK,CAAC,KAAK,EAAE,GAAG;CA4BhB"}

package/package.json

@@ -2,7 +2,7 @@
 	"name": "@auxilium/datalynk-client",
 	"description": "Datalynk client library",
 	"repository": "https://gitlab.auxiliumgroup.com/auxilium/datalynk/datalynk-client",
-	"version": "1.0.8",
+	"version": "1.0.11",
 	"author": "Zak Timson <zaktimson@gmail.com>",
 	"private": false,
 	"main": "./dist/index.cjs",