Merge pull request #665 from fnxpt/3255

add token and new notifications
DependencyTrack · Mar 5, 2024 · 4309e74 · 4309e74
2 parents 9493cab + bbd4079
commit 4309e74
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 0 deletions.
diff --git a/src/i18n/locales/en.json b/src/i18n/locales/en.json
@@ -672,6 +672,7 @@
     "select_ecosystem": "Select Ecosystems",
     "registered_email_address": "Registered email address",
     "api_token": "API token",
+    "api_token_header": "API token header",
     "consumer_key": "Consumer key",
     "consumer_secret": "Consumer secret",
     "personal_access_token": "Personal Access Token",

diff --git a/src/views/administration/notifications/Alerts.vue b/src/views/administration/notifications/Alerts.vue
@@ -147,6 +147,10 @@ export default {
                     <b-input-group-form-input id="input-destination" :label="$t('admin.destination')" input-group-size="mb-3"
                                               :required="(!(this.alert.hasOwnProperty('teams') && this.alert.teams != null && this.alert.teams.length > 0)).toString()"
                                               type="text" v-model="destination" lazy="true" />
+                    <b-input-group-form-input v-if="this.publisherClass === 'org.dependencytrack.notification.publisher.WebhookPublisher'" id="input-token-header" :label="$t('admin.api_token_header')" input-group-size="mb-3"
+                                              type="password" v-model="tokenHeader" lazy="true" />
+                    <b-input-group-form-input v-if="this.publisherClass === 'org.dependencytrack.notification.publisher.WebhookPublisher'" id="input-token" :label="$t('admin.api_token')" input-group-size="mb-3"
+                                              type="password" v-model="token" lazy="true" />
                     <b-input-group-form-input v-if="this.publisherClass === 'org.dependencytrack.notification.publisher.JiraPublisher'" id="input-jira-ticket-type"
                                               :label="$t('admin.jira_ticket_type')" :required="true" type="text" v-model="jiraTicketType" lazy="true" />
                      <b-form-group v-if="this.publisherClass === 'org.dependencytrack.notification.publisher.SendMailPublisher'"
@@ -197,6 +201,8 @@ export default {
                           <div class="list-group-item"><b-form-checkbox value="FILE_SYSTEM">FILE_SYSTEM</b-form-checkbox></div>
                           <div class="list-group-item"><b-form-checkbox value="INDEXING_SERVICE">INDEXING_SERVICE</b-form-checkbox></div>
                           <div class="list-group-item"><b-form-checkbox value="REPOSITORY">REPOSITORY</b-form-checkbox></div>
+                          <div class="list-group-item"><b-form-checkbox value="USER_CREATED">USER_CREATED</b-form-checkbox></div>
+                          <div class="list-group-item"><b-form-checkbox value="USER_DELETED">USER_DELETED</b-form-checkbox></div>
                         </b-form-checkbox-group>
                       </div>
                     </b-form-group>
@@ -233,6 +239,8 @@ export default {
                 publisherClass: row.publisher.publisherClass,
                 notificationLevel: row.notificationLevel,
                 destination: this.parseDestination(row),
+                token: this.parseToken(row),
+                tokenHeader: this.parseTokenHeader(row),
                 jiraTicketType: this.parseJiraTicketType(row),
                 scope: row.scope,
                 notifyOn: row.notifyOn,
@@ -256,6 +264,8 @@ export default {
             },
             created() {
               this.parseDestination(this.alert);
+              this.parseToken(this.alert);
+              this.parseTokenHeader(this.alert);
               this.parseJiraTicketType(this.alert);
             },
             watch: {
@@ -292,6 +302,24 @@ export default {
                   return null;
                 }
               },
+              parseToken: function (alert) {
+                if (alert.publisherConfig) {
+                  let value = JSON.parse(alert.publisherConfig);
+                  if (value) {
+                    return value.token;
+                  }
+                  return null;
+                }
+              },
+              parseTokenHeader: function (alert) {
+                if (alert.publisherConfig) {
+                  let value = JSON.parse(alert.publisherConfig);
+                  if (value) {
+                    return value.tokenHeader;
+                  }
+                  return null;
+                }
+              },
               parseJiraTicketType: function (alert) {
                 if (alert.publisherConfig) {
                   let value = JSON.parse(alert.publisherConfig);
@@ -314,12 +342,16 @@ export default {
                     publisherConfig: JSON.stringify({
                       destination: this.destination,
                       jiraTicketType: this.jiraTicketType,
+                      token: this.token,
+                      tokenHeader: this.tokenHeader,
                     }),
                     notifyOn: this.notifyOn,
                   })
                   .then((response) => {
                     this.alert = response.data;
                     this.destination = this.parseDestination(this.alert);
+                    this.token = this.parseToken(this.alert);
+                    this.tokenHeader = this.parseTokenHeader(this.alert);
                     this.jiraTicketType = this.parseJiraTicketType(this.alert);
                     EventBus.$emit('admin:alerts:rowUpdate', index, this.alert);
                     this.$toastr.s(this.$t('message.updated'));