@barchart/portfolio-client-js 1.3.9 → 1.3.12

package/example/example.js

@@ -63,6 +63,8 @@ module.exports = function () {
 					return 'xos40seq3e.execute-api.us-east-1.amazonaws.com/prod';
 				} else if (host === Configuration.adminHost) {
 					return 'q1x45oxon1.execute-api.us-east-1.amazonaws.com/admin';
+				} else if (host === Configuration.demoHost) {
+					return 'b9132ukaob.execute-api.us-east-1.amazonaws.com/demo';
 				} else {
 					return '';
 				}
@@ -97,35 +99,35 @@ module.exports = function () {
 			}
 
 			/**
-    * The host of the production system.
+    * The host of the public demo system.
     *
     * @public
     * @static
-    * @returns {String}
+    * @return {String}
     */
 
 		}, {
-			key: 'productionHost',
+			key: 'demoHost',
 			get: function get() {
-				return 'portfolio.aws.barchart.com';
+				return 'portfolio-demo.aws.barchart.com';
 			}
 
 			/**
-    * The host of the internal admin system.
+    * The host of the production system.
     *
     * @public
     * @static
-    * @return {String}
+    * @returns {String}
     */
 
 		}, {
-			key: 'adminHost',
+			key: 'productionHost',
 			get: function get() {
-				return 'portfolio-admin.aws.barchart.com';
+				return 'portfolio.aws.barchart.com';
 			}
 
 			/**
-    * The host of the public demo system.
+    * The host of the internal admin system.
     *
     * @public
     * @static
@@ -133,9 +135,9 @@ module.exports = function () {
     */
 
 		}, {
-			key: 'demoHost',
+			key: 'adminHost',
 			get: function get() {
-				return 'portfolio-demo.aws.barchart.com';
+				return 'portfolio-admin.aws.barchart.com';
 			}
 		}]);
 
@@ -1035,6 +1037,25 @@ module.exports = function () {
 				});
 			}
 
