X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fapp.module.ts;h=7e4fac730fee05aec961e4d85a3e8a835fe620c5;hb=2c8380a46f34631e705b1564938343cacfa4b0bc;hp=dfdccbe69792a76efd59261111950e4ec6a85dba;hpb=fc21ef5c62d845576a916414468b3a57370a57b2;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/app.module.ts b/client/src/app/app.module.ts
index dfdccbe69..7e4fac730 100644
--- a/client/src/app/app.module.ts
+++ b/client/src/app/app.module.ts
@@ -8,7 +8,7 @@ import { ServiceWorkerModule } from '@angular/service-worker'
 import localeOc from '@app/helpers/locales/oc'
 import { AppRoutingModule } from './app-routing.module'
 import { AppComponent } from './app.component'
-import { CoreModule, PluginService, ServerService } from './core'
+import { CoreModule, PluginService, RedirectService, ServerService } from './core'
 import { EmptyComponent } from './empty.component'
 import { HeaderComponent, SearchTypeaheadComponent, SuggestionComponent } from './header'
 import { HighlightPipe } from './header/highlight.pipe'
@@ -17,7 +17,8 @@ import { ConfirmComponent } from './modal/confirm.component'
 import { CustomModalComponent } from './modal/custom-modal.component'
 import { InstanceConfigWarningModalComponent } from './modal/instance-config-warning-modal.component'
 import { QuickSettingsModalComponent } from './modal/quick-settings-modal.component'
-import { WelcomeModalComponent } from './modal/welcome-modal.component'
+import { AdminWelcomeModalComponent } from './modal/admin-welcome-modal.component'
+import { AccountSetupWarningModalComponent } from './modal/account-setup-warning-modal.component'
 import { SharedActorImageModule } from './shared/shared-actor-image/shared-actor-image.module'
 import { SharedFormModule } from './shared/shared-forms'
 import { SharedGlobalIconModule } from './shared/shared-icons'
@@ -27,13 +28,17 @@ import { SharedUserInterfaceSettingsModule } from './shared/shared-user-settings
 
 registerLocaleData(localeOc, 'oc')
 
-export function loadConfigFactory (server: ServerService, pluginService: PluginService) {
+export function loadConfigFactory (server: ServerService, pluginService: PluginService, redirectService: RedirectService) {
+  const initializeServices = () => {
+    redirectService.init()
+    pluginService.initializePlugins()
+  }
+
   return () => {
     const result = server.loadHTMLConfig()
+    if (result) return result.pipe(tap(() => initializeServices()))
 
-    if (result) return result.pipe(tap(() => pluginService.initializePlugins()))
-
-    return pluginService.initializePlugins()
+    initializeServices()
   }
 }
 
@@ -53,8 +58,9 @@ export function loadConfigFactory (server: ServerService, pluginService: PluginS
     SuggestionComponent,
     HighlightPipe,
 
+    AccountSetupWarningModalComponent,
     CustomModalComponent,
-    WelcomeModalComponent,
+    AdminWelcomeModalComponent,
     InstanceConfigWarningModalComponent,
     ConfirmComponent
   ],
@@ -82,7 +88,7 @@ export function loadConfigFactory (server: ServerService, pluginService: PluginS
     {
       provide: APP_INITIALIZER,
       useFactory: loadConfigFactory,
-      deps: [ ServerService, PluginService ],
+      deps: [ ServerService, PluginService, RedirectService ],
       multi: true
     }
   ]