Feature/bearer token headers

CHANGELOG.md

@@ -8,6 +8,7 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 ## [Unreleased]
 ### Changed
 - Changed token url to being tokens in authorization headers.
+- Add in bearer token function for use of EDL bearer token in authorization headers.
 
 ## [0.7.0]
 ### Added

README.md

@@ -211,6 +211,14 @@ specified before making the request:
 
     >>> granules = api.format("echo10").get(100)
 
+We can add token to the api calls by setting headers using the following functions:
+
+    # Use token function for EDL echo-token or launchpad token
+    >>> api.token(token)
+
+    # Use bearer token function for EDL bearer tokens
+    >>> api.bearer_token(token)
+
 The following formats are supported for both granule and collection queries:
 
 - json (default)

cmr/queries.py

@@ -276,7 +276,7 @@ def token(self, token):
         """
         Add token into authorization headers.
 
-        :param token: Token from EDL or NASA Launchpad token.
+        :param token: Token from EDL Echo-Token or NASA Launchpad token.
         :returns: Query instance
         """
 
@@ -287,6 +287,22 @@ def token(self, token):
 
         return self
 
+    def bearer_token(self, bearer_token):
+        """
+        Add token into authorization headers.
+
+        :param token: Token from EDL token.
+        :returns: Query instance
+        """
+
+        if not bearer_token:
+            return self
+
+        self.headers = {'Authorization': 'Bearer ' + bearer_token}
+
+        return self
+
+
 class GranuleCollectionBaseQuery(Query):
     """
     Base class for Granule and Collection CMR queries.

tests/test_collection.py

@@ -90,3 +90,12 @@ def test_token(self):
 
         self.assertIn("Authorization", query.headers)
         self.assertEqual(query.headers["Authorization"], "123TOKEN")
+
+    def bearer_test_token(self):
+        query = CollectionQuery()
+
+        query.bearer_token("123TOKEN")
+
+        self.assertIn("Authorization", query.headers)
+        self.assertEqual(query.headers["Authorization"], "Bearer 123TOKEN")
+

tests/test_granule.py

@@ -434,4 +434,13 @@ def test_token(self):
 
         query.token("123TOKEN")
         self.assertIn("Authorization", query.headers)
-        self.assertEqual(query.headers["Authorization"], "123TOKEN")
+        self.assertEqual(query.headers["Authorization"], "123TOKEN")
+
+    def bearer_test_token(self):
+        query = GranuleQuery()
+
+        query.bearer_token("123TOKEN")
+
+        self.assertIn("Authorization", query.headers)
+        self.assertEqual(query.headers["Authorization"], "Bearer 123TOKEN")
+

tests/test_service.py

@@ -77,3 +77,12 @@ def test_token(self):
 
         self.assertIn("Authorization", query.headers)
         self.assertEqual(query.headers["Authorization"], "123TOKEN")
+
+    def bearer_test_token(self):
+        query = ServiceQuery()
+
+        query.bearer_token("123TOKEN")
+
+        self.assertIn("Authorization", query.headers)
+        self.assertEqual(query.headers["Authorization"], "Bearer 123TOKEN")
+

tests/test_tool.py

@@ -77,3 +77,12 @@ def test_token(self):
 
         self.assertIn("Authorization", query.headers)
         self.assertEqual(query.headers["Authorization"], "123TOKEN")
+
+    def bearer_test_token(self):
+        query = ToolQuery()
+
+        query.bearer_token("123TOKEN")
+
+        self.assertIn("Authorization", query.headers)
+        self.assertEqual(query.headers["Authorization"], "Bearer 123TOKEN")
+

tests/test_variable.py

@@ -77,3 +77,12 @@ def test_token(self):
 
         self.assertIn("Authorization", query.headers)
         self.assertEqual(query.headers["Authorization"], "123TOKEN")
+
+    def bearer_test_token(self):
+        query = VariableQuery()
+
+        query.bearer_token("123TOKEN")
+
+        self.assertIn("Authorization", query.headers)
+        self.assertEqual(query.headers["Authorization"], "Bearer 123TOKEN")
+