+			/**
+    * Creates and starts a new {@link PortfolioGateway} for use in the demo environment.
+    *
+    * @public
+    * @static
+    * @param {RequestInterceptor=|Promise<RequestInterceptor>=} requestInterceptor - A request interceptor used with each request (typically used to inject JWT tokens).
+    * @returns {Promise<PortfolioGateway>}
+    */
+
+		}, {
+			key: 'forDemo',
+			value: function forDemo(requestInterceptor) {
+				return Promise.resolve(requestInterceptor).then(function (requestInterceptor) {
+					assert.argumentIsOptional(requestInterceptor, 'requestInterceptor', RequestInterceptor, 'RequestInterceptor');
+
+					return start(new PortfolioGateway('https', Configuration.demoHost, 443, 'development', requestInterceptor));
+				});
+			}
+
 			/**
     * Creates and starts a new {@link PortfolioGateway} for use in the production environment.
     *
@@ -1359,15 +1380,15 @@ module.exports = function () {
 				var refreshToken = function refreshToken() {
 					var refreshPromise = scheduler.backoff(function () {
 						return _this4.readToken();
-					}, 0, 'Read JWT token', 3).then(function (token) {
+					}, 750, 'Read JWT token', 3).then(function (token) {
 						if (_this4._refreshInterval) {
 							cachePromise = refreshPromise;
-						}
 
-						if (cacheDisposable === null) {
-							cacheDisposable = scheduler.repeat(function () {
-								return refreshToken();
-							}, _this4._refreshInterval, 'Refresh JWT token');
+							if (cacheDisposable === null) {
+								cacheDisposable = scheduler.repeat(function () {
+									return refreshToken();
+								}, _this4._refreshInterval, 'Refresh JWT token');
+							}
 						}
 
 						return token;
@@ -1619,6 +1640,14 @@ module.exports = function () {
 		}).withRequestInterceptor(externalRequestInterceptor).withResponseInterceptor(ResponseInterceptor.DATA).endpoint;
 	}
 
+	function _forDemo(userId) {
+		return EndpointBuilder.for('read-jwt-token-for-demo', 'lookup user identity').withVerb(VerbType.GET).withProtocol(ProtocolType.HTTPS).withHost(Configuration.demoHost).withPathBuilder(function (pb) {
+			pb.withLiteralParameter('token', 'token').withLiteralParameter('barchart', 'barchart').withLiteralParameter('generator', 'generator');
+		}).withQueryBuilder(function (qb) {
+			qb.withLiteralParameter('user', 'userId', userId).withLiteralParameter('legacy user', 'userLegacyId', userId).withLiteralParameter('user context', 'userContext', 'Barchart').withLiteralParameter('user permission level', 'userPermissions', 'registered');
+		}).withResponseInterceptor(ResponseInterceptor.DATA).endpoint;
+	}
+
 	function _forProduction(externalRequestInterceptor) {
 		return EndpointBuilder.for('translate-jwt-token-for-production', 'lookup Barchart user identity').withVerb(VerbType.GET).withProtocol(ProtocolType.HTTPS).withHost(Configuration.productionHost).withPathBuilder(function (pb) {
 			pb.withLiteralParameter('token', 'token').withLiteralParameter('system', 'tgam').withLiteralParameter('converter', 'converter');
@@ -1641,14 +1670,6 @@ module.exports = function () {
 		}).withResponseInterceptor(ResponseInterceptor.DATA).endpoint;
 	}
 
-	function _forDemo(userId) {
-		return EndpointBuilder.for('read-jwt-token-for-demo', 'lookup user identity').withVerb(VerbType.GET).withProtocol(ProtocolType.HTTPS).withHost(Configuration.developmentHost).withPathBuilder(function (pb) {
-			pb.withLiteralParameter('token', 'token').withLiteralParameter('barchart', 'barchart').withLiteralParameter('generator', 'generator');
-		}).withQueryBuilder(function (qb) {
-			qb.withLiteralParameter('user', 'userId', userId).withLiteralParameter('legacy user', 'userLegacyId', userId).withLiteralParameter('user context', 'userContext', 'Barchart').withLiteralParameter('user permission level', 'userPermissions', 'registered');
-		}).withResponseInterceptor(ResponseInterceptor.DATA).endpoint;
-	}
-
 	return JwtGateway;
 }();
 
@@ -1664,7 +1685,7 @@ module.exports = function () {
 	return {
 		JwtGateway: JwtGateway,
 		PortfolioGateway: PortfolioGateway,
-		version: '1.3.9'
+		version: '1.3.12'
 	};
 }();
 

package/lib/common/Configuration.js

@@ -20,6 +20,8 @@ module.exports = (() => {
 				return 'xos40seq3e.execute-api.us-east-1.amazonaws.com/prod';
 			} else if (host === Configuration.adminHost) {
 				return 'q1x45oxon1.execute-api.us-east-1.amazonaws.com/admin';
+			} else if (host === Configuration.demoHost) {
+				return 'b9132ukaob.execute-api.us-east-1.amazonaws.com/demo';
 			} else {
 				return '';
 			}
@@ -48,36 +50,36 @@ module.exports = (() => {
 		}
 
 		/**
-		 * The host of the production system.
+		 * The host of the public demo system.
 		 *
 		 * @public
 		 * @static
-		 * @returns {String}
+		 * @return {String}
 		 */
-		static get productionHost() {
-			return 'portfolio.aws.barchart.com';
+		static get demoHost() {
+			return 'portfolio-demo.aws.barchart.com';
 		}
 
 		/**
-		 * The host of the internal admin system.
+		 * The host of the production system.
 		 *
 		 * @public
 		 * @static
-		 * @return {String}
+		 * @returns {String}
 		 */
-		static get adminHost() {
-			return 'portfolio-admin.aws.barchart.com';
+		static get productionHost() {
+			return 'portfolio.aws.barchart.com';
 		}
 
 		/**
-		 * The host of the public demo system.
+		 * The host of the internal admin system.
 		 *
 		 * @public
 		 * @static
 		 * @return {String}
 		 */
-		static get demoHost() {
-			return 'portfolio-demo.aws.barchart.com';
+		static get adminHost() {
+			return 'portfolio-admin.aws.barchart.com';
 		}
 
 		toString() {

package/lib/gateway/PortfolioGateway.js

@@ -965,6 +965,23 @@ module.exports = (() => {
 				});
 		}
 
+		/**
+		 * Creates and starts a new {@link PortfolioGateway} for use in the demo environment.
+		 *
+		 * @public
+		 * @static
+		 * @param {RequestInterceptor=|Promise<RequestInterceptor>=} requestInterceptor - A request interceptor used with each request (typically used to inject JWT tokens).
+		 * @returns {Promise<PortfolioGateway>}
+		 */
+		static forDemo(requestInterceptor) {
+			return Promise.resolve(requestInterceptor)
+				.then((requestInterceptor) => {
+					assert.argumentIsOptional(requestInterceptor, 'requestInterceptor', RequestInterceptor, 'RequestInterceptor');
+
+					return start(new PortfolioGateway('https', Configuration.demoHost, 443, 'development', requestInterceptor));
+				});
+		}
+
 		/**
 		 * Creates and starts a new {@link PortfolioGateway} for use in the production environment.
 		 *

package/lib/gateway/jwt/JwtGateway.js

@@ -101,14 +101,14 @@ module.exports = (() => {
 			let cacheDisposable = null;
 
 			const refreshToken = () => {
-				const refreshPromise = scheduler.backoff(() => this.readToken(), 0, 'Read JWT token', 3)
+				const refreshPromise = scheduler.backoff(() => this.readToken(), 750, 'Read JWT token', 3)
 					.then((token) => {
 						if (this._refreshInterval) {
 							cachePromise = refreshPromise;
-						}
 
-						if (cacheDisposable === null) {
-							cacheDisposable = scheduler.repeat(() => refreshToken(), this._refreshInterval, 'Refresh JWT token');
+							if (cacheDisposable === null) {
+								cacheDisposable = scheduler.repeat(() => refreshToken(), this._refreshInterval, 'Refresh JWT token');
+							}
 						}
 
 						return token;
@@ -354,6 +354,26 @@ module.exports = (() => {
 			.endpoint;
 	}
 
+	function forDemo(userId) {
+		return EndpointBuilder.for('read-jwt-token-for-demo', 'lookup user identity')
+			.withVerb(VerbType.GET)
+			.withProtocol(ProtocolType.HTTPS)
+			.withHost(Configuration.demoHost)
+			.withPathBuilder((pb) => {
+				pb.withLiteralParameter('token', 'token')
+				.withLiteralParameter('barchart', 'barchart')
+				.withLiteralParameter('generator', 'generator');
+			})
+			.withQueryBuilder((qb) => {
+				qb.withLiteralParameter('user', 'userId', userId)
+				.withLiteralParameter('legacy user', 'userLegacyId', userId)
+				.withLiteralParameter('user context', 'userContext', 'Barchart')
+				.withLiteralParameter('user permission level', 'userPermissions', 'registered');
+			})
+			.withResponseInterceptor(ResponseInterceptor.DATA)
+			.endpoint;
+	}
+
 	function forProduction(externalRequestInterceptor) {
 		return EndpointBuilder.for('translate-jwt-token-for-production', 'lookup Barchart user identity')
 			.withVerb(VerbType.GET)
@@ -395,25 +415,5 @@ module.exports = (() => {
 			.endpoint;
 	}
 
-	function forDemo(userId) {
-		return EndpointBuilder.for('read-jwt-token-for-demo', 'lookup user identity')
-			.withVerb(VerbType.GET)
-			.withProtocol(ProtocolType.HTTPS)
-			.withHost(Configuration.developmentHost)
-			.withPathBuilder((pb) => {
-				pb.withLiteralParameter('token', 'token')
-					.withLiteralParameter('barchart', 'barchart')
-					.withLiteralParameter('generator', 'generator');
-			})
-			.withQueryBuilder((qb) => {
-				qb.withLiteralParameter('user', 'userId', userId)
-					.withLiteralParameter('legacy user', 'userLegacyId', userId)
-					.withLiteralParameter('user context', 'userContext', 'Barchart')
-					.withLiteralParameter('user permission level', 'userPermissions', 'registered');
-			})
-			.withResponseInterceptor(ResponseInterceptor.DATA)
-			.endpoint;
-	}
-
 	return JwtGateway;
 })();

package/lib/index.js

@@ -7,6 +7,6 @@ module.exports = (() => {
 	return {
 		JwtGateway: JwtGateway,
 		PortfolioGateway: PortfolioGateway,
-		version: '1.3.9'
+		version: '1.3.12'
 	};
 })();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@barchart/portfolio-client-js",
-  "version": "1.3.9",
+  "version": "1.3.12",
   "description": "JavaScript library for interfacing with Barchart's Portfolio API",
   "author": {
     "name": "Bryan Ingle",