Wait config before loading login/signup

1 files changed, 17 insertions, 0 deletions

diff --git a/client/src/app/core/routing/server-config-resolver.service.ts b/client/src/app/core/routing/server-config-resolver.service.ts
new file mode 100644
index 000000000..ec7d6428f
--- /dev/null
+++ b/client/src/app/core/routing/server-config-resolver.service.ts
@@ -0,0 +1,17 @@
+import { Injectable } from '@angular/core'
+import { Resolve } from '@angular/router'
+import { ServerService } from '@app/core/server'
+
+@Injectable()
+export class ServerConfigResolver implements Resolve<boolean> {
+  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))
+    })
+  }
+}