Merge branch 'release/4.2.0' into develop

[github/Chocobozzz/PeerTube.git] / client / src / app / core / routing / server-config-resolver.service.ts

diff --git a/client/src/app/core/routing/server-config-resolver.service.ts b/client/src/app/core/routing/server-config-resolver.service.ts
index ec7d6428f55ff2949a60ca53bceedfa58e7bb795..0ce2023a0b9396013e80e53d7cc6719ff02af0e4 100644 (file)
--- a/client/src/app/core/routing/server-config-resolver.service.ts
+++ b/client/src/app/core/routing/server-config-resolver.service.ts
@@ -1,17 +1,13 @@
 import { Injectable } from '@angular/core'
 import { Resolve } from '@angular/router'
-import { ServerService } from '@app/core/server'
+import { ServerService } from '../server'
+import { ServerConfig } from '@shared/models'
 
 @Injectable()
-export class ServerConfigResolver implements Resolve<boolean> {
-  constructor (
-    private server: ServerService
-  ) {}
+export class ServerConfigResolver implements Resolve<ServerConfig> {
+  constructor (private server: ServerService) {}
 
   resolve () {
-    // FIXME: directly returning this.server.configLoaded does not seem to work
-    return new Promise<boolean>(res => {
-      return this.server.configLoaded.subscribe(() => res(true))
-    })
+    return this.server.getConfig()
   }
 }