sodas-sdk 1.1.1 → 1.1.11

package/dist/__tests__/setting/testEnvironmentConfig.d.ts

@@ -1,5 +1,4 @@
-export declare const TEST_DATAHUB_API_URL: string;
+export declare const TEST_SODAS_PROFILE_API_URL: string;
 export declare const TEST_GOVERNANCE_API_URL: string;
-export declare const TEST_SODAS_SDK_API_URL: string;
-export declare function getAccessToken(): Promise<string>;
+export declare const TEST_LEGACY_DATAHUB_API_URL: string;
 export declare function setBearerTokenForTest(): Promise<void>;

package/dist/core/auth.d.ts

@@ -1,15 +1,16 @@
 declare class Config {
     private static instance;
     private governanceToken;
-    private datahubToken;
+    private legacyDatahubToken;
     private governanceBaseUrl;
-    private datahubBaseUrl;
+    private sodasProfileBaseUrl;
+    private legacyDatahubBaseUrl;
     private constructor();
     /**
      * Explicitly configure the SDK with the given API URLs.
      * This is the preferred way to set API URLs instead of using configureAPIURL.
      */
-    static configure(datahubApiUrl: string, governanceApiUrl: string): Config;
+    static configure(datahubApiUrl: string, governanceApiUrl: string, legacyDatahubApiUrl: string): Config;
     /**
      * Get the singleton instance of Config, using environment variables.
      */
@@ -25,7 +26,7 @@ declare class Config {
     /**
      * Login to the Datahub portal and store the access token.
      */
-    loginDatahub(id: string, password: string): Promise<void>;
+    loginLegacyDatahub(id: string, password: string): Promise<void>;
     /**
      * Logout from the Governance portal and clear the stored token.
      */
@@ -33,7 +34,7 @@ declare class Config {
     /**
      * Logout from the Datahub portal and clear the stored token.
      */
-    logoutDatahub(): Promise<void>;
+    logoutLegacyDatahub(): Promise<void>;
     /**
      * Get the current Governance access token.
      */
@@ -41,6 +42,6 @@ declare class Config {
     /**
      * Get the current Datahub access token.
      */
-    getDatahubToken(): string | null;
+    getLegacyDatahubToken(): string | null;
 }
 export default Config;

package/dist/core/init.d.ts

@@ -4,4 +4,5 @@
  * @param {string} token - The Bearer token used for API authentication.
  * @returns {void}
  */
-export declare function setBearerToken(token: string): void;
+export declare function setGovernanceBearerToken(token: string): void;
+export declare function setLegacyDatahubBearerToken(token: string): void;

package/dist/index.browser.js

@@ -4738,7 +4738,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   "default": () => (__WEBPACK_DEFAULT_EXPORT__)
 /* harmony export */ });
-/* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! axios */ "./node_modules/axios/lib/axios.js");
+/* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! axios */ "./node_modules/axios/lib/axios.js");
 /* harmony import */ var _SODAS_SDK_CLASS_DCAT_dataService__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../SODAS_SDK_CLASS/DCAT/dataService */ "./lib/SODAS_SDK_CLASS/DCAT/dataService.ts");
 /* harmony import */ var _SODAS_SDK_CLASS_DCAT_dataset__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../SODAS_SDK_CLASS/DCAT/dataset */ "./lib/SODAS_SDK_CLASS/DCAT/dataset.ts");
 /* harmony import */ var _SODAS_SDK_CLASS_DCAT_datasetSeries__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../SODAS_SDK_CLASS/DCAT/datasetSeries */ "./lib/SODAS_SDK_CLASS/DCAT/datasetSeries.ts");
@@ -4749,6 +4749,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _SODAS_SDK_FILE_dataFile__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../SODAS_SDK_FILE/dataFile */ "./lib/SODAS_SDK_FILE/dataFile.ts");
 /* harmony import */ var _SODAS_SDK_FILE_thumbnailFile__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../SODAS_SDK_FILE/thumbnailFile */ "./lib/SODAS_SDK_FILE/thumbnailFile.ts");
 /* harmony import */ var _error__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ./error */ "./lib/core/error.ts");
