-
Version: {{ cobbler_version }}
+
+
+ Server: {{ cobbler_server }}
+ Version: {{ cobbler_version }}
+
+
@if (!islogged) {
();
cobbler_version: String = 'Unknown';
+ cobbler_server: String = 'localhost';
islogged: boolean = false;
subscription: Subscription;
@@ -51,6 +52,10 @@ export class NavbarComponent implements OnDestroy {
),
);
+ if (authO.server) {
+ this.cobbler_server = authO.server.match('http[s]*://([^/]*)').pop();
+ }
+
this.subscription = this.authO.authorized
.pipe(takeUntil(this.ngUnsubscribe))
.subscribe((value) => {
@@ -60,18 +65,23 @@ export class NavbarComponent implements OnDestroy {
this.islogged = false;
}
});
- cobblerApiService
- .extended_version()
- .pipe(takeUntil(this.ngUnsubscribe))
- .subscribe(
- (value) => {
- this.cobbler_version = value.version;
- },
- (error) => {
- this.cobbler_version = 'Error';
- this._snackBar.open(error.message, 'Close');
- },
- );
+
+ // should not call version unless user has authenticated
+ // as it could try to hit an invalid / incorrect URL
+ if (this.islogged) {
+ cobblerApiService
+ .extended_version()
+ .pipe(takeUntil(this.ngUnsubscribe))
+ .subscribe(
+ (value) => {
+ this.cobbler_version = value.version;
+ },
+ (error) => {
+ this.cobbler_version = 'Error';
+ this._snackBar.open(error.message, 'Close');
+ },
+ );
+ }
}
ngOnDestroy(): void {
diff --git a/projects/cobbler-frontend/src/app/services/app-config.service.spec.ts b/projects/cobbler-frontend/src/app/services/app-config.service.spec.ts
new file mode 100644
index 00000000..5952c0eb
--- /dev/null
+++ b/projects/cobbler-frontend/src/app/services/app-config.service.spec.ts
@@ -0,0 +1,19 @@
+import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { TestBed } from '@angular/core/testing';
+
+import { AppConfigService } from './app-config.service';
+
+describe('AppConfigService', () => {
+ let service: AppConfigService;
+
+ beforeEach(() => {
+ TestBed.configureTestingModule({
+ imports: [HttpClientTestingModule],
+ });
+ service = TestBed.inject(AppConfigService);
+ });
+
+ it('should be created', () => {
+ expect(service).toBeTruthy();
+ });
+});
diff --git a/projects/cobbler-frontend/src/app/services/app-config.service.ts b/projects/cobbler-frontend/src/app/services/app-config.service.ts
new file mode 100644
index 00000000..9bbda2f7
--- /dev/null
+++ b/projects/cobbler-frontend/src/app/services/app-config.service.ts
@@ -0,0 +1,47 @@
+import { Injectable } from '@angular/core';
+import { HttpClient, HttpErrorResponse } from '@angular/common/http';
+import { BehaviorSubject, Observable } from 'rxjs';
+import { retry } from 'rxjs/operators';
+
+export interface AppConfig {
+ cobblerUrls: string[];
+}
+
+const EMPTY_CONFIG: AppConfig = {
+ cobblerUrls: [],
+};
+
+@Injectable({
+ providedIn: 'root',
+})
+export class AppConfigService {
+ private configUrl = 'assets/configs/app-config.json';
+
+ public AppConfig: BehaviorSubject = new BehaviorSubject(
+ EMPTY_CONFIG,
+ );
+ public AppConfig$: Observable = this.AppConfig.asObservable();
+
+ constructor(private http: HttpClient) {}
+
+ loadConfig(): void {
+ // Need to subscribe but APP_INITIALIZE does not take type: subscription;
+ // use Promise instead
+ this.retrieveConfig().subscribe({
+ next: (res) => {
+ this.AppConfig.next(res);
+ },
+ error: (err: HttpErrorResponse) => {
+ if (err.status === 404) {
+ console.info("Couldn't load config at " + err.url);
+ }
+ },
+ });
+ }
+
+ retrieveConfig() {
+ return this.http.get(this.configUrl).pipe(
+ retry(2), // retry a failed request up to 3 times
+ );
+ }
+}
diff --git a/projects/cobbler-frontend/src/assets/configs/app-config.json b/projects/cobbler-frontend/src/assets/configs/app-config.json
new file mode 100644
index 00000000..5614c9cf
--- /dev/null
+++ b/projects/cobbler-frontend/src/assets/configs/app-config.json
@@ -0,0 +1,3 @@
+{
+ "cobblerUrls": ["http://localhost/cobbler_api"]
+}
diff --git a/projects/cobbler-frontend/src/main.ts b/projects/cobbler-frontend/src/main.ts
index 09b68d89..b76cecb3 100644
--- a/projects/cobbler-frontend/src/main.ts
+++ b/projects/cobbler-frontend/src/main.ts
@@ -10,6 +10,7 @@ import { provideRouter, withViewTransitions } from '@angular/router';
import { COBBLER_URL, cobblerUrlFactory } from 'cobbler-api';
import { routes } from './app/app-routing.module';
import { AppComponent } from './app/app.component';
+import { AppConfigService } from './app/services/app-config.service';
import { AuthGuardService } from './app/services/auth-guard.service';
import { UserService } from './app/services/user.service';
import { MAT_FORM_FIELD_DEFAULT_OPTIONS } from '@angular/material/form-field';
@@ -26,6 +27,7 @@ bootstrapApplication(AppComponent, {
},
UserService,
AuthGuardService,
+ AppConfigService,
{
provide: MAT_FORM_FIELD_DEFAULT_OPTIONS,
useValue: { appearance: 'fill', floatLabel: 'always' },