redmine_airbrake_backend 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: bb95238f93fbf76fa5768e6288859e3feadd74f3
-  data.tar.gz: f8288fc3b75397041e98e0d55281f847d2e19336
+SHA256:
+  metadata.gz: 2b609db8df7b543900de190e58b947f287767f8add9e3b67b2010f358367b139
+  data.tar.gz: 95e5a3453fd9736df2cc0ad566990fa04739eae0404a171825f2d661c7936af8
 SHA512:
-  metadata.gz: 62f8724020e4a6d619c65d0f888ac61248805c175bc5067d39a622b7ba6fc245a507660a4b58a02e875687b14e1eb7cd879af42825c8ed5e637a64b4769b7c70
-  data.tar.gz: 946f8a555d5eb230c4fd92e03debb793c63804725b76f711d83c7c875ddb5739dab0539575c29d1f8e507d67d7cd510910b035f9df7317e6bf832f5ea5b3b31a
+  metadata.gz: 9add4edc3af06753ea4f6de1876f65c5824b149e72e9cae14b73e714739e91216d667fd38515a24689b5677ad5fee521afa316f833e8e92d989390153b1306e8
+  data.tar.gz: c3fe3ba17ab5863424b017a8f94e69f20dfe5e9b62992d498aa9438f199ddd112a5a2c8f069d3e1e675006bb42c58475b3761c34b13a96c5c29ad353e77933d5

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.2.0 (2018-01-17)
+### Features
+  - Support airbrake token based authentication
+
 ## 1.1.2 (2017-12-12)
 ### Fixes
   - Prevent rendering of empty sections

data/app/controllers/airbrake_controller.rb

@@ -7,8 +7,8 @@ class AirbrakeController < ::ApplicationController
 
   skip_before_action :verify_authenticity_token
 
-  prepend_before_action :parse_key
   prepend_before_action :find_project
+  prepend_before_action :parse_key
 
   before_action :authorize
   before_action :find_tracker
@@ -24,13 +24,20 @@ class AirbrakeController < ::ApplicationController
   private
 
   def find_project
-    @project = Project.find(params[:project_id])
+    @project = Project.find(@key[:project] || params[:project_id])
   end
 
   def parse_key
-    @key = JSON.parse(params[:key]).with_indifferent_access rescue nil
+    @key = nil
+
+    if (request.headers['HTTP_AUTHORIZATION'] || '') =~ /^Bearer\s+(.*)\s*$/i
+      # New auth method
+      @key = JSON.parse(Regexp.last_match[1]).with_indifferent_access rescue nil
+    elsif params[:key].present?
+      # Old auth method
+      @key = JSON.parse(params[:key]).with_indifferent_access rescue nil
+    end
 
-    # API key
     invalid_request!('No or invalid API key') if @key.blank? || @key[:key].blank?
     params[:key] = @key[:key]
   end
@@ -90,7 +97,7 @@ class AirbrakeController < ::ApplicationController
   end
 
   def global_setting(key)
-    Setting.plugin_redmine_airbrake_backend[key]
+    Setting.plugin_redmine_airbrake_backend[key.to_s]
   end
 
   def project_setting(key)

data/app/views/settings/_airbrake.html.erb

@@ -1,9 +1,9 @@
 <p>
-  <%=label_tag 'settings[hash_field]', l(:settings_airbrake_hash_field) %>
-  <%=select('settings[hash_field]', nil, IssueCustomField.where(field_format: 'string').order(:name).collect{|cf| [cf.name, cf.id]}, selected: @settings[:hash_field]) %>
+  <%= label_tag('settings[hash_field]', l(:settings_airbrake_hash_field)) %>
+  <%= select('settings', 'hash_field', IssueCustomField.where(field_format: 'string').order(:name).map { |cf| [cf.name, cf.id] }, selected: @settings['hash_field']) %>
 </p>
 
 <p>
-  <%=label_tag 'settings[occurrences_field]', l(:settings_airbrake_occurrences_field) %>
-  <%=select('settings[occurrences_field]', nil, IssueCustomField.where(field_format: 'int').order(:name).collect{|cf| [cf.name, cf.id]}, selected: @settings[:occurrences_field], include_blank: true) %>
+  <%= label_tag('settings[occurrences_field]', l(:settings_airbrake_occurrences_field)) %>
+  <%= select('settings', 'occurrences_field', IssueCustomField.where(field_format: 'int').order(:name).map { |cf| [cf.name, cf.id] }, selected: @settings['occurrences_field'], include_blank: true) %>
 </p>

data/lib/redmine_airbrake_backend/version.rb

@@ -1,4 +1,4 @@
 module RedmineAirbrakeBackend
   # Version of this gem
-  VERSION = '1.1.2'
+  VERSION = '1.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redmine_airbrake_backend
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Florian Schwab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-12 00:00:00.000000000 Z
+date: 2018-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -117,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: This plugin provides the necessary API to use Redmine as a Airbrake backend