+/* harmony import */ var _init__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ./init */ "./lib/core/init.ts");
 var __awaiter = (undefined && undefined.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -4769,25 +4770,28 @@ var __awaiter = (undefined && undefined.__awaiter) || function (thisArg, _argume
 
 
 
+
 class Config {
-    constructor(governanceBaseUrl, datahubBaseUrl) {
+    constructor(governanceBaseUrl, sodasProfileBaseUrl, legacyDatahubBaseUrl) {
         this.governanceToken = null;
-        this.datahubToken = null;
+        this.legacyDatahubToken = null;
         this.governanceBaseUrl = governanceBaseUrl.replace(/\/$/, "");
-        this.datahubBaseUrl = datahubBaseUrl.replace(/\/$/, "");
+        this.sodasProfileBaseUrl = sodasProfileBaseUrl.replace(/\/$/, "");
+        this.legacyDatahubBaseUrl = legacyDatahubBaseUrl.replace(/\/$/, "");
         this.initializeAPIURLs();
     }
     /**
      * Explicitly configure the SDK with the given API URLs.
      * This is the preferred way to set API URLs instead of using configureAPIURL.
      */
-    static configure(datahubApiUrl, governanceApiUrl) {
+    static configure(datahubApiUrl, governanceApiUrl, legacyDatahubApiUrl) {
         if (!Config.instance) {
-            Config.instance = new Config(governanceApiUrl, datahubApiUrl);
+            Config.instance = new Config(governanceApiUrl, datahubApiUrl, legacyDatahubApiUrl);
         }
         else {
             Config.instance.governanceBaseUrl = governanceApiUrl.replace(/\/$/, "");
-            Config.instance.datahubBaseUrl = datahubApiUrl.replace(/\/$/, "");
+            Config.instance.sodasProfileBaseUrl = datahubApiUrl.replace(/\/$/, "");
+            Config.instance.legacyDatahubBaseUrl = legacyDatahubApiUrl.replace(/\/$/, "");
             Config.instance.initializeAPIURLs();
         }
         return Config.instance;
@@ -4800,13 +4804,16 @@ class Config {
             const governanceBaseUrl = process.env.PRODUCTION_GOVERNANCE_API_URL ||
                 process.env.TEST_GOVERNANCE_API_URL ||
                 "";
-            const datahubBaseUrl = process.env.PRODUCTION_DATAHUB_API_URL ||
-                process.env.TEST_DATAHUB_API_URL ||
+            const sodasProfileBaseUrl = process.env.PRODUCTION_DATAHUB_API_URL ||
+                process.env.TEST_SODAS_PROFILE_API_URL ||
+                "";
+            const legacyDatahubBaseUrl = process.env.PRODUCTION_LEGACY_DATAHUB_API_URL ||
+                process.env.TEST_LEGACY_DATAHUB_API_URL ||
                 "";
-            if (!governanceBaseUrl || !datahubBaseUrl) {
+            if (!governanceBaseUrl || !sodasProfileBaseUrl) {
                 throw new Error("Governance or Datahub base URL is not configured in environment variables.");
             }
-            Config.instance = new Config(governanceBaseUrl, datahubBaseUrl);
+            Config.instance = new Config(governanceBaseUrl, sodasProfileBaseUrl, legacyDatahubBaseUrl);
         }
         return Config.instance;
     }
@@ -4814,15 +4821,15 @@ class Config {
      * Initialize all SDK class API URLs based on the configured base URLs.
      */
     initializeAPIURLs() {
-        const SLASH_DELETED_DATAHUB_API_URL = this.datahubBaseUrl.replace(/\/$/, "");
+        const SLASH_DELETED_SODAS_PROFILE_BASE_URL = this.sodasProfileBaseUrl.replace(/\/$/, "");
         const SLASH_DELETED_GOVERNANCE_PORTAL_API_URL = this.governanceBaseUrl.replace(/\/$/, "");
-        if (this.datahubBaseUrl) {
-            _SODAS_SDK_CLASS_DCAT_distribution__WEBPACK_IMPORTED_MODULE_3__["default"].configureAPIURL(SLASH_DELETED_DATAHUB_API_URL);
-            _SODAS_SDK_CLASS_DCAT_dataset__WEBPACK_IMPORTED_MODULE_1__["default"].configureAPIURL(SLASH_DELETED_DATAHUB_API_URL);
-            _SODAS_SDK_CLASS_DCAT_datasetSeries__WEBPACK_IMPORTED_MODULE_2__["default"].configureAPIURL(SLASH_DELETED_DATAHUB_API_URL);
-            _SODAS_SDK_CLASS_DCAT_dataService__WEBPACK_IMPORTED_MODULE_0__["default"].configureAPIURL(SLASH_DELETED_DATAHUB_API_URL);
-            _SODAS_SDK_FILE_thumbnailFile__WEBPACK_IMPORTED_MODULE_8__["default"].configureAPIURL(SLASH_DELETED_DATAHUB_API_URL);
-            _SODAS_SDK_FILE_dataFile__WEBPACK_IMPORTED_MODULE_7__["default"].configureAPIURL(SLASH_DELETED_DATAHUB_API_URL);
+        if (this.sodasProfileBaseUrl) {
+            _SODAS_SDK_CLASS_DCAT_distribution__WEBPACK_IMPORTED_MODULE_3__["default"].configureAPIURL(SLASH_DELETED_SODAS_PROFILE_BASE_URL);
+            _SODAS_SDK_CLASS_DCAT_dataset__WEBPACK_IMPORTED_MODULE_1__["default"].configureAPIURL(SLASH_DELETED_SODAS_PROFILE_BASE_URL);
+            _SODAS_SDK_CLASS_DCAT_datasetSeries__WEBPACK_IMPORTED_MODULE_2__["default"].configureAPIURL(SLASH_DELETED_SODAS_PROFILE_BASE_URL);
+            _SODAS_SDK_CLASS_DCAT_dataService__WEBPACK_IMPORTED_MODULE_0__["default"].configureAPIURL(SLASH_DELETED_SODAS_PROFILE_BASE_URL);
+            _SODAS_SDK_FILE_thumbnailFile__WEBPACK_IMPORTED_MODULE_8__["default"].configureAPIURL(SLASH_DELETED_SODAS_PROFILE_BASE_URL);
+            _SODAS_SDK_FILE_dataFile__WEBPACK_IMPORTED_MODULE_7__["default"].configureAPIURL(SLASH_DELETED_SODAS_PROFILE_BASE_URL);
         }
         else {
             console.error("DATAHUB_API_URL not found in config");
@@ -4847,9 +4854,10 @@ class Config {
                 password,
                 offline: false,
             };
-            const response = yield axios__WEBPACK_IMPORTED_MODULE_10__["default"].post(url, parameters);
+            const response = yield axios__WEBPACK_IMPORTED_MODULE_11__["default"].post(url, parameters);
             if (response.data && response.data.accessToken) {
                 this.governanceToken = response.data.accessToken;
+                (0,_init__WEBPACK_IMPORTED_MODULE_10__.setGovernanceBearerToken)(this.governanceToken);
             }
             else {
                 throw new _error__WEBPACK_IMPORTED_MODULE_9__.NoAccessTokenFoundError();
@@ -4859,20 +4867,27 @@ class Config {
     /**
      * Login to the Datahub portal and store the access token.
      */
-    loginDatahub(id, password) {
+    loginLegacyDatahub(id, password) {
         return __awaiter(this, void 0, void 0, function* () {
-            const url = `${this.datahubBaseUrl}/api/v1/authnz/authentication/user/login`;
+            const url = `${this.legacyDatahubBaseUrl}/api/v1/authnz/authentication/user/login`;
             const parameters = {
                 id,
                 password,
                 offline: false,
             };
-            const response = yield axios__WEBPACK_IMPORTED_MODULE_10__["default"].post(url, parameters);
-            if (response.data && response.data.accessToken) {
-                this.datahubToken = response.data.accessToken;
+            try {
+                const response = yield axios__WEBPACK_IMPORTED_MODULE_11__["default"].post(url, parameters);
+                if (response.data && response.data.accessToken) {
+                    this.legacyDatahubToken = response.data.accessToken;
+                    (0,_init__WEBPACK_IMPORTED_MODULE_10__.setLegacyDatahubBearerToken)(this.legacyDatahubToken);
+                }
+                else {
+                    throw new _error__WEBPACK_IMPORTED_MODULE_9__.NoAccessTokenFoundError();
+                }
             }
-            else {
-                throw new _error__WEBPACK_IMPORTED_MODULE_9__.NoAccessTokenFoundError();
+            catch (error) {
+                console.error("Error during loginLegacyDatahub:", error);
+                throw error;
             }
         });
     }
@@ -4882,7 +4897,7 @@ class Config {
     logoutGovernance() {
         return __awaiter(this, void 0, void 0, function* () {
             const url = `${this.governanceBaseUrl}/api/v1/authnz/authentication/user/logout`;
-            const response = yield axios__WEBPACK_IMPORTED_MODULE_10__["default"].post(url, {}, {
+            const response = yield axios__WEBPACK_IMPORTED_MODULE_11__["default"].post(url, {}, {
                 headers: this.governanceToken
                     ? { Authorization: `Bearer ${this.governanceToken}` }
                     : undefined,
@@ -4898,16 +4913,16 @@ class Config {
     /**
      * Logout from the Datahub portal and clear the stored token.
      */
-    logoutDatahub() {
+    logoutLegacyDatahub() {
         return __awaiter(this, void 0, void 0, function* () {
-            const url = `${this.datahubBaseUrl}/api/v1/authnz/authentication/user/logout`;
-            const response = yield axios__WEBPACK_IMPORTED_MODULE_10__["default"].post(url, {}, {
-                headers: this.datahubToken
-                    ? { Authorization: `Bearer ${this.datahubToken}` }
+            const url = `${this.legacyDatahubBaseUrl}/api/v1/authnz/authentication/user/logout`;
+            const response = yield axios__WEBPACK_IMPORTED_MODULE_11__["default"].post(url, {}, {
+                headers: this.legacyDatahubToken
+                    ? { Authorization: `Bearer ${this.legacyDatahubToken}` }
                     : undefined,
             });
             if (response.data && response.data.result === "success") {
-                this.datahubToken = null;
+                this.legacyDatahubToken = null;
             }
             else {
                 throw new _error__WEBPACK_IMPORTED_MODULE_9__.UnexpectedResponseFormatError(response.data);
@@ -4923,8 +4938,8 @@ class Config {
     /**
      * Get the current Datahub access token.
      */
-    getDatahubToken() {
-        return this.datahubToken;
+    getLegacyDatahubToken() {
+        return this.legacyDatahubToken;
     }
 }
 Config.instance = null;
@@ -5087,7 +5102,8 @@ class UnexpectedResponseFormatError extends Error {
 
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   setBearerToken: () => (/* binding */ setBearerToken)
+/* harmony export */   setGovernanceBearerToken: () => (/* binding */ setGovernanceBearerToken),
+/* harmony export */   setLegacyDatahubBearerToken: () => (/* binding */ setLegacyDatahubBearerToken)
 /* harmony export */ });
 /* harmony import */ var _SODAS_SDK_CLASS_DCAT_dataService__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../SODAS_SDK_CLASS/DCAT/dataService */ "./lib/SODAS_SDK_CLASS/DCAT/dataService.ts");
 /* harmony import */ var _SODAS_SDK_CLASS_DCAT_dataset__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../SODAS_SDK_CLASS/DCAT/dataset */ "./lib/SODAS_SDK_CLASS/DCAT/dataset.ts");
@@ -5107,13 +5123,15 @@ __webpack_require__.r(__webpack_exports__);
  * @param {string} token - The Bearer token used for API authentication.
  * @returns {void}
  */
-function setBearerToken(token) {
+function setGovernanceBearerToken(token) {
+    _SODAS_SDK_CLASS_dictionary_vocabulary__WEBPACK_IMPORTED_MODULE_5__["default"].BEARER_TOKEN = token;
+    _SODAS_SDK_CLASS_dictionary_term__WEBPACK_IMPORTED_MODULE_4__["default"].BEARER_TOKEN = token;
+}
+function setLegacyDatahubBearerToken(token) {
     _SODAS_SDK_CLASS_DCAT_dataset__WEBPACK_IMPORTED_MODULE_1__["default"].BEARER_TOKEN = token;
     _SODAS_SDK_CLASS_DCAT_dataService__WEBPACK_IMPORTED_MODULE_0__["default"].BEARER_TOKEN = token;
     _SODAS_SDK_CLASS_DCAT_datasetSeries__WEBPACK_IMPORTED_MODULE_2__["default"].BEARER_TOKEN = token;
     _SODAS_SDK_CLASS_DCAT_distribution__WEBPACK_IMPORTED_MODULE_3__["default"].BEARER_TOKEN = token;
-    _SODAS_SDK_CLASS_dictionary_vocabulary__WEBPACK_IMPORTED_MODULE_5__["default"].BEARER_TOKEN = token;
-    _SODAS_SDK_CLASS_dictionary_term__WEBPACK_IMPORTED_MODULE_4__["default"].BEARER_TOKEN = token;
 }
 
 
@@ -10319,7 +10337,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   asID: () => (/* reexport safe */ _core_type__WEBPACK_IMPORTED_MODULE_6__.asID),
 /* harmony export */   asIRI: () => (/* reexport safe */ _core_type__WEBPACK_IMPORTED_MODULE_6__.asIRI),
 /* harmony export */   "default": () => (__WEBPACK_DEFAULT_EXPORT__),
-/* harmony export */   setBearerToken: () => (/* reexport safe */ _core_init__WEBPACK_IMPORTED_MODULE_5__.setBearerToken)
+/* harmony export */   setGovernanceBearerToken: () => (/* reexport safe */ _core_init__WEBPACK_IMPORTED_MODULE_5__.setGovernanceBearerToken),
+/* harmony export */   setLegacyDatahubBearerToken: () => (/* reexport safe */ _core_init__WEBPACK_IMPORTED_MODULE_5__.setLegacyDatahubBearerToken)
 /* harmony export */ });
 /* harmony import */ var _SODAS_SDK_CLASS_DCAT_dataService__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./SODAS_SDK_CLASS/DCAT/dataService */ "./lib/SODAS_SDK_CLASS/DCAT/dataService.ts");
 /* harmony import */ var _SODAS_SDK_CLASS_DCAT_dataset__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./SODAS_SDK_CLASS/DCAT/dataset */ "./lib/SODAS_SDK_CLASS/DCAT/dataset.ts");
@@ -10356,7 +10375,8 @@ const sdk = {
     SortOrder: _core_type__WEBPACK_IMPORTED_MODULE_6__.SortOrder,
     TemplateDetailFunctionality: _core_type__WEBPACK_IMPORTED_MODULE_6__.TemplateDetailFunctionality,
     Config: _core_auth__WEBPACK_IMPORTED_MODULE_4__["default"],
-    setBearerToken: _core_init__WEBPACK_IMPORTED_MODULE_5__.setBearerToken,
+    setGovernanceBearerToken: _core_init__WEBPACK_IMPORTED_MODULE_5__.setGovernanceBearerToken,
+    setLegacyDatahubBearerToken: _core_init__WEBPACK_IMPORTED_MODULE_5__.setLegacyDatahubBearerToken,
 };
 // ✅ Ensures `require("sodas-sdk")` works in CommonJS
 /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (sdk);
@@ -10380,7 +10400,8 @@ var __webpack_exports__TemplateDetailFunctionality = __webpack_exports__.Templat
 var __webpack_exports__asID = __webpack_exports__.asID;
 var __webpack_exports__asIRI = __webpack_exports__.asIRI;
 var __webpack_exports__default = __webpack_exports__["default"];
-var __webpack_exports__setBearerToken = __webpack_exports__.setBearerToken;
-export { __webpack_exports__ArtifactType as ArtifactType, __webpack_exports__BASIC_TYPE_VALUES as BASIC_TYPE_VALUES, __webpack_exports__CONVERSION_VALUES as CONVERSION_VALUES, __webpack_exports__Config as Config, __webpack_exports__DataService as DataService, __webpack_exports__Dataset as Dataset, __webpack_exports__DatasetSeries as DatasetSeries, __webpack_exports__Distribution as Distribution, __webpack_exports__MEASURE_VALUES as MEASURE_VALUES, __webpack_exports__ORIGIN_VALUES as ORIGIN_VALUES, __webpack_exports__ProfileType as ProfileType, __webpack_exports__ResourceDescriptorRole as ResourceDescriptorRole, __webpack_exports__SortOrder as SortOrder, __webpack_exports__TemplateDetailFunctionality as TemplateDetailFunctionality, __webpack_exports__asID as asID, __webpack_exports__asIRI as asIRI, __webpack_exports__default as default, __webpack_exports__setBearerToken as setBearerToken };
+var __webpack_exports__setGovernanceBearerToken = __webpack_exports__.setGovernanceBearerToken;
+var __webpack_exports__setLegacyDatahubBearerToken = __webpack_exports__.setLegacyDatahubBearerToken;
+export { __webpack_exports__ArtifactType as ArtifactType, __webpack_exports__BASIC_TYPE_VALUES as BASIC_TYPE_VALUES, __webpack_exports__CONVERSION_VALUES as CONVERSION_VALUES, __webpack_exports__Config as Config, __webpack_exports__DataService as DataService, __webpack_exports__Dataset as Dataset, __webpack_exports__DatasetSeries as DatasetSeries, __webpack_exports__Distribution as Distribution, __webpack_exports__MEASURE_VALUES as MEASURE_VALUES, __webpack_exports__ORIGIN_VALUES as ORIGIN_VALUES, __webpack_exports__ProfileType as ProfileType, __webpack_exports__ResourceDescriptorRole as ResourceDescriptorRole, __webpack_exports__SortOrder as SortOrder, __webpack_exports__TemplateDetailFunctionality as TemplateDetailFunctionality, __webpack_exports__asID as asID, __webpack_exports__asIRI as asIRI, __webpack_exports__default as default, __webpack_exports__setGovernanceBearerToken as setGovernanceBearerToken, __webpack_exports__setLegacyDatahubBearerToken as setLegacyDatahubBearerToken };
 
 //# sourceMappingURL=index.browser.js.map