Merge pull request #2032 from sparc-request/kg-fix_news_feed

KG - Add News Feed API Token For Atlassian API
sparc-request · Oct 8, 2019 · 8bf70d2 · 8bf70d2
2 parents 7d30b8e + d0549bd
commit 8bf70d2
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 5 deletions.
diff --git a/app/lib/news_feed/api_adapter.rb b/app/lib/news_feed/api_adapter.rb
@@ -20,9 +20,10 @@
 
 module NewsFeed
   class ApiAdapter < NewsFeed::Base
-    def initialize(api_string="", content_type='application/json', parameters={limit: NewsFeed::Base::POST_LIMIT})
-      @content_type = content_type
-      @parameters   = parameters
+    def initialize(api_string, opts={})
+      @content_type = opts[:content_type] || 'application/json'
+      @headers      = opts[:headers] || { 'Content-Type' => @content_type }
+      @parameters   = opts[:parameters] || {limit: NewsFeed::Base::POST_LIMIT}
       @url          = NewsFeed::Base::BASE_URL + api_string + parameter_string
     end
 
@@ -31,7 +32,7 @@ def add_parameter(key, value)
     end
 
     def get
-      HTTParty.get(@url, headers: { 'Content-Type' => @content_type })
+      HTTParty.get(@url, headers: @headers)
     end
 
     private

diff --git a/app/lib/news_feed/atlassian_adapter.rb b/app/lib/news_feed/atlassian_adapter.rb
@@ -28,7 +28,7 @@ def initialize
       space       = Setting.get_value("news_feed_atlassian_space")
       params      = { limit: limit, expand: 'version', cql: "space=#{space} AND type=blogpost order by created desc" }
 
-      super(api_string, 'application/json', params)
+      super(api_string, headers: { 'Content-Type' => 'application/json', 'Authorization' => "Basic #{NewsFeed::Base::API_TOKEN}" }, parameters: params)
     end
 
     def posts

diff --git a/app/lib/news_feed/base.rb b/app/lib/news_feed/base.rb
@@ -22,6 +22,7 @@ module NewsFeed
   class Base
     BASE_URL    = Setting.get_value('news_feed_url')
     POST_LIMIT  = Setting.get_value('news_feed_post_limit')
+    API_TOKEN   = Setting.get_value('news_feed_api_token')
 
     # Abstract Method
     #

diff --git a/config/defaults.json b/config/defaults.json
@@ -549,6 +549,16 @@
     "parent_key":     "use_news_feed_api",
     "parent_value":   "true"
   },
+  {
+    "key":            "news_feed_api_token",
+    "value":          "aGV3d2VAbXVzYy5lZHU6UWZ1ZUpldG9ydEZlMDBwcFVCandCMUEz",
+    "friendly_name":  "News Feed API Token",
+    "description":    "This is the optional token used by the News Feed API to retrieve posts.<br>For Atlassian API Tokens, see https://developer.atlassian.com/cloud/jira/platform/jira-rest-api-basic-authentication/.",
+    "group":          "",
+    "version":        "",
+    "parent_key":     "use_news_feed_api",
+    "parent_value":   "true"
+  },
   {
     "key":            "news_feed_atlassian_space",
     "value":          "RD",