fix websocket paths and exclude websockets from client redirect

generators/client/files-angular.js

@@ -275,8 +275,7 @@ const files = {
                 { file: 'admin/tracker/tracker.route.ts', method: 'processJs' },
                 { file: 'admin/tracker/tracker.component.ts', method: 'processJs' },
                 { file: 'admin/tracker/tracker.component.html', method: 'processHtml' },
-                'core/tracker/tracker.service.ts',
-                'core/tracker/window.service.ts'
+                'core/tracker/tracker.service.ts'
             ]
         },
         {

generators/client/templates/angular/src/main/webapp/app/core/index.ts.ejs

@@ -8,7 +8,6 @@ export * from './auth/auth-session.service';
 <%_ } _%>
 <%_ if (websocket === 'spring-websocket') { _%>
 export * from './tracker/tracker.service';
-export * from './tracker/window.service';
 <%_ } _%>
 <%_ if (enableTranslation) { _%>
 export * from './language/language.helper';

generators/client/templates/angular/src/main/webapp/app/core/tracker/tracker.service.ts.ejs

@@ -19,9 +19,9 @@
 import { Injectable } from '@angular/core';
 import { Router, NavigationEnd } from '@angular/router';
 import { Observable, Observer, Subscription } from 'rxjs';
+import { Location } from '@angular/common';
 
 import { CSRFService } from '../auth/csrf.service';
-import { WindowRef } from './window.service';
 <%_ if (authenticationType === 'jwt' || authenticationType === 'uaa') { _%>
 import { AuthServerProvider } from '../auth/auth-jwt.service';
 <%_ } _%>
@@ -45,7 +45,7 @@ export class <%=jhiPrefixCapitalized%>TrackerService {
         <%_ if (authenticationType === 'jwt' || authenticationType === 'uaa') { _%>
         private authServerProvider: AuthServerProvider,
         <%_ } _%>
-        private $window: WindowRef,
+        private location: Location,
         // tslint:disable-next-line: no-unused-variable
         private csrfService: CSRFService
     ) {
@@ -58,9 +58,8 @@ export class <%=jhiPrefixCapitalized%>TrackerService {
           this.connection = this.createConnection();
         }
         // building absolute path so that websocket doesn't fail when deploying with a context path
-        const loc = this.$window.nativeWindow.location;
-        let url;
-        url = '//' + loc.host + loc.pathname + 'websocket/tracker';
+        let url = '/websocket/tracker';
+        url = this.location.prepareExternalUrl(url);
         <%_ if (authenticationType === 'jwt' || authenticationType === 'uaa') { _%>
         const authToken = this.authServerProvider.getToken();
         if (authToken) {

generators/client/templates/angular/webpack/webpack.common.js.ejs

@@ -17,6 +17,7 @@
  limitations under the License.
 -%>
 const webpack = require('webpack');
+const { BaseHrefWebpackPlugin } = require('base-href-webpack-plugin');
 const CopyWebpackPlugin = require('copy-webpack-plugin');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 const rxPaths = require('rxjs/_esm5/path-mapping');
@@ -111,6 +112,7 @@ module.exports = (options) => ({
             chunks: ['vendors', 'polyfills', 'main', 'global'],
             chunksSortMode: 'manual',
             inject: 'body'
-        })
+        }),
+        new BaseHrefWebpackPlugin({ baseHref: '/' })
     ]
 });

generators/client/templates/angular/webpack/webpack.prod.js.ejs

@@ -18,7 +18,6 @@
 -%>
 const webpack = require('webpack');
 const webpackMerge = require('webpack-merge');
-const { BaseHrefWebpackPlugin } = require('base-href-webpack-plugin');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 const OptimizeCSSAssetsPlugin = require("optimize-css-assets-webpack-plugin");
 const Visualizer = require('webpack-visualizer-plugin');
@@ -178,8 +177,7 @@ module.exports = webpackMerge(commonConfig({ env: ENV }), {
         new WorkboxPlugin.GenerateSW({
           clientsClaim: true,
           skipWaiting: true,
-        }),
-        new BaseHrefWebpackPlugin({ baseHref: '/' })
+        })
     ],
     mode: 'production'
 });

