From 57b2840ed8355464fe9152b6d2c9c09c72036e6f Mon Sep 17 00:00:00 2001 From: Ryan Tharp Date: Mon, 23 Mar 2020 15:41:38 -0700 Subject: [PATCH] serverRequest: fix retry, fix note --- js/modules/loki_app_dot_net_api.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/modules/loki_app_dot_net_api.js b/js/modules/loki_app_dot_net_api.js index fe2813df2..945ec66a5 100644 --- a/js/modules/loki_app_dot_net_api.js +++ b/js/modules/loki_app_dot_net_api.js @@ -242,8 +242,8 @@ const serverRequest = async (endpoint, options = {}) => { FILESERVER_HOSTS.includes(host) ) { mode = 'sendToProxy'; - // strip trailing slash const search = url.search ? `?${url.search}` : ''; + // strip first slash const endpointWithQS = `${url.pathname}${search}`.replace(/^\//, ''); // log.info('endpointWithQS', endpointWithQS) ({ response, txtResponse, result } = await sendToProxy( @@ -297,7 +297,7 @@ const serverRequest = async (endpoint, options = {}) => { if (result.status !== 200) { if (!forceFreshToken && (!response.meta || response.meta.code === 401)) { // retry with forcing a fresh token - return this.serverRequest(endpoint, { + return serverRequest(endpoint, { ...options, forceFreshToken: true, });