#250 - Added appBaseHref to get application root address

Author: alirizaadiyahsi

angular/src/AppPreBootstrap.ts

@@ -1,12 +1,13 @@
-import * as moment from 'moment';
+import * as moment from 'moment';
 import { AppConsts } from '@shared/AppConsts';
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
 import { Type, CompilerOptions, NgModuleRef } from '@angular/core';
+import { environment } from './environments/environment';
 
 export class AppPreBootstrap {
 
-    static run(callback: () => void): void {
-        AppPreBootstrap.getApplicationConfig(() => {
+    static run(appRootUrl: string, callback: () => void): void {
+        AppPreBootstrap.getApplicationConfig(appRootUrl, () => {
             AppPreBootstrap.getUserConfiguration(callback);
         });
     }
@@ -15,9 +16,9 @@ export class AppPreBootstrap {
         return platformBrowserDynamic().bootstrapModule(moduleType, compilerOptions);
     }
 
-    private static getApplicationConfig(callback: () => void) {
+    private static getApplicationConfig(appRootUrl: string, callback: () => void) {
         return abp.ajax({
-            url: '/assets/appconfig.json',
+            url: appRootUrl + 'assets/' + environment.appConfig,
             method: 'GET',
             headers: {
                 'Abp.TenantId': abp.multiTenancy.getTenantIdCookie()
@@ -65,4 +66,4 @@ export class AppPreBootstrap {
             callback();
         });
     }
-}
+}

angular/src/environments/environment.hmr.ts

@@ -1,6 +1,7 @@
-// "Hot Module Replacement" enabled environment
+// "Hot Module Replacement" enabled environment
 
 export const environment = {
     production: false,
-    hmr: true
-};
+    hmr: true,
+    appConfig: 'appconfig.json'
+};

angular/src/environments/environment.prod.ts

@@ -2,5 +2,6 @@
 
 export const environment = {
     production: true,
-    hmr: false
-};
+    hmr: false,
+    appConfig: 'appconfig.json'
+};

angular/src/environments/environment.ts

@@ -5,5 +5,6 @@
 
 export const environment = {
     production: false,
-    hmr: false
-};
+    hmr: false,
+    appConfig: 'appconfig.json'
+};

angular/src/root.module.ts

@@ -1,6 +1,7 @@
 import { BrowserModule } from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { NgModule, Injector, APP_INITIALIZER, LOCALE_ID } from '@angular/core';
+import { PlatformLocation } from '@angular/common';
 
 import { AbpModule } from '@abp/abp.module';
 import { AbpHttpInterceptor } from '@abp/abpHttpInterceptor';
@@ -17,69 +18,91 @@ import { API_BASE_URL } from '@shared/service-proxies/service-proxies';
 import { RootComponent } from './root.component';
 import { AppPreBootstrap } from './AppPreBootstrap';
 import { ModalModule } from 'ngx-bootstrap';
-import { HttpClientModule, HttpResponse } from '@angular/common/http';
-
-export function appInitializerFactory(injector: Injector) {
-  return () => {
-
-    abp.ui.setBusy();
-    return new Promise<boolean>((resolve, reject) => {
-      AppPreBootstrap.run(() => {
-        abp.event.trigger('abp.dynamicScriptsInitialized');
-        var appSessionService: AppSessionService = injector.get(AppSessionService);
-        appSessionService.init().then(
-          (result) => {
-            abp.ui.clearBusy();
-            resolve(result);
-          },
-          (err) => {
-            abp.ui.clearBusy();
-            reject(err);
-          }
-        );
-      });
-    });
-  }
+import { HttpClientModule } from '@angular/common/http';
+
+export function appInitializerFactory(injector: Injector,
+    platformLocation: PlatformLocation) {
+    return () => {
+
+        abp.ui.setBusy();
+        return new Promise<boolean>((resolve, reject) => {
+            AppConsts.appBaseHref = getBaseHref(platformLocation);
+            let appBaseUrl = getDocumentOrigin() + AppConsts.appBaseHref;
+
+            AppPreBootstrap.run(appBaseUrl, () => {
+                abp.event.trigger('abp.dynamicScriptsInitialized');
+                var appSessionService: AppSessionService = injector.get(AppSessionService);
+                appSessionService.init().then(
+                    (result) => {
+                        abp.ui.clearBusy();
+                        resolve(result);
+                    },
+                    (err) => {
+                        abp.ui.clearBusy();
+                        reject(err);
+                    }
+                );
+            });
+        });
+    }
 }
 
 export function getRemoteServiceBaseUrl(): string {
-  return AppConsts.remoteServiceBaseUrl;
+    return AppConsts.remoteServiceBaseUrl;
 }
 
 export function getCurrentLanguage(): string {
     return abp.localization.currentLanguage.name;
 }
 
 @NgModule({
-  imports: [
-    BrowserModule,
-    BrowserAnimationsModule,
-    SharedModule.forRoot(),
-    ModalModule.forRoot(),
-    AbpModule,
-    ServiceProxyModule,
-    RootRoutingModule,
-    HttpClientModule
-  ],
-  declarations: [
-    RootComponent
-  ],
-  providers: [
-    { provide: HTTP_INTERCEPTORS, useClass: AbpHttpInterceptor, multi: true },
-    { provide: API_BASE_URL, useFactory: getRemoteServiceBaseUrl },
-    {
-      provide: APP_INITIALIZER,
-      useFactory: appInitializerFactory,
-      deps: [Injector],
-      multi: true
-    },
-      {
-          provide: LOCALE_ID,
-          useFactory: getCurrentLanguage
-      }
-  ],
-  bootstrap: [RootComponent]
+    imports: [
+        BrowserModule,
+        BrowserAnimationsModule,
+        SharedModule.forRoot(),
+        ModalModule.forRoot(),
+        AbpModule,
+        ServiceProxyModule,
+        RootRoutingModule,
+        HttpClientModule
+    ],
+    declarations: [
+        RootComponent
+    ],
+    providers: [
+        { provide: HTTP_INTERCEPTORS, useClass: AbpHttpInterceptor, multi: true },
+        { provide: API_BASE_URL, useFactory: getRemoteServiceBaseUrl },
+        {
+            provide: APP_INITIALIZER,
+            useFactory: appInitializerFactory,
+            deps: [Injector, PlatformLocation],
+            multi: true
+        },
+        {
+            provide: LOCALE_ID,
+            useFactory: getCurrentLanguage
+        }
+    ],
+    bootstrap: [RootComponent]
 })
+
 export class RootModule {
 
 }
+
+export function getBaseHref(platformLocation: PlatformLocation): string {
+    var baseUrl = platformLocation.getBaseHrefFromDOM();
+    if (baseUrl) {
+        return baseUrl;
+    }
+
+    return '/';
+}
+
+function getDocumentOrigin() {
+    if (!document.location.origin) {
+        return document.location.protocol + "//" + document.location.hostname + (document.location.port ? ':' + document.location.port : '');
+    }
+
+    return document.location.origin;
+}

angular/src/shared/AppConsts.ts

@@ -1,7 +1,8 @@
-export class AppConsts {
+export class AppConsts {
 
     static remoteServiceBaseUrl: string;
     static appBaseUrl: string;
+    static appBaseHref: string; // returns angular's base-href parameter value if used during the publish
 
     static readonly userManagement = {
         defaultAdminUserName: 'admin'