Move account level web hook settings to account settings

src/main/resources/update/gitbucket-core_4.11.xml

@@ -11,22 +11,4 @@
 
   <addPrimaryKey constraintName="IDX_DEPLOY_KEY_PK" tableName="DEPLOY_KEY" columnNames="USER_NAME, REPOSITORY_NAME, DEPLOY_KEY_ID"/>
   <addForeignKeyConstraint constraintName="IDX_DEPLOY_KEY_FK0" baseTableName="DEPLOY_KEY" baseColumnNames="USER_NAME, REPOSITORY_NAME" referencedTableName="REPOSITORY" referencedColumnNames="USER_NAME, REPOSITORY_NAME"/>
-
-  <createTable tableName="ACCOUNT_WEB_HOOK">
-    <column name="USER_NAME" type="varchar(100)" nullable="false"/>
-    <column name="URL" type="varchar(200)" nullable="false"/>
-    <column name="TOKEN" type="varchar(100)" nullable="true"/>
-    <column name="CTYPE" type="varchar(10)" nullable="true"/>
-  </createTable>
-
-  <addPrimaryKey constraintName="IDX_ACCOUNT_WEB_HOOK_PK" tableName="ACCOUNT_WEB_HOOK" columnNames="USER_NAME, URL"/>
-  <addForeignKeyConstraint constraintName="IDX_ACCOUNT_WEB_HOOK_FK0" baseTableName="ACCOUNT_WEB_HOOK" baseColumnNames="USER_NAME" referencedTableName="ACCOUNT" referencedColumnNames="USER_NAME"/>
-
-  <createTable tableName="ACCOUNT_WEB_HOOK_EVENT">
-    <column name="USER_NAME" type="varchar(100)" nullable="false"/>
-    <column name="URL" type="varchar(200)" nullable="false"/>
-    <column name="EVENT" type="varchar(30)" nullable="false"/>
-  </createTable>
-
-
 </changeSet>

src/main/resources/update/gitbucket-core_4.14.xml

@@ -19,4 +19,20 @@
   </addColumn>
 
   <addForeignKeyConstraint constraintName="IDX_ISSUE_FK3" baseTableName="ISSUE" baseColumnNames="PRIORITY_ID" referencedTableName="PRIORITY" referencedColumnNames="PRIORITY_ID"/>
+
+  <createTable tableName="ACCOUNT_WEB_HOOK">
+    <column name="USER_NAME" type="varchar(100)" nullable="false"/>
+    <column name="URL" type="varchar(200)" nullable="false"/>
+    <column name="TOKEN" type="varchar(100)" nullable="true"/>
+    <column name="CTYPE" type="varchar(10)" nullable="true"/>
+  </createTable>
+
+  <addPrimaryKey constraintName="IDX_ACCOUNT_WEB_HOOK_PK" tableName="ACCOUNT_WEB_HOOK" columnNames="USER_NAME, URL"/>
+  <addForeignKeyConstraint constraintName="IDX_ACCOUNT_WEB_HOOK_FK0" baseTableName="ACCOUNT_WEB_HOOK" baseColumnNames="USER_NAME" referencedTableName="ACCOUNT" referencedColumnNames="USER_NAME"/>
+
+  <createTable tableName="ACCOUNT_WEB_HOOK_EVENT">
+    <column name="USER_NAME" type="varchar(100)" nullable="false"/>
+    <column name="URL" type="varchar(200)" nullable="false"/>
+    <column name="EVENT" type="varchar(30)" nullable="false"/>
+  </createTable>
 </changeSet>

src/main/scala/gitbucket/core/controller/AccountController.scala

@@ -170,13 +170,6 @@ trait AccountControllerBase extends AccountManagementControllerBase {
             context.loginAccount.exists(x => members.exists { member => member.userName == x.userName && member.isManager }))
         }
 
-        // Webhooks
-        case "webhooks" =>
-          gitbucket.core.account.html.webhook(account,
-            if(account.isGroupAccount) Nil else getGroupsByUserName(userName),
-            getAccountWebHooks(account.userName)
-          )
-
         // Repositories
         case _ => {
           val members = getGroupMembers(account.userName)
@@ -321,6 +314,16 @@ trait AccountControllerBase extends AccountManagementControllerBase {
     redirect(s"/${userName}/_application")
   })
 
