From 4435248a9e7e30f353ee4e8b3fd6fd87b131938a Mon Sep 17 00:00:00 2001 From: Andrew Azores Date: Tue, 5 Dec 2023 10:23:41 -0500 Subject: [PATCH] use relative authority --- src/app/Shared/Services/Login.service.tsx | 2 +- webpack.common.js | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/app/Shared/Services/Login.service.tsx b/src/app/Shared/Services/Login.service.tsx index b629acafc7..d4bc351a03 100644 --- a/src/app/Shared/Services/Login.service.tsx +++ b/src/app/Shared/Services/Login.service.tsx @@ -40,7 +40,7 @@ export class LoginService { private readonly authCredentials: AuthCredentials, private readonly settings: SettingsService, ) { - this.authority = process.env.CRYOSTAT_AUTHORITY || ''; + this.authority = process.env.CRYOSTAT_AUTHORITY || './'; this.token.next(this.getCacheItem(this.TOKEN_KEY)); this.username.next(this.getCacheItem(this.USER_KEY)); this.authMethod.next(this.getCacheItem(this.AUTH_METHOD_KEY) as AuthMethod); diff --git a/webpack.common.js b/webpack.common.js index 37d95ac2cf..c3e63fdfd2 100644 --- a/webpack.common.js +++ b/webpack.common.js @@ -3,7 +3,6 @@ const HtmlWebpackPlugin = require('html-webpack-plugin'); const TsconfigPathsPlugin = require('tsconfig-paths-webpack-plugin'); const BG_IMAGES_DIRNAME = 'bgimages'; -const ASSET_PATH = process.env.ASSET_PATH || '/'; module.exports = (env) => { return { @@ -154,8 +153,8 @@ module.exports = (env) => { chunkFilename: '[id].[contenthash].bundle.js', // lazy-load modules hashFunction: "xxhash64", path: path.resolve(__dirname, 'dist'), - publicPath: ASSET_PATH, - clean: true + clean: true, + publicPath: './', }, resolve: { extensions: ['.ts', '.tsx', '.js', '.jsx'],