Business intelligence made simple
Added support for Slack OAuth tokens - #368
Andrew Kanee39de727f15e
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex 964cbc7f..a3234f63 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -1,3 +1,7 @@+## 2.5.0 (unreleased)++- Added support for Slack OAuth tokens+## 2.4.8 (2021-12-07)- Added support for OpenSearchdiff --git a/lib/blazer.rb b/lib/blazer.rbindex c2976899..31b6cfe3 100644--- a/lib/blazer.rb+++ b/lib/blazer.rb@@ -63,6 +63,7 @@ module Blazerattr_accessor :query_viewableattr_accessor :query_editableattr_accessor :override_csp+ attr_accessor :slack_oauth_tokenattr_accessor :slack_webhook_urlattr_accessor :mapbox_access_tokenend@@ -213,7 +214,7 @@ module Blazerenddef self.slack?- slack_webhook_url.present?+ slack_oauth_token.present? || slack_webhook_url.present?enddef self.uploads?diff --git a/lib/blazer/engine.rb b/lib/blazer/engine.rbindex b01d2406..03caa9ac 100644--- a/lib/blazer/engine.rb+++ b/lib/blazer/engine.rb@@ -36,6 +36,7 @@ module BlazerBlazer.images = Blazer.settings["images"] || falseBlazer.override_csp = Blazer.settings["override_csp"] || false+ Blazer.slack_oauth_token = Blazer.settings["slack_oauth_token"] || ENV["BLAZER_SLACK_OAUTH_TOKEN"]Blazer.slack_webhook_url = Blazer.settings["slack_webhook_url"] || ENV["BLAZER_SLACK_WEBHOOK_URL"]Blazer.mapbox_access_token = Blazer.settings["mapbox_access_token"] || ENV["MAPBOX_ACCESS_TOKEN"]enddiff --git a/lib/blazer/slack_notifier.rb b/lib/blazer/slack_notifier.rbindex 4d1e035d..2fba7dde 100644--- a/lib/blazer/slack_notifier.rb+++ b/lib/blazer/slack_notifier.rb@@ -23,7 +23,7 @@ module Blazer]}- post(Blazer.slack_webhook_url, payload)+ post(payload)endend@@ -44,7 +44,7 @@ module Blazer]}- post(Blazer.slack_webhook_url, payload)+ post(payload)end# https://api.slack.com/docs/message-formatting#how_to_escape_characters@@ -67,13 +67,26 @@ module BlazerBlazer::Engine.routes.url_helpers.query_url(id, ActionMailer::Base.default_url_options)end- def self.post(url, payload)- uri = URI.parse(url)- http = Net::HTTP.new(uri.host, uri.port)- http.use_ssl = true- http.open_timeout = 3- http.read_timeout = 5- http.post(uri.request_uri, payload.to_json)+ def self.post(payload)+ if Blazer.slack_oauth_token+ uri = URI.parse("https://slack.com/api/chat.postMessage")+ http = Net::HTTP.new(uri.host, uri.port)+ http.use_ssl = true+ http.open_timeout = 3+ http.read_timeout = 5+ headers = {+ "Authorization" => "Bearer #{Blazer.slack_oauth_token}",+ "Content-type" => "application/json"+ }+ http.post(uri.request_uri, payload.to_json, headers)+ else+ uri = URI.parse(Blazer.slack_webhook_url)+ http = Net::HTTP.new(uri.host, uri.port)+ http.use_ssl = true+ http.open_timeout = 3+ http.read_timeout = 5+ http.post(uri.request_uri, payload.to_json)+ endendendend