+  get("/:userName/_hooks")(oneselfOnly {
+    val userName = params("userName")
+    getAccountByUserName(userName).map { account =>
+      gitbucket.core.account.html.webhook(account,
+        if(account.isGroupAccount) Nil else getGroupsByUserName(userName),
+        getAccountWebHooks(account.userName)
+      )
+    } getOrElse NotFound()
+  })
+
   /**
    * Display the account web hook edit page.
    */
@@ -329,7 +332,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
     getAccountByUserName(userName).map { account =>
       val webhook = AccountWebHook(userName, "", WebHookContentType.FORM, None)
       html.edithooks(webhook, Set(WebHook.Push), account, if (account.isGroupAccount) Nil else getGroupsByUserName(userName), flash.get("info"), true)
-    }
+    } getOrElse NotFound()
   })
 
   /**
@@ -339,7 +342,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
     val userName = params("userName")
     addAccountWebHook(userName, form.url, form.events, form.ctype, form.token)
     flash += "info" -> s"Webhook ${form.url} created"
-    redirect(s"/${userName}?tab=webhooks")
+    redirect(s"/${userName}/_hooks")
   })
 
   /**
@@ -349,7 +352,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
     val userName = params("userName")
     deleteAccountWebHook(userName, params("url"))
     flash += "info" -> s"Webhook ${params("url")} deleted"
-    redirect(s"/${userName}?tab=webhooks")
+    redirect(s"/${userName}/_hooks")
   })
 
   /**
@@ -371,14 +374,14 @@ trait AccountControllerBase extends AccountManagementControllerBase {
     val userName = params("userName")
     updateAccountWebHook(userName, form.url, form.events, form.ctype, form.token)
     flash += "info" -> s"webhook ${form.url} updated"
-    redirect(s"/${userName}?tab=webhooks")
+    redirect(s"/${userName}/_hooks")
   })
 
   /**
    * Send the test request to registered account web hook URLs.
    */
   ajaxPost("/:userName/_hooks/test")(oneselfOnly {
-    import scala.collection.JavaConverters._
+    // TODO copied & pasted??
     import scala.concurrent.duration._
     import scala.concurrent._
     import scala.util.control.NonFatal
@@ -413,7 +416,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
         "headers" -> _headers(req.getAllHeaders),
         "payload" -> json
       )).recover(toErrorMap), 20 seconds),