generators/client/templates/react/src/main/webapp/app/app.tsx.ejs

@@ -39,6 +39,8 @@ import ErrorBoundary from 'app/shared/error/error-boundary';
 import { AUTHORITIES } from 'app/config/constants';
 import AppRoutes from 'app/routes';
 
+const baseHref = document.querySelector('base').getAttribute('href').replace(/\/$/, '');
+
 export interface IAppProps extends StateProps, DispatchProps {}
 
 export class App extends React.Component<IAppProps> {
@@ -50,7 +52,7 @@ export class App extends React.Component<IAppProps> {
   render() {
     const paddingTop = '60px';
     return (
-      <Router>
+      <Router basename={baseHref}>
         <div className="app-container" style={{ paddingTop }}>
           <ToastContainer position={toast.POSITION.TOP_LEFT} className="toastify-container" toastClassName="toastify-toast"/>
           <ErrorBoundary>

generators/client/templates/react/src/main/webapp/app/config/websocket-middleware.ts.ejs

@@ -75,13 +75,14 @@ const connect = () => {
 
   // building absolute path so that websocket doesn't fail when deploying with a context path
   const loc = window.location;
+  const baseHref = document.querySelector('base').getAttribute('href').replace(/\/$/, '');
 
   const headers = {};
 <%_ if (authenticationType === 'session') { _%>
-  const url = '//' + loc.host + loc.pathname + 'websocket/tracker';
+  const url = '//' + loc.host + baseHref + '/websocket/tracker';
   headers['X-XSRF-TOKEN'] = cookie.read('XSRF-TOKEN');
 <%_ } else { _%>
-  let url = '//' + loc.host + loc.pathname + 'websocket/tracker';
+  let url = '//' + loc.host + baseHref + '/websocket/tracker';
   const authToken = Storage.local.get('jhi-authenticationToken') || Storage.session.get('jhi-authenticationToken');
   if (authToken) {
     url += '?access_token=' + authToken;

generators/client/templates/react/webpack/webpack.common.js.ejs

@@ -17,6 +17,7 @@
  limitations under the License.
 -%>
 const webpack = require('webpack');
+const { BaseHrefWebpackPlugin } = require('base-href-webpack-plugin');
 const CopyWebpackPlugin = require('copy-webpack-plugin');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
@@ -148,6 +149,7 @@ module.exports = options => ({
       chunksSortMode: 'dependency',
       inject: 'body'
     }),
+    new BaseHrefWebpackPlugin({ baseHref: '/' }),
     <%_ if (enableTranslation) { _%>
     new MergeJsonWebpackPlugin({
       output: {

generators/client/templates/react/webpack/webpack.prod.js.ejs

@@ -18,7 +18,6 @@
 -%>
 const webpack = require('webpack');
 const webpackMerge = require('webpack-merge');
-const { BaseHrefWebpackPlugin } = require('base-href-webpack-plugin');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 const WorkboxPlugin = require('workbox-webpack-plugin');
 const TerserPlugin = require('terser-webpack-plugin');
@@ -122,7 +121,6 @@ module.exports = webpackMerge(commonConfig({ env: ENV }), {
     new WorkboxPlugin.GenerateSW({
       clientsClaim: true,
       skipWaiting: true,
-    }),
-    new BaseHrefWebpackPlugin({ baseHref: '/' })
+    })
   ]
 });

generators/server/templates/src/main/java/package/web/rest/ClientForwardController.java.ejs

@@ -28,7 +28,7 @@ public class ClientForwardController {
      * Forwards any unmapped paths (except those containing a period) to the client {@code index.html}.
      * @return forward to client {@code index.html}.
      */
-    @GetMapping(value = "/**/{path:[^\\.]*}")
+    @GetMapping(value = "/**/{path:<% if (websocket === 'spring-websocket') { %>^(?!websocket)<% } %>[^\\.]*}")
     public String forward() {
         return "forward:/";
     }