1 files changed, 75 insertions, 159 deletions

diff --git a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts
index 4983b0425..654a076b0 100644
--- a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts
+++ b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts
@@ -1,9 +1,8 @@
 import { Component, OnInit } from '@angular/core'
 import { ConfigService } from '@app/+admin/config/shared/config.service'
-import { ConfirmService } from '@app/core'
 import { ServerService } from '@app/core/server/server.service'
 import { CustomConfigValidatorsService, FormReactive, UserValidatorsService } from '@app/shared'
-import { NotificationsService } from 'angular2-notifications'
+import { Notifier } from '@app/core'
 import { CustomConfig } from '../../../../../../shared/models/server/custom-config.model'
 import { I18n } from '@ngx-translate/i18n-polyfill'
 import { BuildFormDefaultValues, FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service'
@@ -19,17 +18,13 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit {
   resolutions: string[] = []
   transcodingThreadOptions: { label: string, value: number }[] = []
 
-  private oldCustomJavascript: string
-  private oldCustomCSS: string
-
   constructor (
     protected formValidatorService: FormValidatorService,
     private customConfigValidatorsService: CustomConfigValidatorsService,
     private userValidatorsService: UserValidatorsService,
-    private notificationsService: NotificationsService,
+    private notifier: Notifier,
     private configService: ConfigService,
     private serverService: ServerService,
-    private confirmService: ConfirmService,
     private i18n: I18n
   ) {
     super()
@@ -60,40 +55,78 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit {
   }
 
   getResolutionKey (resolution: string) {
-    return 'transcodingResolution' + resolution
+    return 'transcoding.resolutions.' + resolution
   }
 
   ngOnInit () {
-    const formGroupData = {
-      instanceName: this.customConfigValidatorsService.INSTANCE_NAME,
-      instanceShortDescription: this.customConfigValidatorsService.INSTANCE_SHORT_DESCRIPTION,
-      instanceDescription: null,
-      instanceTerms: null,
-      instanceDefaultClientRoute: null,
-      instanceDefaultNSFWPolicy: null,
-      servicesTwitterUsername: this.customConfigValidatorsService.SERVICES_TWITTER_USERNAME,
-      servicesTwitterWhitelisted: null,
-      cachePreviewsSize: this.customConfigValidatorsService.CACHE_PREVIEWS_SIZE,
-      cacheCaptionsSize: this.customConfigValidatorsService.CACHE_CAPTIONS_SIZE,
-      signupEnabled: null,
-      signupLimit: this.customConfigValidatorsService.SIGNUP_LIMIT,
-      signupRequiresEmailVerification: null,
-      importVideosHttpEnabled: null,
-      importVideosTorrentEnabled: null,
-      adminEmail: this.customConfigValidatorsService.ADMIN_EMAIL,
-      userVideoQuota: this.userValidatorsService.USER_VIDEO_QUOTA,
-      userVideoQuotaDaily: this.userValidatorsService.USER_VIDEO_QUOTA_DAILY,
-      transcodingThreads: this.customConfigValidatorsService.TRANSCODING_THREADS,
-      transcodingEnabled: null,
-      customizationJavascript: null,
-      customizationCSS: null
+    const formGroupData: { [key in keyof CustomConfig ]: any } = {
+      instance: {
+        name: this.customConfigValidatorsService.INSTANCE_NAME,
+        shortDescription: this.customConfigValidatorsService.INSTANCE_SHORT_DESCRIPTION,
+        description: null,
+        terms: null,
+        defaultClientRoute: null,
+        defaultNSFWPolicy: null,
+        customizations: {
+          javascript: null,
+          css: null
+        }
+      },
+      services: {
+        twitter: {
+          username: this.customConfigValidatorsService.SERVICES_TWITTER_USERNAME,
+          whitelisted: null
+        }
+      },
+      cache: {
+        previews: {
+          size: this.customConfigValidatorsService.CACHE_PREVIEWS_SIZE
+        },
+        captions: {
+          size: this.customConfigValidatorsService.CACHE_CAPTIONS_SIZE
+        }
+      },
+      signup: {
+        enabled: null,
+        limit: this.customConfigValidatorsService.SIGNUP_LIMIT,
+        requiresEmailVerification: null
+      },
+      import: {
+        videos: {
+          http: {
+            enabled: null
+          },
+          torrent: {
+            enabled: null
+          }
+        }
+      },
+      admin: {
+        email: this.customConfigValidatorsService.ADMIN_EMAIL
+      },
+      contactForm: {
+        enabled: null
+      },
+      user: {
+        videoQuota: this.userValidatorsService.USER_VIDEO_QUOTA,
+        videoQuotaDaily: this.userValidatorsService.USER_VIDEO_QUOTA_DAILY
+      },
+      transcoding: {
+        enabled: null,
+        threads: this.customConfigValidatorsService.TRANSCODING_THREADS,
+        allowAdditionalExtensions: null,
+        resolutions: {}
+      }
     }
 
-    const defaultValues: BuildFormDefaultValues = {}
+    const defaultValues = {
+      transcoding: {
+        resolutions: {}
+      }
+    }
     for (const resolution of this.resolutions) {
-      const key = this.getResolutionKey(resolution)
-      defaultValues[key] = 'false'
-      formGroupData[key] = null
+      defaultValues.transcoding.resolutions[resolution] = 'false'
+      formGroupData.transcoding.resolutions[resolution] = null
     }
 
     this.buildForm(formGroupData)
@@ -103,112 +136,25 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit {
         res => {
           this.customConfig = res
 
-          this.oldCustomCSS = this.customConfig.instance.customizations.css
-          this.oldCustomJavascript = this.customConfig.instance.customizations.javascript
-
           this.updateForm()
           // Force form validation
           this.forceCheck()
         },
 
-        err => this.notificationsService.error(this.i18n('Error'), err.message)
+        err => this.notifier.error(err.message)
       )
   }
 
   isTranscodingEnabled () {
-    return this.form.value['transcodingEnabled'] === true
+    return this.form.value['transcoding']['enabled'] === true
   }
 
   isSignupEnabled () {
-    return this.form.value['signupEnabled'] === true
+    return this.form.value['signup']['enabled'] === true
   }
 
   async formValidated () {
-    const newCustomizationJavascript = this.form.value['customizationJavascript']
-    const newCustomizationCSS = this.form.value['customizationCSS']
-
-    const customizations = []
-    if (newCustomizationJavascript && newCustomizationJavascript !== this.oldCustomJavascript) customizations.push('JavaScript')
-    if (newCustomizationCSS && newCustomizationCSS !== this.oldCustomCSS) customizations.push('CSS')
-
-    if (customizations.length !== 0) {
-      const customizationsText = customizations.join('/')
-
-      // FIXME: i18n service does not support string concatenation
-      const message = this.i18n('You set custom {{customizationsText}}. ', { customizationsText }) +
-        this.i18n('This could lead to security issues or bugs if you do not understand it. ') +
-        this.i18n('Are you sure you want to update the configuration?')
-
-      const label = this.i18n('Please type') + ` "I understand the ${customizationsText} I set" ` + this.i18n('to confirm.')
-      const expectedInputValue = `I understand the ${customizationsText} I set`
-
-      const confirmRes = await this.confirmService.confirmWithInput(message, label, expectedInputValue)
-      if (confirmRes === false) return
-    }
-
-    const data: CustomConfig = {
-      instance: {
-        name: this.form.value['instanceName'],
-        shortDescription: this.form.value['instanceShortDescription'],
-        description: this.form.value['instanceDescription'],
-        terms: this.form.value['instanceTerms'],
-        defaultClientRoute: this.form.value['instanceDefaultClientRoute'],
-        defaultNSFWPolicy: this.form.value['instanceDefaultNSFWPolicy'],
-        customizations: {
-          javascript: this.form.value['customizationJavascript'],
-          css: this.form.value['customizationCSS']
-        }
-      },
-      services: {
-        twitter: {
-          username: this.form.value['servicesTwitterUsername'],
-          whitelisted: this.form.value['servicesTwitterWhitelisted']
-        }
-      },
-      cache: {
-        previews: {
-          size: this.form.value['cachePreviewsSize']
-        },
-        captions: {
-          size: this.form.value['cacheCaptionsSize']
-        }
-      },
-      signup: {
-        enabled: this.form.value['signupEnabled'],
-        limit: this.form.value['signupLimit'],
-        requiresEmailVerification: this.form.value['signupRequiresEmailVerification']
-      },
-      admin: {
-        email: this.form.value['adminEmail']
-      },
-      user: {
-        videoQuota: this.form.value['userVideoQuota'],
-        videoQuotaDaily: this.form.value['userVideoQuotaDaily']
-      },
-      transcoding: {
-        enabled: this.form.value['transcodingEnabled'],
-        threads: this.form.value['transcodingThreads'],
-        resolutions: {
-          '240p': this.form.value[this.getResolutionKey('240p')],
-          '360p': this.form.value[this.getResolutionKey('360p')],
-          '480p': this.form.value[this.getResolutionKey('480p')],
-          '720p': this.form.value[this.getResolutionKey('720p')],
-          '1080p': this.form.value[this.getResolutionKey('1080p')]
-        }
-      },
-      import: {
-        videos: {
-          http: {
-            enabled: this.form.value['importVideosHttpEnabled']
-          },
-          torrent: {
-            enabled: this.form.value['importVideosTorrentEnabled']
-          }
-        }
-      }
-    }
-
-    this.configService.updateCustomConfig(data)
+    this.configService.updateCustomConfig(this.form.value)
       .subscribe(
         res => {
           this.customConfig = res
@@ -218,45 +164,15 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit {
 
           this.updateForm()
 
-          this.notificationsService.success(this.i18n('Success'), this.i18n('Configuration updated.'))
+          this.notifier.success(this.i18n('Configuration updated.'))
         },
 
-        err => this.notificationsService.error(this.i18n('Error'), err.message)
+        err => this.notifier.error(err.message)
       )
   }
 
   private updateForm () {
-    const data = {
-      instanceName: this.customConfig.instance.name,
-      instanceShortDescription: this.customConfig.instance.shortDescription,
-      instanceDescription: this.customConfig.instance.description,
-      instanceTerms: this.customConfig.instance.terms,
-      instanceDefaultClientRoute: this.customConfig.instance.defaultClientRoute,
-      instanceDefaultNSFWPolicy: this.customConfig.instance.defaultNSFWPolicy,
-      servicesTwitterUsername: this.customConfig.services.twitter.username,
-      servicesTwitterWhitelisted: this.customConfig.services.twitter.whitelisted,
-      cachePreviewsSize: this.customConfig.cache.previews.size,
-      cacheCaptionsSize: this.customConfig.cache.captions.size,
-      signupEnabled: this.customConfig.signup.enabled,
-      signupLimit: this.customConfig.signup.limit,
-      signupRequiresEmailVerification: this.customConfig.signup.requiresEmailVerification,
-      adminEmail: this.customConfig.admin.email,
-      userVideoQuota: this.customConfig.user.videoQuota,
-      userVideoQuotaDaily: this.customConfig.user.videoQuotaDaily,
-      transcodingThreads: this.customConfig.transcoding.threads,
-      transcodingEnabled: this.customConfig.transcoding.enabled,
-      customizationJavascript: this.customConfig.instance.customizations.javascript,
-      customizationCSS: this.customConfig.instance.customizations.css,
-      importVideosHttpEnabled: this.customConfig.import.videos.http.enabled,
-      importVideosTorrentEnabled: this.customConfig.import.videos.torrent.enabled
-    }
-
-    for (const resolution of this.resolutions) {
-      const key = this.getResolutionKey(resolution)
-      data[key] = this.customConfig.transcoding.resolutions[resolution]
-    }
-
-    this.form.patchValue(data)
+    this.form.patchValue(this.customConfig)
   }
 
 }