-      "responce" -> Await.result(resFuture.map(res => Map(
+      "response" -> Await.result(resFuture.map(res => Map(
         "status"  -> res.getStatusLine(),
         "body"    -> EntityUtils.toString(res.getEntity()),
         "headers" -> _headers(res.getAllHeaders())

src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala

@@ -297,7 +297,7 @@ trait RepositorySettingsControllerBase extends ControllerBase {
           "headers" -> _headers(req.getAllHeaders),
           "payload" -> json
         )).recover(toErrorMap), 20 seconds),
-        "responce" -> Await.result(resFuture.map(res => Map(
+        "response" -> Await.result(resFuture.map(res => Map(
           "status"  -> res.getStatusLine(),
           "body"    -> EntityUtils.toString(res.getEntity()),
           "headers" -> _headers(res.getAllHeaders())

src/main/twirl/gitbucket/core/account/edithooks.scala.html

@@ -1,17 +1,18 @@
 @(webHook: gitbucket.core.model.AccountWebHook,
-events: Set[gitbucket.core.model.WebHook.Event],
+  events: Set[gitbucket.core.model.WebHook.Event],
-account: gitbucket.core.model.Account,
+  account: gitbucket.core.model.Account,
-groupNames: List[String],
+  groupNames: List[String],
-info: Option[Any],
+  info: Option[Any],
-create: Boolean)(implicit context: gitbucket.core.controller.Context)
+  create: Boolean)(implicit context: gitbucket.core.controller.Context)
 @import gitbucket.core.view.helpers
 @import gitbucket.core.model.WebHook._
 @import gitbucket.core.model.WebHookContentType
 @check(name: String, event: Event) = {
-name="@(name).@event.name" value="on" @if(events(event)){checked}
+  name="@(name).@event.name" value="on" @if(events(event)){checked}
 }
-@gitbucket.core.account.html.main(account, groupNames, "webhooks"){
+@gitbucket.core.html.main("Service Hooks"){
-<div class="panel panel-default">
+  @gitbucket.core.account.html.menu("hooks", context.settings.ssh){
+    <div class="panel panel-default">
       <div class="panel-heading strong">Webhook / Manage webhook</div>
       <div class="panel-body">
         <form method="POST" validate="true">
@@ -53,7 +54,9 @@ name="@(name).@event.name" value="on" @if(events(event)){checked}
           <label class="checkbox"><input type="checkbox" @check("events",Deployment) />Deployment <small class="help-block">Repository deployed. </small> </label>
           <label class="checkbox"><input type="checkbox" @check("events",DeploymentStatus) />Deployment status <small class="help-block">Deployment status updated from the API. </small> </label>
           <label class="checkbox"><input type="checkbox" @check("events",Fork) />Fork <small class="help-block">Repository forked. </small> </label>
-      <label class="checkbox"><input type="checkbox" @check("events",Gollum) />Gollum <small class="help-block">Wiki page updated. </small> </label>
+          -->
+          <label class="checkbox"><input type="checkbox" @check("events",Gollum) />Gollum <span class="help-block normal">Wiki page updated. </span> </label>
+          <!--
           <label class="checkbox"><input type="checkbox" @check("events",Member) />Member <small class="help-block">Collaborator added to a non-organization repository. </small> </label>
           <label class="checkbox"><input type="checkbox" @check("events",PageBuild) />Page build <small class="help-block">Pages site built. </small> </label>
           <label class="checkbox"><input type="checkbox" @check("events",Public) />Public <small class="help-block">Repository changes from private to public. </small> </label>
@@ -79,8 +82,8 @@ name="@(name).@event.name" value="on" @if(events(event)){checked}
           </div>
         </form>
       </div>
-</div>
+    </div>
-<div class="modal" id="test-report-modal" role="dialog" tabindex="-1">
+    <div class="modal" id="test-report-modal" role="dialog" tabindex="-1">
       <div class="modal-dialog">
         <div class="modal-content">
           <div class="modal-header">
@@ -122,7 +125,7 @@ name="@(name).@event.name" value="on" @if(events(event)){checked}
           </div>
         </div><!-- /.modal-content -->
       </div><!-- /.modal-dialog -->
-</div><!-- /.modal -->
+    </div><!-- /.modal -->
 <script>
 $(function(){
   $('#test-report-tab a').click(function (e) {
@@ -154,8 +157,8 @@ $(function(){
         //console.log(e);
         $('#test-report-tab a:first').tab('show');
         $("#test-report").show();
-        $("#req-success").toggle(e.request&&!e.request.error);
+        $("#req-success").toggle(e.request && !e.request.error);
-        $("#req-errors").toggle(e.request&&!!e.request.error);
+        $("#req-errors").toggle(e.request && !!e.request.error);
         $("#req-errors-body").text(e.request.error);
         function headers(h){
           h = h["headers"];
@@ -165,14 +168,14 @@ $(function(){
         }
         $("#req-headers").html(headers(e.request));
         $("#req-payload").text(e.request && e.request.payload ? JSON.stringify(JSON.parse(e.request.payload),undefined,4) : "");
-        $("#res-success").toggle(e.responce && !e.responce.error);
+        $("#res-success").toggle(e.response && !e.response.error);
-        $("#res-errors").toggle(e.responce && !!e.responce.error);
+        $("#res-errors").toggle(e.response && !!e.response.error);
-        $("#res-errors-body").text(e.responce.error);
+        $("#res-errors-body").text(e.response.error);
-        var success = !!(e.responce && e.responce.status && /^2\d\d$/.test(e.responce.status.statusCode));
+        var success = !!(e.response && e.response.status && /^2\d\d$/.test(e.response.status.statusCode));
-        $("#res-status").text((e.responce && e.responce.status && e.responce.status.statusCode) || "ERROR");
+        $("#res-status").text((e.response && e.response.status && e.response.status.statusCode) || "ERROR");
         $("#res-status").toggleClass("badge-success", success).toggleClass("badge-important", !success);
-        $("#res-headers").html(headers(e.responce));
+        $("#res-headers").html(headers(e.response));
-        $("#res-body").text(e.responce && e.responce.body ? e.responce.body : "");
+        $("#res-body").text(e.response && e.response.body ? e.response.body : "");
       },
       error:function (e) {
         if(e) {
@@ -188,4 +191,5 @@ $(function(){
   });
 })
 </script>
+  }
 }

src/main/twirl/gitbucket/core/account/main.scala.html

@@ -43,7 +43,9 @@
         } else {
           <li@if(active == "activity"){ class="active"}><a href="@helpers.url(account.userName)?tab=activity">Public activity</a></li>
         }
+        @*
         <li@if(active == "webhooks"){ class="active"}><a href="@helpers.url(account.userName)?tab=webhooks">Webhooks</a></li>
+        *@
         @gitbucket.core.plugin.PluginRegistry().getProfileTabs.map { tab =>
           @tab(account, context).map { link =>
             <li@if(active == link.id){ class="active"}><a href="@context.path/@link.path">@link.label</a></li>

src/main/twirl/gitbucket/core/account/menu.scala.html

@@ -22,6 +22,12 @@
           <span>Applications</span>
         </a>
       </li>
+      <li class="menu-item-hover @if(active=="hooks"){active}">
+        <a href="@context.path/@context.loginAccount.get.userName/_hooks">
+          <i class="menu-icon octicon octicon-plug"></i>
+          <span>Service Hooks</span>
+        </a>
+      </li>
       @gitbucket.core.plugin.PluginRegistry().getAccountSettingMenus.map { menu =>
         @menu(context).map { link =>
           <li class="menu-item-hover @if(active==link.id){active}">

src/main/twirl/gitbucket/core/account/webhook.scala.html

@@ -2,8 +2,9 @@
 groupNames: List[String],
 webHooks: List[(gitbucket.core.model.AccountWebHook, Set[gitbucket.core.model.WebHook.Event])])(implicit context: gitbucket.core.controller.Context)
 @import gitbucket.core.view.helpers
-@gitbucket.core.account.html.main(account, groupNames, "webhooks"){
+@gitbucket.core.html.main("Service Hooks"){
-<div class="panel panel-default">
+  @gitbucket.core.account.html.menu("hooks", context.settings.ssh){
+    <div class="panel panel-default">
       <div class="panel-heading strong">
         Webhooks
       </div>
@@ -35,5 +36,6 @@ webHooks: List[(gitbucket.core.model.AccountWebHook, Set[gitbucket.core.model.We
           }
         </table>
       </div>
-</div>
+    </div>
+  }
 }

src/main/twirl/gitbucket/core/settings/edithooks.scala.html

@@ -169,14 +169,14 @@ $(function(){
         }
         $("#req-headers").html(headers(e.request));
         $("#req-payload").text(e.request && e.request.payload ? JSON.stringify(JSON.parse(e.request.payload),undefined,4) : "");
-        $("#res-success").toggle(e.responce && !e.responce.error);
+        $("#res-success").toggle(e.response && !e.response.error);
-        $("#res-errors").toggle(e.responce && !!e.responce.error);
+        $("#res-errors").toggle(e.response && !!e.response.error);
-        $("#res-errors-body").text(e.responce.error);
+        $("#res-errors-body").text(e.response.error);
-        var success = !!(e.responce && e.responce.status && /^2\d\d$/.test(e.responce.status.statusCode));
+        var success = !!(e.response && e.response.status && /^2\d\d$/.test(e.response.status.statusCode));
-        $("#res-status").text((e.responce && e.responce.status && e.responce.status.statusCode) || "ERROR");
+        $("#res-status").text((e.response && e.response.status && e.response.status.statusCode) || "ERROR");
         $("#res-status").toggleClass("badge-success", success).toggleClass("badge-important", !success);
-        $("#res-headers").html(headers(e.responce));
+        $("#res-headers").html(headers(e.response));
-        $("#res-body").text(e.responce && e.responce.body ? e.responce.body : "");
+        $("#res-body").text(e.response && e.response.body ? e.response.body : "");
       },
       error:function (e) {
         if(e) {