Separate function to get Auth headers

Open-EO · Jan 8, 2024 · ed5eee6 · ed5eee6
1 parent 9f58a37
commit ed5eee6
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 2 deletions.
diff --git a/openeo.d.ts b/openeo.d.ts
@@ -2462,6 +2462,13 @@ declare module OpenEO {
          * @throws {Error}
          */
         download(url: string, authorize: boolean): Promise<Readable | Blob>;
+        /**
+         * Get the authorization header for requests.
+         * 
+         * @protected
+         * @returns {object.<string, string>}
+         */
+        protected _getAuthHeaders() : object<string, string>;
         /**
          * Sends a HTTP request.
          *

diff --git a/src/connection.js b/src/connection.js
@@ -1215,6 +1215,20 @@ class Connection {
 		return result.data;
 	}
 
+	/**
+	 * Get the authorization header for requests.
+	 * 
+	 * @protected
+	 * @returns {object.<string, string>}
+	 */
+	_getAuthHeaders() {
+		const headers = {};
+		if (this.isAuthenticated()) {
+			headers.Authorization = 'Bearer ' + this.authProvider.getToken();
+		}
+		return headers;
+	}
+
 	/**
 	 * Sends a HTTP request.
 	 * 
@@ -1237,11 +1251,11 @@ class Connection {
 	 */
 	async _send(options, abortController = null) {
 		options.baseURL = this.baseUrl;
-		if (this.isAuthenticated() && (typeof options.authorization === 'undefined' || options.authorization === true)) {
+		if (typeof options.authorization === 'undefined' || options.authorization === true) {
 			if (!options.headers) {
 				options.headers = {};
 			}
-			options.headers.Authorization = 'Bearer ' + this.authProvider.getToken();
+			Object.assign(options.headers, this._getAuthHeaders());
 		}
 		if (!options.responseType) {
 			options.responseType = 'json';