Explorar el Código

fix: handle git basic auth URl format (#814)

Nick hace 6 años
padre
commit
438f1485fa
Se han modificado 1 ficheros con 8 adiciones y 2 borrados
  1. 8 2
      server/modules/storage/git/storage.js

+ 8 - 2
server/modules/storage/git/storage.js

@@ -109,8 +109,14 @@ module.exports = {
         await this.git.addRemote('origin', this.config.repoUrl)
         await this.git.addRemote('origin', this.config.repoUrl)
         break
         break
       default:
       default:
-        WIKI.logger.info('(STORAGE/GIT) Adding origin remote via HTTPS...')
-        await this.git.addRemote('origin', `https://${this.config.basicUsername}:${this.config.basicPassword}@${this.config.repoUrl}`)
+        WIKI.logger.info('(STORAGE/GIT) Adding origin remote via HTTP/S...')
+        let originUrl = ''
+        if (_.startsWith(this.config.repoUrl, 'http')) {
+          originUrl = originUrl.replace('://', `://${this.config.basicUsername}:${this.config.basicPassword}@`)
+        } else {
+          originUrl = `https://${this.config.basicUsername}:${this.config.basicPassword}@${this.config.repoUrl}`
+        }
+        await this.git.addRemote('origin', )
         break
         break
     }
     }