From b2931471c0796dc8989d1b5779bce7c17887dadd Mon Sep 17 00:00:00 2001
From: NGPixel <github@ngpixel.com>
Date: Sat, 25 Apr 2020 14:04:14 -0400
Subject: [PATCH] fix: remove ssh port param for git module

---
 client/components/admin/admin-utilities-importv1.vue | 12 +-----------
 server/modules/storage/git/definition.yml            |  6 ------
 server/modules/storage/git/storage.js                |  5 +----
 3 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/client/components/admin/admin-utilities-importv1.vue b/client/components/admin/admin-utilities-importv1.vue
index 590816cf..16c582c6 100644
--- a/client/components/admin/admin-utilities-importv1.vue
+++ b/client/components/admin/admin-utilities-importv1.vue
@@ -44,7 +44,7 @@
                 hide-details
                 color='primary'
               )
-            v-col(:cols='gitAuthMode === `ssh` ? 6 : 8')
+            v-col(cols='8')
               v-text-field(
                 outlined
                 label='Repository URL'
@@ -52,14 +52,6 @@
                 hide-details
                 v-model='gitRepoUrl'
               )
-            v-col(v-if='gitAuthMode === `ssh`', cols='2')
-              v-text-field(
-                label='Port'
-                placeholder='e.g. 22'
-                v-model='gitRepoPort'
-                outlined
-                hide-details
-              )
             v-col(cols='4')
               v-text-field(
                 label='Branch'
@@ -304,7 +296,6 @@ export default {
       ],
       gitVerifySSL: true,
       gitRepoUrl: '',
-      gitRepoPort: 22,
       gitRepoBranch: 'master',
       gitPrivKey: '',
       gitUsername: '',
@@ -396,7 +387,6 @@ export default {
                     { key: 'authType', value: { value: this.gitAuthMode } },
                     { key: 'repoUrl', value: { value: this.gitRepoUrl } },
                     { key: 'branch', value: { value: this.gitRepoBranch } },
-                    { key: 'sshPort', value: { value: this.gitRepoPort } },
                     { key: 'sshPrivateKeyMode', value: { value: 'contents' } },
                     { key: 'sshPrivateKeyPath', value: { value: '' } },
                     { key: 'sshPrivateKeyContent', value: { value: this.gitPrivKey } },
diff --git a/server/modules/storage/git/definition.yml b/server/modules/storage/git/definition.yml
index 6eb9f14b..63c095a2 100644
--- a/server/modules/storage/git/definition.yml
+++ b/server/modules/storage/git/definition.yml
@@ -93,12 +93,6 @@ props:
     default: ''
     hint: Optional - Absolute path to the Git binary, when not available in PATH. Leave empty to use the default PATH location (recommended).
     order: 50
-  sshPort:
-    type: Number
-    title: SSH Port
-    default: 22
-    hint: Optional - SSH Authentication Only - Allows overriding ssh default port (22).
-    order: 60
 actions:
   - handler: syncUntracked
     label: Add Untracked Changes
diff --git a/server/modules/storage/git/storage.js b/server/modules/storage/git/storage.js
index d0be00bb..a28f133d 100644
--- a/server/modules/storage/git/storage.js
+++ b/server/modules/storage/git/storage.js
@@ -77,10 +77,7 @@ module.exports = {
             throw err
           }
         }
-        if (!this.config.sshPort || (_.isString(this.config.sshPort) && _.isEmpty(this.config.sshPort.length)) || (_.isSafeInteger(this.config.sshPort) && this.config.sshPort <= 0)) {
-          this.config.sshPort = 22
-        }
-        await this.git.addConfig('core.sshCommand', `ssh -i "${this.config.sshPrivateKeyPath}" -o StrictHostKeyChecking=no -p ${this.config.sshPort}`)
+        await this.git.addConfig('core.sshCommand', `ssh -i "${this.config.sshPrivateKeyPath}" -o StrictHostKeyChecking=no`)
         WIKI.logger.info('(STORAGE/GIT) Adding origin remote via SSH...')
         await this.git.addRemote('origin', this.config.repoUrl)
         break