From 0ad5a762212ac60c6d1cd44e5171dad518ccb4a9 Mon Sep 17 00:00:00 2001
From: Usman Nasir <usman@cyberpersons.com>
Date: Sat, 7 Mar 2020 23:25:58 +0500
Subject: [PATCH] fetch git branches

---
 .../websiteFunctions/websiteFunctions.js      |  2 +
 .../templates/websiteFunctions/manageGIT.html | 53 +++++++++++++++----
 .../templates/websiteFunctions/setupGit.html  | 10 ++--
 websiteFunctions/website.py                   | 38 +++++++++++--
 4 files changed, 85 insertions(+), 18 deletions(-)

diff --git a/websiteFunctions/static/websiteFunctions/websiteFunctions.js b/websiteFunctions/static/websiteFunctions/websiteFunctions.js
index 9db2d27e9..c2d8ad3a1 100755
--- a/websiteFunctions/static/websiteFunctions/websiteFunctions.js
+++ b/websiteFunctions/static/websiteFunctions/websiteFunctions.js
@@ -5823,6 +5823,8 @@ app.controller('manageGIT', function ($scope, $http, $timeout, $window) {
                 if (response.data.repo === 1) {
                     $scope.gitTracking = true;
                     $scope.gitEnable = false;
+                    $scope.branches = response.data.finalBranches;
+                    $scope.deploymentKey = response.data.deploymentKey;
                 } else {
                     $scope.gitTracking = false;
                     $scope.gitEnable = true;
diff --git a/websiteFunctions/templates/websiteFunctions/manageGIT.html b/websiteFunctions/templates/websiteFunctions/manageGIT.html
index c4220583f..e83db9cc8 100755
--- a/websiteFunctions/templates/websiteFunctions/manageGIT.html
+++ b/websiteFunctions/templates/websiteFunctions/manageGIT.html
@@ -33,28 +33,61 @@
                             </div>
                         </div>
                     </form>
-                    <p style="margin: 2%" ng-hide="gitTracking">{% trans "This folder does not have Git tracking, click below to initiate a repository and start tracking files." %}</p>
-                    <button ng-hide="gitTracking"  style="margin-left: 2%" type="button" class="btn btn-primary"
+                    <p style="margin: 2%"
+                       ng-hide="gitTracking">{% trans "This folder does not have Git tracking, click below to initiate a repository and start tracking files." %}</p>
+                    <button ng-hide="gitTracking" style="margin-left: 2%" type="button" class="btn btn-primary"
                             ng-click="initRepo()">
                         Init Repo
                     </button>
+
+                    <form action="/" class="form-horizontal bordered-row">
+
+                        <div class="form-group">
+
+                            <div class="col-sm-12">
+
+                                <table class="table">
+                                    <thead>
+                                    <tr>
+                                        <th>{% trans "Deployment Key" %}</th>
+                                    </tr>
+                                    </thead>
+                                    <tbody>
+                                    <tr>
+                                        <td>
+                                            <div class="form-group">
+                                                <div class="col-sm-12">
+                                                    <textarea rows="5"
+                                                              class="form-control">{$ deploymentKey $}</textarea>
+                                                </div>
+                                            </div>
+                                        </td>
+                                    </tr>
+                                    </tbody>
+                                </table>
+                            </div>
+                        </div>
+
+                    </form>
+
                     <table ng-hide="gitEnable" style="margin-top: 2%" class="table">
                         <thead>
                         <tr>
-                            <th>Folder</th>
-                            <th>Remote</th>
                             <th>Branch</th>
+                            <th>Remote</th>
                             <th>Status</th>
                             <th>Manage</th>
                         </tr>
                         </thead>
                         <tbody>
-                        <tr ng-repeat="record in records | filter:logSearch">
-                            <td ng-bind="record.domain"></td>
-                            <td ng-bind="record.ipAddress"></td>
-                            <td ng-bind="record.time"></td>
-                            <td ng-bind="record.resource"></td>
-                            <td ng-bind="record.size"></td>
+                        <tr>
+                            <td>
+                                <select ng-change="fetchFolderDetails()" ng-model="branchName" class="form-control">
+                                    <option ng-repeat="branch in branches track by $index">{$ branch $}</option>
+                                </select></td>
+                            <td></td>
+                            <td></td>
+                            <td></td>
                         </tr>
                         </tbody>
                     </table>
diff --git a/websiteFunctions/templates/websiteFunctions/setupGit.html b/websiteFunctions/templates/websiteFunctions/setupGit.html
index 56075ba1e..55edf971a 100755
--- a/websiteFunctions/templates/websiteFunctions/setupGit.html
+++ b/websiteFunctions/templates/websiteFunctions/setupGit.html
@@ -147,13 +147,13 @@
 
                         <div class="tab-pane fade" id="tab-example-3">
 
-                            <form  action="/" class="form-horizontal bordered-row">
+                            <form action="/" class="form-horizontal bordered-row">
 
                                 <!------ List of records --------------->
 
                                 <div class="form-group">
 
-                                    <div  class="col-sm-12">
+                                    <div class="col-sm-12">
 
                                         <table class="table">
                                             <thead>
@@ -166,7 +166,8 @@
                                                 <td>
                                                     <div class="form-group">
                                                         <div class="col-sm-12">
-                                                            <textarea rows="5" class="form-control">{{ deploymentKey }}</textarea>
+                                                            <textarea rows="5"
+                                                                      class="form-control">{{ deploymentKey }}</textarea>
                                                         </div>
                                                     </div>
                                                 </td>
@@ -177,8 +178,7 @@
                                 </div>
 
 
-
-                            <!------ List of records --------------->
+                                <!------ List of records --------------->
 
                             </form>
 
diff --git a/websiteFunctions/website.py b/websiteFunctions/website.py
index e7302a339..779a7717f 100755
--- a/websiteFunctions/website.py
+++ b/websiteFunctions/website.py
@@ -2070,7 +2070,7 @@ StrictHostKeyChecking no
                 command = 'mv %s /home/%s/.ssh/config' % (path, self.domain)
                 ProcessUtilities.executioner(command)
 
-                command = 'sudo chown %s:%s /home/%s/.ssh/config' % (website.externalApp, website.externalApp, self.domain)
+                command = 'chown %s:%s /home/%s/.ssh/config' % (website.externalApp, website.externalApp, self.domain)
                 ProcessUtilities.executioner(command)
 
                 command = 'cat /home/%s/.ssh/%s.pub' % (self.domain, website.externalApp)
@@ -2934,8 +2934,9 @@ StrictHostKeyChecking no
                 return ACLManager.loadErrorJson()
 
 
-            gitPath = '%s/.git' % (self.folder)
+            website = Websites.objects.get(domain=self.domain)
 
+            gitPath = '%s/.git' % (self.folder)
             command = 'ls -la %s' % (gitPath)
 
             if ProcessUtilities.outputExecutioner(command).find('No such file or directory') > -1:
@@ -2943,7 +2944,38 @@ StrictHostKeyChecking no
                 json_data = json.dumps(data_ret)
                 return HttpResponse(json_data)
             else:
-                data_ret = {'status': 1, 'repo': 1}
+
+                ## Find git branches
+
+                command = 'git --git-dir=%s/.git branch' % (self.folder)
+                branches = ProcessUtilities.outputExecutioner(command).split('\n')
+
+                ## Fetch key
+
+                command = 'cat /home/%s/.ssh/config' % (self.domain)
+
+                if ProcessUtilities.outputExecutioner(command).find('No such file or directory') == -1:
+
+                    configContent = """Host github.com
+IdentityFile /home/%s/.ssh/%s
+StrictHostKeyChecking no
+""" % (self.domain, website.externalApp)
+
+                    path = "/home/cyberpanel/config"
+                    writeToFile = open(path, 'w')
+                    writeToFile.writelines(configContent)
+                    writeToFile.close()
+
+                    command = 'mv %s /home/%s/.ssh/config' % (path, self.domain)
+                    ProcessUtilities.executioner(command)
+
+                    command = 'chown %s:%s /home/%s/.ssh/config' % (website.externalApp, website.externalApp, self.domain)
+                    ProcessUtilities.executioner(command)
+
+                command = 'cat /home/%s/.ssh/%s.pub' % (self.domain, website.externalApp)
+                deploymentKey = ProcessUtilities.outputExecutioner(command, website.externalApp)
+
+                data_ret = {'status': 1, 'repo': 1, 'finalBranches': branches, 'deploymentKey': deploymentKey}
                 json_data = json.dumps(data_ret)
                 return HttpResponse(json_data)