X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fcore%2Fserver%2Fserver.service.ts;h=fdfbe4c0260b68d17ca6da0aa9869a4416c9c0e6;hb=cdd8f7790c759664fe4d0962efa550cf1a8e37eb;hp=c0e1f08bb1d0ef6c71dcd2edfd5cc1708d03c960;hpb=9677fca772349248925da6c5f34f600e9a2abbe6;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/core/server/server.service.ts b/client/src/app/core/server/server.service.ts
index c0e1f08bb..fdfbe4c02 100644
--- a/client/src/app/core/server/server.service.ts
+++ b/client/src/app/core/server/server.service.ts
@@ -21,7 +21,7 @@ export class ServerService {
 
   private static CONFIG_LOCAL_STORAGE_KEY = 'server-config'
 
-  configReloaded = new Subject<void>()
+  configReloaded = new Subject<ServerConfig>()
 
   private localeObservable: Observable<any>
   private videoLicensesObservable: Observable<VideoConstant<number>[]>
@@ -54,7 +54,9 @@ export class ServerService {
       }
     },
     plugin: {
-      registered: []
+      registered: [],
+      registeredExternalAuths: [],
+      registeredIdAndPassAuths: []
     },
     theme: {
       registered: [],
@@ -137,6 +139,12 @@ export class ServerService {
           indexUrl: 'https://instances.joinpeertube.org'
         }
       }
+    },
+    broadcastMessage: {
+      enabled: false,
+      message: '',
+      level: 'info',
+      dismissable: false
     }
   }
 
@@ -160,6 +168,11 @@ export class ServerService {
   resetConfig () {
     this.configLoaded = false
     this.configReset = true
+
+    // Notify config update
+    this.getConfig().subscribe(() => {
+      // empty, to fire a reset config event
+    })
   }
 
   getConfig () {
@@ -168,11 +181,14 @@ export class ServerService {
     if (!this.configObservable) {
       this.configObservable = this.http.get<ServerConfig>(ServerService.BASE_CONFIG_URL)
                                   .pipe(
-                                    tap(this.saveConfigLocally),
-                                    tap(() => this.configLoaded = true),
-                                    tap(() => {
+                                    tap(config => this.saveConfigLocally(config)),
+                                    tap(config => {
+                                      this.config = config
+                                      this.configLoaded = true
+                                    }),
+                                    tap(config => {
                                       if (this.configReset) {
-                                        this.configReloaded.next()
+                                        this.configReloaded.next(config)
                                         this.configReset = false
                                       }
                                     }),
@@ -260,17 +276,19 @@ export class ServerService {
                               .pipe(map(data => ({ data, translations })))
                  }),
                  map(({ data, translations }) => {
-                   const hashToPopulate: VideoConstant<T>[] = []
-
-                   Object.keys(data)
-                         .forEach(dataKey => {
-                           const label = data[ dataKey ]
-
-                           hashToPopulate.push({
-                             id: (attributeName === 'languages' ? dataKey : parseInt(dataKey, 10)) as T,
-                             label: peertubeTranslate(label, translations)
-                           })
-                         })
+                   const hashToPopulate: VideoConstant<T>[] = Object.keys(data)
+                                                                    .map(dataKey => {
+                                                                      const label = data[ dataKey ]
+
+                                                                      const id = attributeName === 'languages'
+                                                                        ? dataKey as T
+                                                                        : parseInt(dataKey, 10) as T
+
+                                                                      return {
+                                                                        id,
+                                                                        label: peertubeTranslate(label, translations)
+                                                                      }
+                                                                    })
 
                    if (sort === true) sortBy(hashToPopulate, 'label')