fix: trim and auto-remove trailing slash for Site URL in Admin General

requarks · Apr 24, 2020 · ec2d10c · ec2d10c
1 parent 7c59bfe
commit ec2d10c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/client/components/admin/admin-auth.vue b/client/components/admin/admin-auth.vue
@@ -204,7 +204,7 @@
                   inset
                 )
 
-        v-card.mt-4.wiki-form.animated.fadeInUp.wait-p4s
+        v-card.mt-4.wiki-form.animated.fadeInUp.wait-p4s(v-if='selectedStrategy !== `local`')
           v-toolbar(color='primary', dense, flat, dark)
             .subtitle-1 {{$t('admin:auth.configReference')}}
           v-card-text

diff --git a/server/graph/resolvers/site.js b/server/graph/resolvers/site.js
@@ -1,4 +1,5 @@
 const graphHelper = require('../../helpers/graph')
+const _ = require('lodash')
 
 /* global WIKI */
 
@@ -25,18 +26,22 @@ module.exports = {
   },
   SiteMutation: {
     async updateConfig(obj, args, context) {
+      let siteHost = _.trim(args.host)
+      if (siteHost.endsWith('/')) {
+        siteHost = siteHost.splice(0, -1)
+      }
       try {
-        WIKI.config.host = args.host
-        WIKI.config.title = args.title
-        WIKI.config.company = args.company
+        WIKI.config.host = siteHost
+        WIKI.config.title = _.trim(args.title)
+        WIKI.config.company = _.trim(args.company)
         WIKI.config.contentLicense = args.contentLicense
         WIKI.config.seo = {
           description: args.description,
           robots: args.robots,
           analyticsService: args.analyticsService,
           analyticsId: args.analyticsId
         }
-        WIKI.config.logoUrl = args.logoUrl
+        WIKI.config.logoUrl = _.trim(args.logoUrl)
         WIKI.config.features = {
           featurePageRatings: args.featurePageRatings,
           featurePageComments: args.featurePageComments,