From d492be6053eec60c2a4f9a3b2d501ad77485cd0d Mon Sep 17 00:00:00 2001
From: javierbrea <javier.brea@gmail.com>
Date: Thu, 16 Oct 2025 12:35:40 +0200
Subject: [PATCH 01/15] feat(#56): Support auth methods in confluence-sync

---
 .vscode/.gitignore                            |   1 +
 components/confluence-sync/CHANGELOG.md       |   6 +
 components/confluence-sync/package.json       |   4 +-
 .../src/ConfluenceSyncPages.types.ts          |  10 +-
 .../src/confluence/CustomConfluenceClient.ts  | 112 ++++++++++++++----
 .../CustomConfluenceClient.types.ts           |  41 ++++++-
 .../confluence/CustomConfluenceClient.test.ts |  73 +++++++-----
 .../unit/support/mocks/ConfluenceClient.ts    |   3 +
 pnpm-lock.yaml                                |  64 ++++++++--
 9 files changed, 245 insertions(+), 69 deletions(-)
 create mode 100644 .vscode/.gitignore

diff --git a/.vscode/.gitignore b/.vscode/.gitignore
new file mode 100644
index 00000000..559a9836
--- /dev/null
+++ b/.vscode/.gitignore
@@ -0,0 +1 @@
+mcp.json
diff --git a/components/confluence-sync/CHANGELOG.md b/components/confluence-sync/CHANGELOG.md
index dbd32f06..a280b537 100644
--- a/components/confluence-sync/CHANGELOG.md
+++ b/components/confluence-sync/CHANGELOG.md
@@ -11,6 +11,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 #### Deprecated
 #### Removed
 
+## Unreleased
+
+### Added
+
+* feat: Add authentication options (OAuth2, Basic, JWT). Deprecate personalAccessToken.
+
 ## [2.0.2] - 2025-07-11
 
 ### Fixed
diff --git a/components/confluence-sync/package.json b/components/confluence-sync/package.json
index bede107a..e3921aa3 100644
--- a/components/confluence-sync/package.json
+++ b/components/confluence-sync/package.json
@@ -58,9 +58,9 @@
     ]
   },
   "dependencies": {
-    "@mocks-server/logger": "2.0.0-beta.2",
     "axios": "1.6.7",
-    "confluence.js": "1.7.4",
+    "@mocks-server/logger": "2.0.0-beta.2",
+    "confluence.js": "2.1.0",
     "fastq": "1.17.1"
   },
   "devDependencies": {
diff --git a/components/confluence-sync/src/ConfluenceSyncPages.types.ts b/components/confluence-sync/src/ConfluenceSyncPages.types.ts
index 249ae3cd..da0ffef5 100644
--- a/components/confluence-sync/src/ConfluenceSyncPages.types.ts
+++ b/components/confluence-sync/src/ConfluenceSyncPages.types.ts
@@ -7,6 +7,7 @@ import type {
   ConfluencePage,
   ConfluencePageBasicInfo,
   ConfluenceId,
+  ConfluenceClientAuthenticationConfig,
 } from "./confluence/CustomConfluenceClient.types";
 
 export enum SyncModes {
@@ -56,8 +57,13 @@ export interface ConfluenceSyncPagesConfig {
   spaceId: string;
   /** Confluence page under which all pages will be synced */
   rootPageId?: ConfluenceId;
-  /** Confluence personal access token */
-  personalAccessToken: string;
+  /**
+   * Confluence personal access token. Use authentication.oauth2.accessToken instead
+   * @deprecated Use authentication.oauth2.accessToken instead
+   */
+  personalAccessToken?: string;
+  /** Authentication configuration */
+  authentication?: ConfluenceClientAuthenticationConfig;
   /** Log level */
   logLevel?: LogLevel;
   /** Dry run option */
diff --git a/components/confluence-sync/src/confluence/CustomConfluenceClient.ts b/components/confluence-sync/src/confluence/CustomConfluenceClient.ts
index 30d920ef..622be187 100644
--- a/components/confluence-sync/src/confluence/CustomConfluenceClient.ts
+++ b/components/confluence-sync/src/confluence/CustomConfluenceClient.ts
@@ -4,9 +4,8 @@
 import type { LoggerInterface } from "@mocks-server/logger";
 import type { Models } from "confluence.js";
 import { ConfluenceClient } from "confluence.js";
-import axios from "axios";
-
 import type {
+  ConfluenceClientAuthenticationConfig,
   Attachments,
   ConfluenceClientConfig,
   ConfluenceClientConstructor,
@@ -16,6 +15,7 @@ import type {
   ConfluenceId,
   CreatePageParams,
 } from "./CustomConfluenceClient.types";
+
 import { AttachmentsNotFoundError } from "./errors/AttachmentsNotFoundError";
 import { toConfluenceClientError } from "./errors/AxiosErrors";
 import { CreateAttachmentsError } from "./errors/CreateAttachmentsError";
@@ -26,6 +26,60 @@ import { UpdatePageError } from "./errors/UpdatePageError";
 
 const GET_CHILDREN_LIMIT = 100;
 
+/**
+ * Type guard to check if the authentication is basic
+ * @param auth - Object to check
+ * @returns True if the authentication is basic, false otherwise
+ */
+function isBasicAuthentication(
+  auth: ConfluenceClientAuthenticationConfig,
+): auth is { basic: { email: string; apiToken: string } } {
+  return (
+    (auth as { basic: { email: string; apiToken: string } }).basic !== undefined
+  );
+}
+
+/**
+ * Type guard to check if the authentication is OAuth2
+ * @param auth - Object to check
+ * @returns True if the authentication is OAuth2, false otherwise
+ */
+function isOAuth2Authentication(
+  auth: ConfluenceClientAuthenticationConfig,
+): auth is {
+  oauth2: { accessToken: string };
+} {
+  return (auth as { oauth2: { accessToken: string } }).oauth2 !== undefined;
+}
+
+/**
+ * Type guard to check if the authentication is JWT
+ * @param auth - Object to check
+ * @returns True if the authentication is JWT, false otherwise
+ */
+function isJWTAuthentication(
+  auth: ConfluenceClientAuthenticationConfig,
+): auth is {
+  jwt: { issuer: string; secret: string; expiryTimeSeconds?: number };
+} {
+  return (
+    (auth as { jwt: { issuer: string; secret: string } }).jwt !== undefined
+  );
+}
+
+function isAuthentication(
+  auth: unknown,
+): auth is ConfluenceClientAuthenticationConfig {
+  if (typeof auth !== "object" || auth === null) {
+    return false;
+  }
+  return (
+    isBasicAuthentication(auth as ConfluenceClientAuthenticationConfig) ||
+    isOAuth2Authentication(auth as ConfluenceClientAuthenticationConfig) ||
+    isJWTAuthentication(auth as ConfluenceClientAuthenticationConfig)
+  );
+}
+
 export const CustomConfluenceClient: ConfluenceClientConstructor = class CustomConfluenceClient
   implements ConfluenceClientInterface
 {
@@ -35,11 +89,27 @@ export const CustomConfluenceClient: ConfluenceClientConstructor = class CustomC
 
   constructor(config: ConfluenceClientConfig) {
     this._config = config;
+
+    if (
+      isAuthentication(config.authentication) === false &&
+      config.personalAccessToken === undefined
+    ) {
+      throw new Error(
+        "Either authentication or personalAccessToken must be provided",
+      );
+    }
+
+    const authentication = isAuthentication(config.authentication)
+      ? config.authentication
+      : {
+          oauth2: {
+            accessToken: config.personalAccessToken as string,
+          },
+        };
+
     this._client = new ConfluenceClient({
       host: config.url,
-      authentication: {
-        personalAccessToken: config.personalAccessToken,
-      },
+      authentication,
       apiPrefix: "/rest/",
     });
     this._logger = config.logger;
@@ -57,26 +127,19 @@ export const CustomConfluenceClient: ConfluenceClientConstructor = class CustomC
   ): Promise<Models.Content[]> {
     try {
       this._logger.silly(`Getting child pages of parent with id ${parentId}`);
-      const response = await axios.get<Models.ContentChildren>(
-        `${this._config.url}/rest/api/content/${parentId}/child`,
-        {
-          params: {
-            start,
-            limit: GET_CHILDREN_LIMIT,
-            expand: "page",
-          },
-          headers: {
-            accept: "application/json",
-            Authorization: `Bearer ${this._config.personalAccessToken}`,
-          },
-        },
-      );
+      const response: Models.ContentChildren =
+        await this._client.contentChildrenAndDescendants.getContentChildren({
+          id: parentId,
+          start,
+          limit: GET_CHILDREN_LIMIT,
+          expand: ["page"],
+        });
       this._logger.silly(
-        `Get child pages response of page ${parentId}, starting at ${start}: ${JSON.stringify(response.data, null, 2)}`,
+        `Get child pages response of page ${parentId}, starting at ${start}: ${JSON.stringify(response.page, null, 2)}`,
       );
 
-      const childrenResults = response.data.page?.results || [];
-      const size = response.data.page?.size || 0;
+      const childrenResults = response.page?.results || [];
+      const size = response.page?.size || 0;
 
       const allChildren: Models.Content[] = [
         ...otherChildren,
@@ -133,7 +196,10 @@ export const CustomConfluenceClient: ConfluenceClientConstructor = class CustomC
         ),
       };
     } catch (error) {
-      throw new PageNotFoundError(id, { cause: error });
+      if (!(error instanceof PageNotFoundError)) {
+        throw new PageNotFoundError(id, { cause: error });
+      }
+      throw error;
     }
   }
 
diff --git a/components/confluence-sync/src/confluence/CustomConfluenceClient.types.ts b/components/confluence-sync/src/confluence/CustomConfluenceClient.types.ts
index 8908ee7f..a1418564 100644
--- a/components/confluence-sync/src/confluence/CustomConfluenceClient.types.ts
+++ b/components/confluence-sync/src/confluence/CustomConfluenceClient.types.ts
@@ -30,10 +30,47 @@ export interface ConfluencePage {
   children?: ConfluencePageBasicInfo[];
 }
 
+export type ConfluenceClientBasicAuthenticationConfig = {
+  basic: {
+    /** Basic auth email */
+    email: string;
+    /** Basic auth API token */
+    apiToken: string;
+  };
+};
+
+export type ConfluenceClientOAuth2AuthenticationConfig = {
+  oauth2: {
+    /** OAuth2 access token */
+    accessToken: string;
+  };
+};
+
+export type ConfluenceClientJWTAuthenticationConfig = {
+  jwt: {
+    /** JWT issuer */
+    issuer: string;
+    /** JWT secret */
+    secret: string;
+    /** JWT expiry time in seconds */
+    expiryTimeSeconds?: number;
+  };
+};
+
+export type ConfluenceClientAuthenticationConfig =
+  | ConfluenceClientBasicAuthenticationConfig
+  | ConfluenceClientOAuth2AuthenticationConfig
+  | ConfluenceClientJWTAuthenticationConfig;
+
 /** Config for creating a Confluence client */
 export interface ConfluenceClientConfig {
-  /** Confluence personal access token */
-  personalAccessToken: string;
+  /**
+   * Confluence personal access token
+   * @deprecated Use authentication.oauth2.accessToken instead
+   **/
+  personalAccessToken?: string;
+  /** Confluence authentication configuration */
+  authentication?: ConfluenceClientAuthenticationConfig;
   /** Confluence url */
   url: string;
   /** Confluence space id */
diff --git a/components/confluence-sync/test/unit/specs/confluence/CustomConfluenceClient.test.ts b/components/confluence-sync/test/unit/specs/confluence/CustomConfluenceClient.test.ts
index 81d462fb..f57818c9 100644
--- a/components/confluence-sync/test/unit/specs/confluence/CustomConfluenceClient.test.ts
+++ b/components/confluence-sync/test/unit/specs/confluence/CustomConfluenceClient.test.ts
@@ -58,16 +58,18 @@ describe("customConfluenceClient class", () => {
       ] as Models.Content[],
     } as Models.Content;
 
-    jest.spyOn(axios, "get").mockResolvedValue({
-      data: {
-        page: {
-          results: [
-            { id: "foo-child-1-id", title: "foo-child-1" },
-            { id: "foo-child-2-id", title: "foo-child-2" },
-          ],
-        },
-      } as Models.ContentChildren,
-    } as AxiosResponse);
+    confluenceClient.contentChildrenAndDescendants.getContentChildren.mockImplementation(
+      () => {
+        return {
+          page: {
+            results: [
+              { id: "foo-child-1-id", title: "foo-child-1" },
+              { id: "foo-child-2-id", title: "foo-child-2" },
+            ],
+          },
+        };
+      },
+    );
   });
 
   describe("getPage method", () => {
@@ -116,17 +118,19 @@ describe("customConfluenceClient class", () => {
     });
 
     it("should throw a PageNotFoundError if axios.get throws an error when getting children", async () => {
-      jest
-        .spyOn(axios, "get")
-        .mockImplementation()
-        .mockRejectedValueOnce("foo-error");
+      confluenceClient.contentChildrenAndDescendants.getContentChildren.mockImplementation(
+        () => {
+          throw new Error("foo-error");
+        },
+      );
 
       await expect(customConfluenceClient.getPage("foo-id")).rejects.toThrow(
-        "Error getting page with id foo-id: foo-error",
+        "Error getting page with id foo-id: Error: foo-error",
       );
     });
 
     it("should call recursive getChildPages method to get all children of the page", async () => {
+      confluenceClient.contentChildrenAndDescendants.getContentChildren.mockReset();
       confluenceClient.content.getContentById.mockImplementation(() => ({
         title: "foo-title",
         id: "foo-id",
@@ -135,21 +139,25 @@ describe("customConfluenceClient class", () => {
           { id: "foo-id-ancestor", title: "foo-ancestor", type: "page" },
         ],
       }));
-      jest.spyOn(axios, "get").mockResolvedValue({
-        data: {
-          page: {
-            results: Array(100).fill({
-              id: "foo-child-1-id",
-              title: "foo-child-1",
-            }),
-            size: 1000,
-          },
-        } as Models.ContentChildren,
-      } as AxiosResponse);
+      confluenceClient.contentChildrenAndDescendants.getContentChildren.mockImplementation(
+        () => {
+          return {
+            page: {
+              results: Array(100).fill({
+                id: "foo-child-1-id",
+                title: "foo-child-1",
+              }),
+              size: 1000,
+            },
+          };
+        },
+      );
 
       const response = await customConfluenceClient.getPage("foo-id");
 
-      expect(axios.get).toHaveBeenCalledTimes(10);
+      expect(
+        confluenceClient.contentChildrenAndDescendants.getContentChildren,
+      ).toHaveBeenCalledTimes(10);
 
       expect(response.children).toHaveLength(1000);
     });
@@ -163,9 +171,14 @@ describe("customConfluenceClient class", () => {
           { id: "foo-id-ancestor", title: "foo-ancestor", type: "page" },
         ],
       }));
-      jest.spyOn(axios, "get").mockResolvedValue({
-        data: {} as Models.ContentChildren,
-      } as AxiosResponse);
+
+      confluenceClient.contentChildrenAndDescendants.getContentChildren.mockImplementation(
+        () => {
+          return {
+            data: {} as Models.ContentChildren,
+          };
+        },
+      );
 
       expect(
         async () => await customConfluenceClient.getPage("foo-id"),
diff --git a/components/confluence-sync/test/unit/support/mocks/ConfluenceClient.ts b/components/confluence-sync/test/unit/support/mocks/ConfluenceClient.ts
index 90fb7a08..00f967b8 100644
--- a/components/confluence-sync/test/unit/support/mocks/ConfluenceClient.ts
+++ b/components/confluence-sync/test/unit/support/mocks/ConfluenceClient.ts
@@ -12,6 +12,9 @@ export const confluenceClient = {
     updateContent: jest.fn().mockResolvedValue({}),
     deleteContent: jest.fn().mockResolvedValue({}),
   },
+  contentChildrenAndDescendants: {
+    getContentChildren: jest.fn().mockResolvedValue({}),
+  },
   contentAttachments: {
     getAttachments: jest.fn().mockResolvedValue({}),
     createAttachments: jest.fn().mockResolvedValue({}),
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 68d80e6b..db7b82b4 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -112,8 +112,8 @@ importers:
         specifier: 1.6.7
         version: 1.6.7
       confluence.js:
-        specifier: 1.7.4
-        version: 1.7.4
+        specifier: 2.1.0
+        version: 2.1.0
       fastq:
         specifier: 1.17.1
         version: 1.17.1
@@ -341,6 +341,10 @@ packages:
   '@antfu/utils@8.1.1':
     resolution: {integrity: sha512-Mex9nXf9vR6AhcXmMrlz/HVgYYZpVGJ6YlPgwl7UnaFpnshXs6EK/oa5Gpf3CzENMjkvEx2tQtntGnb7UtSTOQ==}
 
+  '@atlassian/atlassian-jwt@2.2.0':
+    resolution: {integrity: sha512-h6hLnbRFTEVOB0xa8n0TfQCDZ1hUPFGClrbQbO9ryIGeEsNGG2Vy2S8BWrYJBQrirMmj+FHfVVsbs1M9DIC80Q==}
+    engines: {node: '>= 0.4.0'}
+
   '@babel/code-frame@7.26.2':
     resolution: {integrity: sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==}
     engines: {node: '>=6.9.0'}
@@ -2384,6 +2388,10 @@ packages:
   confluence.js@1.7.4:
     resolution: {integrity: sha512-MBTpAQ5EHTnVAaMDlTiRMqJau5EMejnoZMrvE/2QsMZo7dFw+OgadLIKr43mYQcN/qZ0Clagw0iHb4A3FaC5OQ==}
 
+  confluence.js@2.1.0:
+    resolution: {integrity: sha512-MNu62y7aHABER3cmwKwKeCdxTZFe1sfvhDyhN/7ikaZnN7p4B9igJVJkgvLW2JTLsQ+3GGbQ4D18KkZIdfKGaw==}
+    engines: {node: '>=20'}
+
   content-disposition@0.5.4:
     resolution: {integrity: sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==}
     engines: {node: '>= 0.6'}
@@ -3273,6 +3281,10 @@ packages:
     resolution: {integrity: sha512-hGfm/slu0ZabnNt4oaRZ6uREyfCj6P4fT/n6A1rGV+Z0VdGXjfOhVUpkn6qVQONHGIFwmveGXyDs75+nr6FM8w==}
     engines: {node: '>= 6'}
 
+  form-data@4.0.4:
+    resolution: {integrity: sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==}
+    engines: {node: '>= 6'}
+
   format@0.2.2:
     resolution: {integrity: sha512-wzsgA6WOq+09wrU1tsJ09udeR/YZRaeArL9e1wPbFg3GG2yDnC2ldKpxs4xunpFF9DgqCqOIra3bc1HWrJ37Ww==}
     engines: {node: '>=0.4.x'}
@@ -6106,6 +6118,9 @@ packages:
   zod@3.23.8:
     resolution: {integrity: sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==}
 
+  zod@3.25.76:
+    resolution: {integrity: sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ==}
+
   zwitch@1.0.5:
     resolution: {integrity: sha512-V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw==}
 
@@ -6126,6 +6141,14 @@ snapshots:
 
   '@antfu/utils@8.1.1': {}
 
+  '@atlassian/atlassian-jwt@2.2.0':
+    dependencies:
+      express: 4.18.1
+      jsuri: 1.3.1
+      lodash: 4.17.21
+    transitivePeerDependencies:
+      - supports-color
+
   '@babel/code-frame@7.26.2':
     dependencies:
       '@babel/helper-validator-identifier': 7.25.9
@@ -8201,10 +8224,10 @@ snapshots:
     dependencies:
       possible-typed-array-names: 1.1.0
 
-  axios@1.10.0:
+  axios@1.10.0(debug@4.3.7):
     dependencies:
       follow-redirects: 1.15.9(debug@4.3.7)
-      form-data: 4.0.2
+      form-data: 4.0.4
       proxy-from-env: 1.1.0
     transitivePeerDependencies:
       - debug
@@ -8212,12 +8235,12 @@ snapshots:
   axios@1.6.7:
     dependencies:
       follow-redirects: 1.15.9(debug@4.3.7)
-      form-data: 4.0.2
+      form-data: 4.0.4
       proxy-from-env: 1.1.0
     transitivePeerDependencies:
       - debug
 
-  axios@1.8.4(debug@4.3.7):
+  axios@1.8.4:
     dependencies:
       follow-redirects: 1.15.9(debug@4.3.7)
       form-data: 4.0.2
@@ -8651,13 +8674,24 @@ snapshots:
   confluence.js@1.7.4:
     dependencies:
       atlassian-jwt: 2.0.3
-      axios: 1.10.0
+      axios: 1.10.0(debug@4.3.7)
       form-data: 4.0.2
       oauth: 0.10.2
       tslib: 2.8.1
     transitivePeerDependencies:
       - debug
 
+  confluence.js@2.1.0:
+    dependencies:
+      '@atlassian/atlassian-jwt': 2.2.0
+      axios: 1.10.0(debug@4.3.7)
+      form-data: 4.0.4
+      oauth: 0.10.2
+      zod: 3.25.76
+    transitivePeerDependencies:
+      - debug
+      - supports-color
+
   content-disposition@0.5.4:
     dependencies:
       safe-buffer: 5.2.1
@@ -9733,6 +9767,14 @@ snapshots:
       es-set-tostringtag: 2.1.0
       mime-types: 2.1.35
 
+  form-data@4.0.4:
+    dependencies:
+      asynckit: 0.4.0
+      combined-stream: 1.0.8
+      es-set-tostringtag: 2.1.0
+      hasown: 2.0.2
+      mime-types: 2.1.35
+
   format@0.2.2: {}
 
   formidable@2.1.2:
@@ -11954,7 +11996,7 @@ snapshots:
       '@yarnpkg/lockfile': 1.1.0
       '@yarnpkg/parsers': 3.0.2
       '@zkochan/js-yaml': 0.0.7
-      axios: 1.8.4(debug@4.3.7)
+      axios: 1.8.4
       chalk: 4.1.2
       cli-cursor: 3.1.0
       cli-spinners: 2.6.1
@@ -12943,7 +12985,7 @@ snapshots:
       cookiejar: 2.1.4
       debug: 4.4.0
       fast-safe-stringify: 2.1.1
-      form-data: 4.0.2
+      form-data: 4.0.4
       formidable: 2.1.2
       methods: 1.1.2
       mime: 2.6.0
@@ -13384,7 +13426,7 @@ snapshots:
 
   wait-on@8.0.1(debug@4.3.7):
     dependencies:
-      axios: 1.8.4(debug@4.3.7)
+      axios: 1.10.0(debug@4.3.7)
       joi: 17.13.3
       lodash: 4.17.21
       minimist: 1.2.8
@@ -13575,6 +13617,8 @@ snapshots:
 
   zod@3.23.8: {}
 
+  zod@3.25.76: {}
+
   zwitch@1.0.5: {}
 
   zwitch@2.0.4: {}

From 8536cdab54e4899b6db550560802c8a3bf73a44e Mon Sep 17 00:00:00 2001
From: javierbrea <javier.brea@gmail.com>
Date: Thu, 16 Oct 2025 12:45:18 +0200
Subject: [PATCH 02/15] test: Add unit tests

---
 .../confluence/CustomConfluenceClient.test.ts | 172 +++++++++++++++++-
 1 file changed, 171 insertions(+), 1 deletion(-)

diff --git a/components/confluence-sync/test/unit/specs/confluence/CustomConfluenceClient.test.ts b/components/confluence-sync/test/unit/specs/confluence/CustomConfluenceClient.test.ts
index f57818c9..0eb860ff 100644
--- a/components/confluence-sync/test/unit/specs/confluence/CustomConfluenceClient.test.ts
+++ b/components/confluence-sync/test/unit/specs/confluence/CustomConfluenceClient.test.ts
@@ -4,7 +4,7 @@
 import type { LoggerInterface } from "@mocks-server/logger";
 import { Logger } from "@mocks-server/logger";
 import type { AxiosResponse } from "axios";
-import axios, { AxiosError } from "axios";
+import { AxiosError } from "axios";
 import type { Models } from "confluence.js";
 
 import { cleanLogs } from "@support/Logs";
@@ -72,6 +72,176 @@ describe("customConfluenceClient class", () => {
     );
   });
 
+  describe("constructor - authentication methods", () => {
+    beforeEach(() => {
+      jest.clearAllMocks();
+    });
+
+    describe("when using personalAccessToken (deprecated)", () => {
+      it("should create a client with OAuth2 authentication using personalAccessToken", () => {
+        const configWithToken = {
+          spaceId: "foo-space-id",
+          url: "foo-url",
+          personalAccessToken: "foo-token",
+          logger,
+        };
+
+        expect(() => new CustomConfluenceClient(configWithToken)).not.toThrow();
+      });
+
+      it("should prioritize authentication config over personalAccessToken", () => {
+        const configWithBoth = {
+          spaceId: "foo-space-id",
+          url: "foo-url",
+          personalAccessToken: "foo-token",
+          authentication: {
+            basic: {
+              email: "test@example.com",
+              apiToken: "basic-token",
+            },
+          },
+          logger,
+        };
+
+        expect(() => new CustomConfluenceClient(configWithBoth)).not.toThrow();
+      });
+    });
+
+    describe("when using basic authentication", () => {
+      it("should create a client with basic authentication", () => {
+        const configWithBasic = {
+          spaceId: "foo-space-id",
+          url: "foo-url",
+          authentication: {
+            basic: {
+              email: "test@example.com",
+              apiToken: "basic-token",
+            },
+          },
+          logger,
+        };
+
+        expect(() => new CustomConfluenceClient(configWithBasic)).not.toThrow();
+      });
+    });
+
+    describe("when using OAuth2 authentication", () => {
+      it("should create a client with OAuth2 authentication", () => {
+        const configWithOAuth2 = {
+          spaceId: "foo-space-id",
+          url: "foo-url",
+          authentication: {
+            oauth2: {
+              accessToken: "oauth2-token",
+            },
+          },
+          logger,
+        };
+
+        expect(
+          () => new CustomConfluenceClient(configWithOAuth2),
+        ).not.toThrow();
+      });
+    });
+
+    describe("when using JWT authentication", () => {
+      it("should create a client with JWT authentication", () => {
+        const configWithJWT = {
+          spaceId: "foo-space-id",
+          url: "foo-url",
+          authentication: {
+            jwt: {
+              issuer: "test-issuer",
+              secret: "test-secret",
+            },
+          },
+          logger,
+        };
+
+        expect(() => new CustomConfluenceClient(configWithJWT)).not.toThrow();
+      });
+
+      it("should create a client with JWT authentication including expiryTimeSeconds", () => {
+        const configWithJWTAndExpiry = {
+          spaceId: "foo-space-id",
+          url: "foo-url",
+          authentication: {
+            jwt: {
+              issuer: "test-issuer",
+              secret: "test-secret",
+              expiryTimeSeconds: 3600,
+            },
+          },
+          logger,
+        };
+
+        expect(
+          () => new CustomConfluenceClient(configWithJWTAndExpiry),
+        ).not.toThrow();
+      });
+    });
+
+    describe("when no authentication is provided", () => {
+      it("should throw an error when neither authentication nor personalAccessToken is provided", () => {
+        const configWithoutAuth = {
+          spaceId: "foo-space-id",
+          url: "foo-url",
+          logger,
+        };
+
+        expect(() => new CustomConfluenceClient(configWithoutAuth)).toThrow(
+          "Either authentication or personalAccessToken must be provided",
+        );
+      });
+
+      it("should throw an error when authentication is null", () => {
+        const configWithNullAuth = {
+          spaceId: "foo-space-id",
+          url: "foo-url",
+          authentication: null,
+          logger,
+        };
+
+        // @ts-expect-error - Testing invalid authentication type
+        expect(() => new CustomConfluenceClient(configWithNullAuth)).toThrow(
+          "Either authentication or personalAccessToken must be provided",
+        );
+      });
+
+      it("should throw an error when authentication is an empty object", () => {
+        const configWithEmptyAuth = {
+          spaceId: "foo-space-id",
+          url: "foo-url",
+          authentication: {},
+          logger,
+        };
+
+        // @ts-expect-error - Testing invalid authentication type
+        expect(() => new CustomConfluenceClient(configWithEmptyAuth)).toThrow(
+          "Either authentication or personalAccessToken must be provided",
+        );
+      });
+
+      it("should throw an error when authentication has invalid structure", () => {
+        const configWithInvalidAuth = {
+          spaceId: "foo-space-id",
+          url: "foo-url",
+          authentication: {
+            invalid: {
+              token: "some-token",
+            },
+          },
+          logger,
+        };
+
+        // @ts-expect-error - Testing invalid authentication type
+        expect(() => new CustomConfluenceClient(configWithInvalidAuth)).toThrow(
+          "Either authentication or personalAccessToken must be provided",
+        );
+      });
+    });
+  });
+
   describe("getPage method", () => {
     it("should call confluence.js lib to get a page getting the body, ancestors, version and children, and passing the id", async () => {
       await customConfluenceClient.getPage("foo-id");

From 54e0678a66a5ba48285ec72afaf0bede6006dfea Mon Sep 17 00:00:00 2001
From: javierbrea <javier.brea@gmail.com>
Date: Thu, 16 Oct 2025 12:49:52 +0200
Subject: [PATCH 03/15] test: Improve unit tests

---
 .../confluence/CustomConfluenceClient.test.ts | 87 ++++++++++++++++---
 .../unit/support/mocks/ConfluenceClient.ts    | 13 ++-
 2 files changed, 82 insertions(+), 18 deletions(-)

diff --git a/components/confluence-sync/test/unit/specs/confluence/CustomConfluenceClient.test.ts b/components/confluence-sync/test/unit/specs/confluence/CustomConfluenceClient.test.ts
index 0eb860ff..b37bb82a 100644
--- a/components/confluence-sync/test/unit/specs/confluence/CustomConfluenceClient.test.ts
+++ b/components/confluence-sync/test/unit/specs/confluence/CustomConfluenceClient.test.ts
@@ -8,7 +8,10 @@ import { AxiosError } from "axios";
 import type { Models } from "confluence.js";
 
 import { cleanLogs } from "@support/Logs";
-import { confluenceClient } from "@support/mocks/ConfluenceClient";
+import {
+  confluenceClient,
+  ConfluenceClientConstructor,
+} from "@support/mocks/ConfluenceClient";
 
 import { CustomConfluenceClient } from "@src/confluence/CustomConfluenceClient";
 import type {
@@ -47,6 +50,7 @@ describe("customConfluenceClient class", () => {
       version: 1,
       ancestors: [{ id: "foo-id-ancestor", title: "foo-ancestor" }],
     };
+    ConfluenceClientConstructor.mockClear();
     customConfluenceClient = new CustomConfluenceClient(config);
 
     defaultResponse = {
@@ -86,7 +90,17 @@ describe("customConfluenceClient class", () => {
           logger,
         };
 
-        expect(() => new CustomConfluenceClient(configWithToken)).not.toThrow();
+        new CustomConfluenceClient(configWithToken);
+
+        expect(ConfluenceClientConstructor).toHaveBeenCalledWith({
+          host: "foo-url",
+          authentication: {
+            oauth2: {
+              accessToken: "foo-token",
+            },
+          },
+          apiPrefix: "/rest/",
+        });
       });
 
       it("should prioritize authentication config over personalAccessToken", () => {
@@ -103,7 +117,18 @@ describe("customConfluenceClient class", () => {
           logger,
         };
 
-        expect(() => new CustomConfluenceClient(configWithBoth)).not.toThrow();
+        new CustomConfluenceClient(configWithBoth);
+
+        expect(ConfluenceClientConstructor).toHaveBeenCalledWith({
+          host: "foo-url",
+          authentication: {
+            basic: {
+              email: "test@example.com",
+              apiToken: "basic-token",
+            },
+          },
+          apiPrefix: "/rest/",
+        });
       });
     });
 
@@ -121,7 +146,18 @@ describe("customConfluenceClient class", () => {
           logger,
         };
 
-        expect(() => new CustomConfluenceClient(configWithBasic)).not.toThrow();
+        new CustomConfluenceClient(configWithBasic);
+
+        expect(ConfluenceClientConstructor).toHaveBeenCalledWith({
+          host: "foo-url",
+          authentication: {
+            basic: {
+              email: "test@example.com",
+              apiToken: "basic-token",
+            },
+          },
+          apiPrefix: "/rest/",
+        });
       });
     });
 
@@ -138,9 +174,17 @@ describe("customConfluenceClient class", () => {
           logger,
         };
 
-        expect(
-          () => new CustomConfluenceClient(configWithOAuth2),
-        ).not.toThrow();
+        new CustomConfluenceClient(configWithOAuth2);
+
+        expect(ConfluenceClientConstructor).toHaveBeenCalledWith({
+          host: "foo-url",
+          authentication: {
+            oauth2: {
+              accessToken: "oauth2-token",
+            },
+          },
+          apiPrefix: "/rest/",
+        });
       });
     });
 
@@ -158,7 +202,18 @@ describe("customConfluenceClient class", () => {
           logger,
         };
 
-        expect(() => new CustomConfluenceClient(configWithJWT)).not.toThrow();
+        new CustomConfluenceClient(configWithJWT);
+
+        expect(ConfluenceClientConstructor).toHaveBeenCalledWith({
+          host: "foo-url",
+          authentication: {
+            jwt: {
+              issuer: "test-issuer",
+              secret: "test-secret",
+            },
+          },
+          apiPrefix: "/rest/",
+        });
       });
 
       it("should create a client with JWT authentication including expiryTimeSeconds", () => {
@@ -175,9 +230,19 @@ describe("customConfluenceClient class", () => {
           logger,
         };
 
-        expect(
-          () => new CustomConfluenceClient(configWithJWTAndExpiry),
-        ).not.toThrow();
+        new CustomConfluenceClient(configWithJWTAndExpiry);
+
+        expect(ConfluenceClientConstructor).toHaveBeenCalledWith({
+          host: "foo-url",
+          authentication: {
+            jwt: {
+              issuer: "test-issuer",
+              secret: "test-secret",
+              expiryTimeSeconds: 3600,
+            },
+          },
+          apiPrefix: "/rest/",
+        });
       });
     });
 
diff --git a/components/confluence-sync/test/unit/support/mocks/ConfluenceClient.ts b/components/confluence-sync/test/unit/support/mocks/ConfluenceClient.ts
index 00f967b8..ade75afc 100644
--- a/components/confluence-sync/test/unit/support/mocks/ConfluenceClient.ts
+++ b/components/confluence-sync/test/unit/support/mocks/ConfluenceClient.ts
@@ -21,10 +21,9 @@ export const confluenceClient = {
   },
 };
 
-/* ts ignore next line because it expects a mock with the same parameters as the confluence client
- * but there are a lot of them useless for the test */
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore-next-line
-jest.spyOn(confluenceLibrary, "ConfluenceClient").mockImplementation(() => {
-  return confluenceClient;
-});
+export const ConfluenceClientConstructor = jest
+  .spyOn(confluenceLibrary, "ConfluenceClient")
+  // @ts-expect-error The mock has not all methods
+  .mockImplementation(() => {
+    return confluenceClient;
+  });

From e8143e14d88cd99463e26c991f8d6f9288e94fe5 Mon Sep 17 00:00:00 2001
From: javierbrea <javier.brea@gmail.com>
Date: Thu, 16 Oct 2025 13:54:01 +0200
Subject: [PATCH 04/15] feat(#56): Change error handling due to changes in
 confluence-client. Adapt tests

---
 .../src/confluence/CustomConfluenceClient.ts  | 20 +++++---
 .../errors/AttachmentsNotFoundError.ts        |  7 ++-
 .../src/confluence/errors/AxiosErrors.ts      | 10 +++-
 .../errors/CreateAttachmentsError.ts          |  8 +++-
 .../src/confluence/errors/CreatePageError.ts  |  8 +++-
 .../src/confluence/errors/CustomError.ts      |  5 ++
 .../src/confluence/errors/DeletePageError.ts  | 11 ++++-
 .../src/confluence/errors/ErrorHelpers.ts     |  9 ++++
 .../confluence/errors/PageNotFoundError.ts    | 11 ++++-
 .../src/confluence/errors/UnknownError.ts     | 10 ++++
 .../src/confluence/errors/UpdatePageError.ts  |  8 +++-
 .../errors/axios/BadRequestError.ts           |  4 +-
 .../errors/axios/InternalServerError.ts       |  3 +-
 .../errors/axios/UnauthorizedError.ts         |  3 +-
 .../errors/axios/UnexpectedError.ts           |  4 +-
 .../errors/axios/UnknownAxiosError.ts         |  4 +-
 .../test/component/specs/Sync.spec.ts         | 12 ++---
 .../confluence/CustomConfluenceClient.test.ts | 47 ++++++++++++-------
 18 files changed, 134 insertions(+), 50 deletions(-)
 create mode 100644 components/confluence-sync/src/confluence/errors/CustomError.ts
 create mode 100644 components/confluence-sync/src/confluence/errors/ErrorHelpers.ts
 create mode 100644 components/confluence-sync/src/confluence/errors/UnknownError.ts

diff --git a/components/confluence-sync/src/confluence/CustomConfluenceClient.ts b/components/confluence-sync/src/confluence/CustomConfluenceClient.ts
index 622be187..6e5c86e8 100644
--- a/components/confluence-sync/src/confluence/CustomConfluenceClient.ts
+++ b/components/confluence-sync/src/confluence/CustomConfluenceClient.ts
@@ -23,6 +23,7 @@ import { CreatePageError } from "./errors/CreatePageError";
 import { DeletePageError } from "./errors/DeletePageError";
 import { PageNotFoundError } from "./errors/PageNotFoundError";
 import { UpdatePageError } from "./errors/UpdatePageError";
+import { CustomError } from "./errors/CustomError";
 
 const GET_CHILDREN_LIMIT = 100;
 
@@ -155,7 +156,8 @@ export const CustomConfluenceClient: ConfluenceClientConstructor = class CustomC
       }
 
       return allChildren;
-    } catch (error) {
+    } catch (e) {
+      const error = toConfluenceClientError(e);
       throw new PageNotFoundError(parentId, { cause: error });
     }
   }
@@ -195,11 +197,12 @@ export const CustomConfluenceClient: ConfluenceClientConstructor = class CustomC
           this._convertToConfluencePageBasicInfo(child),
         ),
       };
-    } catch (error) {
-      if (!(error instanceof PageNotFoundError)) {
+    } catch (e) {
+      if (!(e instanceof CustomError)) {
+        const error = toConfluenceClientError(e);
         throw new PageNotFoundError(id, { cause: error });
       }
-      throw error;
+      throw e;
     }
   }
 
@@ -313,7 +316,8 @@ export const CustomConfluenceClient: ConfluenceClientConstructor = class CustomC
       try {
         this._logger.silly(`Deleting content with id ${id}`);
         await this._client.content.deleteContent({ id });
-      } catch (error) {
+      } catch (e) {
+        const error = toConfluenceClientError(e);
         throw new DeletePageError(id, { cause: error });
       }
     } else {
@@ -338,7 +342,8 @@ export const CustomConfluenceClient: ConfluenceClientConstructor = class CustomC
           title: attachment.title,
         })) || []
       );
-    } catch (error) {
+    } catch (e) {
+      const error = toConfluenceClientError(e);
       throw new AttachmentsNotFoundError(id, { cause: error });
     }
   }
@@ -366,7 +371,8 @@ export const CustomConfluenceClient: ConfluenceClientConstructor = class CustomC
         this._logger.silly(
           `Create attachments response: ${JSON.stringify(response, null, 2)}`,
         );
-      } catch (error) {
+      } catch (e) {
+        const error = toConfluenceClientError(e);
         throw new CreateAttachmentsError(id, { cause: error });
       }
     } else {
diff --git a/components/confluence-sync/src/confluence/errors/AttachmentsNotFoundError.ts b/components/confluence-sync/src/confluence/errors/AttachmentsNotFoundError.ts
index fc83e9d9..b8179c8e 100644
--- a/components/confluence-sync/src/confluence/errors/AttachmentsNotFoundError.ts
+++ b/components/confluence-sync/src/confluence/errors/AttachmentsNotFoundError.ts
@@ -1,10 +1,13 @@
 // SPDX-FileCopyrightText: 2024 Telefónica Innovación Digital
 // SPDX-License-Identifier: Apache-2.0
 
-export class AttachmentsNotFoundError extends Error {
+import { CustomError } from "./CustomError";
+import { getCauseMessage } from "./ErrorHelpers";
+
+export class AttachmentsNotFoundError extends CustomError {
   constructor(id: string, options?: ErrorOptions) {
     super(
-      `Error getting attachments of page with id ${id}: ${options?.cause}`,
+      `Error getting attachments of page with id ${id}: ${getCauseMessage(options?.cause)}`,
       options,
     );
   }
diff --git a/components/confluence-sync/src/confluence/errors/AxiosErrors.ts b/components/confluence-sync/src/confluence/errors/AxiosErrors.ts
index 6f1c0119..94835af4 100644
--- a/components/confluence-sync/src/confluence/errors/AxiosErrors.ts
+++ b/components/confluence-sync/src/confluence/errors/AxiosErrors.ts
@@ -9,8 +9,11 @@ import { InternalServerError } from "./axios/InternalServerError";
 import { UnauthorizedError } from "./axios/UnauthorizedError";
 import { UnexpectedError } from "./axios/UnexpectedError";
 import { UnknownAxiosError } from "./axios/UnknownAxiosError";
+import { UnknownError } from "./UnknownError";
 
-export function toConfluenceClientError(error: unknown): Error {
+import { CustomError } from "./CustomError";
+
+export function toConfluenceClientError(error: unknown): CustomError {
   if ((error as AxiosError).name === "AxiosError") {
     const axiosError = error as AxiosError;
     if (axiosError.response?.status === HttpStatusCode.BadRequest) {
@@ -28,5 +31,8 @@ export function toConfluenceClientError(error: unknown): Error {
 
     return new UnknownAxiosError(axiosError);
   }
-  return new UnexpectedError(error);
+  if (!error) {
+    return new UnknownError();
+  }
+  return new UnexpectedError((error as Error).message || error);
 }
diff --git a/components/confluence-sync/src/confluence/errors/CreateAttachmentsError.ts b/components/confluence-sync/src/confluence/errors/CreateAttachmentsError.ts
index 315bd662..15808d21 100644
--- a/components/confluence-sync/src/confluence/errors/CreateAttachmentsError.ts
+++ b/components/confluence-sync/src/confluence/errors/CreateAttachmentsError.ts
@@ -1,10 +1,14 @@
 // SPDX-FileCopyrightText: 2024 Telefónica Innovación Digital
 // SPDX-License-Identifier: Apache-2.0
 
-export class CreateAttachmentsError extends Error {
+import { CustomError } from "./CustomError";
+
+import { getCauseMessage } from "./ErrorHelpers";
+
+export class CreateAttachmentsError extends CustomError {
   constructor(id: string, options?: ErrorOptions) {
     super(
-      `Error creating attachments of page with id ${id}: ${options?.cause}`,
+      `Error creating attachments of page with id ${id}: ${getCauseMessage(options?.cause)}`,
       options,
     );
   }
diff --git a/components/confluence-sync/src/confluence/errors/CreatePageError.ts b/components/confluence-sync/src/confluence/errors/CreatePageError.ts
index 8584ea08..69524bc8 100644
--- a/components/confluence-sync/src/confluence/errors/CreatePageError.ts
+++ b/components/confluence-sync/src/confluence/errors/CreatePageError.ts
@@ -1,10 +1,14 @@
 // SPDX-FileCopyrightText: 2024 Telefónica Innovación Digital
 // SPDX-License-Identifier: Apache-2.0
 
-export class CreatePageError extends Error {
+import { CustomError } from "./CustomError";
+
+import { getCauseMessage } from "./ErrorHelpers";
+
+export class CreatePageError extends CustomError {
   constructor(title: string, options?: ErrorOptions) {
     super(
-      `Error creating page with title ${title}: ${options?.cause}`,
+      `Error creating page with title ${title}: ${getCauseMessage(options?.cause)}`,
       options,
     );
   }
diff --git a/components/confluence-sync/src/confluence/errors/CustomError.ts b/components/confluence-sync/src/confluence/errors/CustomError.ts
new file mode 100644
index 00000000..7ce4f5fa
--- /dev/null
+++ b/components/confluence-sync/src/confluence/errors/CustomError.ts
@@ -0,0 +1,5 @@
+export class CustomError extends Error {
+  constructor(...args: ConstructorParameters<typeof Error>) {
+    super(...args);
+  }
+}
diff --git a/components/confluence-sync/src/confluence/errors/DeletePageError.ts b/components/confluence-sync/src/confluence/errors/DeletePageError.ts
index 7eed00fe..ea3ac7d5 100644
--- a/components/confluence-sync/src/confluence/errors/DeletePageError.ts
+++ b/components/confluence-sync/src/confluence/errors/DeletePageError.ts
@@ -1,8 +1,15 @@
 // SPDX-FileCopyrightText: 2024 Telefónica Innovación Digital
 // SPDX-License-Identifier: Apache-2.0
 
-export class DeletePageError extends Error {
+import { CustomError } from "./CustomError";
+
+import { getCauseMessage } from "./ErrorHelpers";
+
+export class DeletePageError extends CustomError {
   constructor(id: string, options?: ErrorOptions) {
-    super(`Error deleting content with id ${id}: ${options?.cause}`, options);
+    super(
+      `Error deleting content with id ${id}: ${getCauseMessage(options?.cause)}`,
+      options,
+    );
   }
 }
diff --git a/components/confluence-sync/src/confluence/errors/ErrorHelpers.ts b/components/confluence-sync/src/confluence/errors/ErrorHelpers.ts
new file mode 100644
index 00000000..450c22d0
--- /dev/null
+++ b/components/confluence-sync/src/confluence/errors/ErrorHelpers.ts
@@ -0,0 +1,9 @@
+/**
+ * Returns the error message from the cause if it is an instance of Error, otherwise returns the cause itself.
+ * @param cause Cause of an error. It might be another error, or a string usually
+ * @returns The message to print
+ */
+export function getCauseMessage(cause: unknown) {
+  /* istanbul ignore next */
+  return cause instanceof Error ? cause.message : cause;
+}
diff --git a/components/confluence-sync/src/confluence/errors/PageNotFoundError.ts b/components/confluence-sync/src/confluence/errors/PageNotFoundError.ts
index 61e0b599..2a98c5ff 100644
--- a/components/confluence-sync/src/confluence/errors/PageNotFoundError.ts
+++ b/components/confluence-sync/src/confluence/errors/PageNotFoundError.ts
@@ -1,8 +1,15 @@
 // SPDX-FileCopyrightText: 2024 Telefónica Innovación Digital
 // SPDX-License-Identifier: Apache-2.0
 
-export class PageNotFoundError extends Error {
+import { CustomError } from "./CustomError";
+
+import { getCauseMessage } from "./ErrorHelpers";
+
+export class PageNotFoundError extends CustomError {
   constructor(id: string, options?: ErrorOptions) {
-    super(`Error getting page with id ${id}: ${options?.cause}`, options);
+    super(
+      `Error getting page with id ${id}: ${getCauseMessage(options?.cause)}`,
+      options,
+    );
   }
 }
diff --git a/components/confluence-sync/src/confluence/errors/UnknownError.ts b/components/confluence-sync/src/confluence/errors/UnknownError.ts
new file mode 100644
index 00000000..7cfa9803
--- /dev/null
+++ b/components/confluence-sync/src/confluence/errors/UnknownError.ts
@@ -0,0 +1,10 @@
+// SPDX-FileCopyrightText: 2024 Telefónica Innovación Digital
+// SPDX-License-Identifier: Apache-2.0
+
+import { CustomError } from "./CustomError";
+
+export class UnknownError extends CustomError {
+  constructor() {
+    super(`Unknown Error`);
+  }
+}
diff --git a/components/confluence-sync/src/confluence/errors/UpdatePageError.ts b/components/confluence-sync/src/confluence/errors/UpdatePageError.ts
index aa880e5d..8130a646 100644
--- a/components/confluence-sync/src/confluence/errors/UpdatePageError.ts
+++ b/components/confluence-sync/src/confluence/errors/UpdatePageError.ts
@@ -1,10 +1,14 @@
 // SPDX-FileCopyrightText: 2024 Telefónica Innovación Digital
 // SPDX-License-Identifier: Apache-2.0
 
-export class UpdatePageError extends Error {
+import { CustomError } from "./CustomError";
+
+import { getCauseMessage } from "./ErrorHelpers";
+
+export class UpdatePageError extends CustomError {
   constructor(id: string, title: string, options?: ErrorOptions) {
     super(
-      `Error updating page with id ${id} and title ${title}: ${options?.cause}`,
+      `Error updating page with id ${id} and title ${title}: ${getCauseMessage(options?.cause)}`,
       options,
     );
   }
diff --git a/components/confluence-sync/src/confluence/errors/axios/BadRequestError.ts b/components/confluence-sync/src/confluence/errors/axios/BadRequestError.ts
index 7d2a5e16..9e078474 100644
--- a/components/confluence-sync/src/confluence/errors/axios/BadRequestError.ts
+++ b/components/confluence-sync/src/confluence/errors/axios/BadRequestError.ts
@@ -1,9 +1,9 @@
 // SPDX-FileCopyrightText: 2024 Telefónica Innovación Digital
 // SPDX-License-Identifier: Apache-2.0
-
+import { CustomError } from "../CustomError";
 import type { AxiosError } from "axios";
 
-export class BadRequestError extends Error {
+export class BadRequestError extends CustomError {
   constructor(error: AxiosError) {
     super(
       `Bad Request
diff --git a/components/confluence-sync/src/confluence/errors/axios/InternalServerError.ts b/components/confluence-sync/src/confluence/errors/axios/InternalServerError.ts
index 9bb11808..898181b1 100644
--- a/components/confluence-sync/src/confluence/errors/axios/InternalServerError.ts
+++ b/components/confluence-sync/src/confluence/errors/axios/InternalServerError.ts
@@ -2,8 +2,9 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import type { AxiosError } from "axios";
+import { CustomError } from "../CustomError";
 
-export class InternalServerError extends Error {
+export class InternalServerError extends CustomError {
   constructor(error: AxiosError) {
     super(
       `Internal Server Error
diff --git a/components/confluence-sync/src/confluence/errors/axios/UnauthorizedError.ts b/components/confluence-sync/src/confluence/errors/axios/UnauthorizedError.ts
index ccab5d06..15959844 100644
--- a/components/confluence-sync/src/confluence/errors/axios/UnauthorizedError.ts
+++ b/components/confluence-sync/src/confluence/errors/axios/UnauthorizedError.ts
@@ -2,8 +2,9 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import type { AxiosError } from "axios";
+import { CustomError } from "../CustomError";
 
-export class UnauthorizedError extends Error {
+export class UnauthorizedError extends CustomError {
   constructor(error: AxiosError) {
     super(
       `Unauthorized
diff --git a/components/confluence-sync/src/confluence/errors/axios/UnexpectedError.ts b/components/confluence-sync/src/confluence/errors/axios/UnexpectedError.ts
index 5ca57d6a..8fb2c53f 100644
--- a/components/confluence-sync/src/confluence/errors/axios/UnexpectedError.ts
+++ b/components/confluence-sync/src/confluence/errors/axios/UnexpectedError.ts
@@ -1,7 +1,9 @@
 // SPDX-FileCopyrightText: 2024 Telefónica Innovación Digital
 // SPDX-License-Identifier: Apache-2.0
 
-export class UnexpectedError extends Error {
+import { CustomError } from "../CustomError";
+
+export class UnexpectedError extends CustomError {
   constructor(error: unknown) {
     super(`Unexpected Error: ${error}`);
   }
diff --git a/components/confluence-sync/src/confluence/errors/axios/UnknownAxiosError.ts b/components/confluence-sync/src/confluence/errors/axios/UnknownAxiosError.ts
index 15da9af3..cdb9a690 100644
--- a/components/confluence-sync/src/confluence/errors/axios/UnknownAxiosError.ts
+++ b/components/confluence-sync/src/confluence/errors/axios/UnknownAxiosError.ts
@@ -3,7 +3,9 @@
 
 import type { AxiosError } from "axios";
 
-export class UnknownAxiosError extends Error {
+import { CustomError } from "../CustomError";
+
+export class UnknownAxiosError extends CustomError {
   constructor(error: AxiosError) {
     super(
       `Axios Error
diff --git a/components/confluence-sync/test/component/specs/Sync.spec.ts b/components/confluence-sync/test/component/specs/Sync.spec.ts
index 8fb12a72..f6a632af 100644
--- a/components/confluence-sync/test/component/specs/Sync.spec.ts
+++ b/components/confluence-sync/test/component/specs/Sync.spec.ts
@@ -407,8 +407,8 @@ describe("confluence-sync-pages library", () => {
           });
 
           it("should throw an error", async () => {
-            expect(error).toContain(
-              `Error creating page with title foo-wrongPage-title: Error: Bad Request`,
+            expect(error).toBe(
+              `Error creating page with title foo-wrongPage-title: Unknown Error`,
             );
           });
 
@@ -445,8 +445,8 @@ describe("confluence-sync-pages library", () => {
           });
 
           it("should throw an error", async () => {
-            expect(error).toContain(
-              `Error updating page with id foo-grandChild2-id and title foo-grandChild2-title: Error: Bad Request`,
+            expect(error).toBe(
+              `Error updating page with id foo-grandChild2-id and title foo-grandChild2-title: Unknown Error`,
             );
           });
 
@@ -484,7 +484,7 @@ describe("confluence-sync-pages library", () => {
 
           it("should throw an error", async () => {
             expect(error).toBe(
-              `Error deleting content with id foo-child1-id: AxiosError: Request failed with status code 404`,
+              `Error deleting content with id foo-child1-id: Unknown Error`,
             );
           });
 
@@ -658,7 +658,7 @@ describe("confluence-sync-pages library", () => {
                 },
               ]),
             ).rejects.toThrow(
-              `Error getting page with id ${wrongPage.id}: AxiosError: Request failed with status code 404`,
+              `Error getting page with id ${wrongPage.id}: Unknown Error`,
             );
           });
         });
diff --git a/components/confluence-sync/test/unit/specs/confluence/CustomConfluenceClient.test.ts b/components/confluence-sync/test/unit/specs/confluence/CustomConfluenceClient.test.ts
index b37bb82a..5e3a307f 100644
--- a/components/confluence-sync/test/unit/specs/confluence/CustomConfluenceClient.test.ts
+++ b/components/confluence-sync/test/unit/specs/confluence/CustomConfluenceClient.test.ts
@@ -348,7 +348,7 @@ describe("customConfluenceClient class", () => {
         .mockRejectedValueOnce("foo-error");
 
       await expect(customConfluenceClient.getPage("foo-id")).rejects.toThrow(
-        "Error getting page with id foo-id: foo-error",
+        "Error getting page with id foo-id: Unexpected Error: foo-error",
       );
     });
 
@@ -360,7 +360,7 @@ describe("customConfluenceClient class", () => {
       );
 
       await expect(customConfluenceClient.getPage("foo-id")).rejects.toThrow(
-        "Error getting page with id foo-id: Error: foo-error",
+        "Error getting page with id foo-id: Unexpected Error: foo-error",
       );
     });
 
@@ -514,7 +514,7 @@ describe("customConfluenceClient class", () => {
       await expect(customConfluenceClient.createPage(page)).rejects.toThrow(
         expect.objectContaining({
           message: expect.stringContaining(
-            "Error creating page with title foo-title: Error: Bad Request",
+            "Error creating page with title foo-title: Bad Request",
           ),
         }),
       );
@@ -533,7 +533,7 @@ describe("customConfluenceClient class", () => {
       await expect(customConfluenceClient.createPage(page)).rejects.toThrow(
         expect.objectContaining({
           message: expect.stringContaining(
-            "Error creating page with title foo-title: Error: Unauthorized",
+            "Error creating page with title foo-title: Unauthorized",
           ),
         }),
       );
@@ -552,7 +552,7 @@ describe("customConfluenceClient class", () => {
       await expect(customConfluenceClient.createPage(page)).rejects.toThrow(
         expect.objectContaining({
           message: expect.stringContaining(
-            "Error creating page with title foo-title: Error: Unauthorized",
+            "Error creating page with title foo-title: Unauthorized",
           ),
         }),
       );
@@ -571,7 +571,7 @@ describe("customConfluenceClient class", () => {
       await expect(customConfluenceClient.createPage(page)).rejects.toThrow(
         expect.objectContaining({
           message: expect.stringContaining(
-            "Error creating page with title foo-title: Error: Internal Server Error",
+            "Error creating page with title foo-title: Internal Server Error",
           ),
         }),
       );
@@ -586,7 +586,7 @@ describe("customConfluenceClient class", () => {
       await expect(customConfluenceClient.createPage(page)).rejects.toThrow(
         expect.objectContaining({
           message: expect.stringContaining(
-            "Error creating page with title foo-title: Error: Axios Error",
+            "Error creating page with title foo-title: Axios Error",
           ),
         }),
       );
@@ -599,7 +599,18 @@ describe("customConfluenceClient class", () => {
         .mockRejectedValueOnce("foo-error");
 
       await expect(customConfluenceClient.createPage(page)).rejects.toThrow(
-        "Error creating page with title foo-title: Error: Unexpected Error: foo-error",
+        "Error creating page with title foo-title: Unexpected Error: foo-error",
+      );
+    });
+
+    it("should throw an error if confluence.js lib throws an empty error", async () => {
+      jest
+        .spyOn(confluenceClient.content, "createContent")
+        .mockImplementation()
+        .mockRejectedValueOnce("");
+
+      await expect(customConfluenceClient.createPage(page)).rejects.toThrow(
+        "Error creating page with title foo-title: Unknown Error",
       );
     });
   });
@@ -700,7 +711,7 @@ describe("customConfluenceClient class", () => {
       await expect(customConfluenceClient.updatePage(page)).rejects.toThrow(
         expect.objectContaining({
           message: expect.stringContaining(
-            "Error updating page with id foo-id and title foo-title: Error: Bad Request",
+            "Error updating page with id foo-id and title foo-title: Bad Request",
           ),
         }),
       );
@@ -719,7 +730,7 @@ describe("customConfluenceClient class", () => {
       await expect(customConfluenceClient.updatePage(page)).rejects.toThrow(
         expect.objectContaining({
           message: expect.stringContaining(
-            "Error updating page with id foo-id and title foo-title: Error: Unauthorized",
+            "Error updating page with id foo-id and title foo-title: Unauthorized",
           ),
         }),
       );
@@ -738,7 +749,7 @@ describe("customConfluenceClient class", () => {
       await expect(customConfluenceClient.updatePage(page)).rejects.toThrow(
         expect.objectContaining({
           message: expect.stringContaining(
-            "Error updating page with id foo-id and title foo-title: Error: Unauthorized",
+            "Error updating page with id foo-id and title foo-title: Unauthorized",
           ),
         }),
       );
@@ -757,7 +768,7 @@ describe("customConfluenceClient class", () => {
       await expect(customConfluenceClient.updatePage(page)).rejects.toThrow(
         expect.objectContaining({
           message: expect.stringContaining(
-            "Error updating page with id foo-id and title foo-title: Error: Internal Server Error",
+            "Error updating page with id foo-id and title foo-title: Internal Server Error",
           ),
         }),
       );
@@ -772,7 +783,7 @@ describe("customConfluenceClient class", () => {
       await expect(customConfluenceClient.updatePage(page)).rejects.toThrow(
         expect.objectContaining({
           message: expect.stringContaining(
-            "Error updating page with id foo-id and title foo-title: Error: Axios Error",
+            "Error updating page with id foo-id and title foo-title: Axios Error",
           ),
         }),
       );
@@ -785,7 +796,7 @@ describe("customConfluenceClient class", () => {
         .mockRejectedValueOnce("foo-error");
 
       await expect(customConfluenceClient.updatePage(page)).rejects.toThrow(
-        "Error updating page with id foo-id and title foo-title: Error: Unexpected Error: foo-error",
+        "Error updating page with id foo-id and title foo-title: Unexpected Error: foo-error",
       );
     });
   });
@@ -807,7 +818,9 @@ describe("customConfluenceClient class", () => {
 
       await expect(
         customConfluenceClient.deleteContent(page.id),
-      ).rejects.toThrow("Error deleting content with id foo-id: foo-error");
+      ).rejects.toThrow(
+        "Error deleting content with id foo-id: Unexpected Error: foo-error",
+      );
     });
   });
 
@@ -854,7 +867,7 @@ describe("customConfluenceClient class", () => {
       await expect(
         customConfluenceClient.getAttachments(page.id),
       ).rejects.toThrow(
-        "Error getting attachments of page with id foo-id: foo-error",
+        "Error getting attachments of page with id foo-id: Unexpected Error: foo-error",
       );
     });
   });
@@ -896,7 +909,7 @@ describe("customConfluenceClient class", () => {
       await expect(
         customConfluenceClient.createAttachments(page.id, attachments),
       ).rejects.toThrow(
-        "Error creating attachments of page with id foo-id: foo-error",
+        "Error creating attachments of page with id foo-id: Unexpected Error: foo-error",
       );
     });
   });

From 89beda75d3aa5bacd7597a4d2cde733fe43a498e Mon Sep 17 00:00:00 2001
From: javierbrea <javier.brea@gmail.com>
Date: Fri, 17 Oct 2025 12:52:43 +0200
Subject: [PATCH 05/15] feat: Add authentication option to
 markdown-confluence-sync. Run E2E tests to check the whole feature

---
 .github/workflows/test-e2e.yml                  |  1 +
 .../markdown-confluence-sync.config.cjs         |  6 +++++-
 .../src/lib/confluence/ConfluenceSync.ts        | 12 ++++++++++++
 .../src/lib/confluence/ConfluenceSync.types.ts  | 17 +++++++++++++++--
 4 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
index 595447c8..7f43f18c 100644
--- a/.github/workflows/test-e2e.yml
+++ b/.github/workflows/test-e2e.yml
@@ -7,6 +7,7 @@ on:
   push:
     branches:
       - main
+      - feat/56/custom-auth-methods
 
 permissions:
   contents: read
diff --git a/components/markdown-confluence-sync/markdown-confluence-sync.config.cjs b/components/markdown-confluence-sync/markdown-confluence-sync.config.cjs
index 4b4b21b9..ef50e098 100644
--- a/components/markdown-confluence-sync/markdown-confluence-sync.config.cjs
+++ b/components/markdown-confluence-sync/markdown-confluence-sync.config.cjs
@@ -31,7 +31,11 @@ module.exports = {
   ],
   confluence: {
     url: process.env.CONFLUENCE_URL,
-    personalAccessToken: process.env.CONFLUENCE_PAT,
+    authentication: {
+      oauth2: {
+        accessToken: process.env.CONFLUENCE_PAT,
+      },
+    },
     spaceKey: process.env.CONFLUENCE_SPACE_KEY,
     rootPageId: process.env.CONFLUENCE_ROOT_PAGE_ID,
     rootPageName: "Cross",
diff --git a/components/markdown-confluence-sync/src/lib/confluence/ConfluenceSync.ts b/components/markdown-confluence-sync/src/lib/confluence/ConfluenceSync.ts
index 76ca1a0f..6f6b486d 100644
--- a/components/markdown-confluence-sync/src/lib/confluence/ConfluenceSync.ts
+++ b/components/markdown-confluence-sync/src/lib/confluence/ConfluenceSync.ts
@@ -32,6 +32,8 @@ import type {
   UrlOptionDefinition,
   NoticeTemplateOptionDefinition,
   NoticeTemplateOption,
+  AuthenticationOptionDefinition,
+  AuthenticationOption,
 } from "./ConfluenceSync.types.js";
 import { ConfluencePageTransformer } from "./transformer/ConfluencePageTransformer.js";
 import type { ConfluencePageTransformerInterface } from "./transformer/ConfluencePageTransformer.types.js";
@@ -78,6 +80,11 @@ const dryRunOption: DryRunOptionDefinition = {
   default: false,
 };
 
+const authenticationOption: AuthenticationOptionDefinition = {
+  name: "authentication",
+  type: "object",
+};
+
 export const ConfluenceSync: ConfluenceSyncConstructor = class ConfluenceSync
   implements ConfluenceSyncInterface
 {
@@ -90,6 +97,7 @@ export const ConfluenceSync: ConfluenceSyncConstructor = class ConfluenceSync
   private _rootPageNameOption: RootPageNameOption;
   private _noticeMessageOption: NoticeMessageOption;
   private _noticeTemplateOption: NoticeTemplateOption;
+  private _authenticationOption: AuthenticationOption;
   private _dryRunOption: DryRunOption;
   private _initialized = false;
   private _logger: LoggerInterface;
@@ -113,6 +121,9 @@ export const ConfluenceSync: ConfluenceSyncConstructor = class ConfluenceSync
     this._noticeTemplateOption = config.addOption(
       noticeTemplateOption,
     ) as NoticeTemplateOption;
+    this._authenticationOption = config.addOption(
+      authenticationOption,
+    ) as AuthenticationOption;
     this._dryRunOption = config.addOption(dryRunOption) as DryRunOption;
     this._modeOption = mode;
     this._logger = logger;
@@ -182,6 +193,7 @@ export const ConfluenceSync: ConfluenceSyncConstructor = class ConfluenceSync
       this._confluenceSyncPages = new ConfluenceSyncPages({
         url: this._urlOption.value,
         personalAccessToken: this._personalAccessTokenOption.value,
+        authentication: this._authenticationOption.value,
         spaceId: this._spaceKeyOption.value,
         rootPageId: this._rootPageIdOption.value,
         logLevel: this._logger.level,
diff --git a/components/markdown-confluence-sync/src/lib/confluence/ConfluenceSync.types.ts b/components/markdown-confluence-sync/src/lib/confluence/ConfluenceSync.types.ts
index cef86e6e..fd62b4a1 100644
--- a/components/markdown-confluence-sync/src/lib/confluence/ConfluenceSync.types.ts
+++ b/components/markdown-confluence-sync/src/lib/confluence/ConfluenceSync.types.ts
@@ -7,7 +7,10 @@ import type {
   OptionDefinition,
 } from "@mocks-server/config";
 import type { LoggerInterface } from "@mocks-server/logger";
-import type { ConfluenceInputPage } from "@telefonica/confluence-sync";
+import type {
+  ConfluenceInputPage,
+  ConfluenceClientAuthenticationConfig,
+} from "@telefonica/confluence-sync";
 
 import type { ModeOption } from "../MarkdownConfluenceSync.types";
 
@@ -27,8 +30,13 @@ declare global {
       confluence?: {
         /** Confluence URL */
         url?: UrlOptionValue;
-        /** Confluence personal access token */
+        /**
+         * Confluence personal access token
+         * @deprecated Use authentication.oauth2.accessToken instead
+         **/
         personalAccessToken?: PersonalAccessTokenOptionValue;
+        /** Confluence authentication */
+        authentication?: ConfluenceClientAuthenticationConfig;
         /** Confluence space key */
         spaceKey?: SpaceKeyOptionValue;
         /** Confluence root page id */
@@ -63,6 +71,11 @@ export type DryRunOptionDefinition = OptionDefinition<
   { hasDefault: true }
 >;
 
+export type AuthenticationOptionDefinition =
+  OptionDefinition<ConfluenceClientAuthenticationConfig>;
+
+export type AuthenticationOption =
+  OptionInterfaceOfType<ConfluenceClientAuthenticationConfig>;
 export type UrlOption = OptionInterfaceOfType<UrlOptionValue>;
 export type PersonalAccessTokenOption =
   OptionInterfaceOfType<PersonalAccessTokenOptionValue>;

From 675a1d62f55af9f44b687e5c180e0119f8b1a422 Mon Sep 17 00:00:00 2001
From: javierbrea <javier.brea@gmail.com>
Date: Fri, 17 Oct 2025 12:55:30 +0200
Subject: [PATCH 06/15] feat: Change option validation

---
 .../src/lib/confluence/ConfluenceSync.ts                   | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/components/markdown-confluence-sync/src/lib/confluence/ConfluenceSync.ts b/components/markdown-confluence-sync/src/lib/confluence/ConfluenceSync.ts
index 6f6b486d..35288675 100644
--- a/components/markdown-confluence-sync/src/lib/confluence/ConfluenceSync.ts
+++ b/components/markdown-confluence-sync/src/lib/confluence/ConfluenceSync.ts
@@ -163,9 +163,12 @@ export const ConfluenceSync: ConfluenceSyncConstructor = class ConfluenceSync
           "Confluence URL is required. Please set confluence.url option.",
         );
       }
-      if (!this._personalAccessTokenOption.value) {
+      if (
+        !this._personalAccessTokenOption.value &&
+        !this._authenticationOption.value
+      ) {
         throw new Error(
-          "Confluence personal access token is required. Please set confluence.personalAccessToken option.",
+          "Confluence personal access token or authentication option is required. Please set confluence.personalAccessToken option or confluence.authentication option.",
         );
       }
       if (!this._spaceKeyOption.value) {

From 4d4da4fe13910de3fe71cd75c0595b8d249710e1 Mon Sep 17 00:00:00 2001
From: javierbrea <javier.brea@gmail.com>
Date: Fri, 17 Oct 2025 13:01:25 +0200
Subject: [PATCH 07/15] feat: Pass authentication option

---
 components/confluence-sync/src/ConfluenceSyncPages.ts     | 2 ++
 .../src/lib/confluence/ConfluenceSync.ts                  | 8 --------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/components/confluence-sync/src/ConfluenceSyncPages.ts b/components/confluence-sync/src/ConfluenceSyncPages.ts
index c3064c36..09a079ed 100644
--- a/components/confluence-sync/src/ConfluenceSyncPages.ts
+++ b/components/confluence-sync/src/ConfluenceSyncPages.ts
@@ -55,6 +55,7 @@ export const ConfluenceSyncPages: ConfluenceSyncPagesConstructor = class Conflue
     url,
     spaceId,
     personalAccessToken,
+    authentication,
     dryRun,
     syncMode,
     rootPageId,
@@ -66,6 +67,7 @@ export const ConfluenceSyncPages: ConfluenceSyncPagesConstructor = class Conflue
       url,
       spaceId,
       personalAccessToken,
+      authentication,
       logger: this._logger.namespace("confluence"),
       dryRun,
     });
diff --git a/components/markdown-confluence-sync/src/lib/confluence/ConfluenceSync.ts b/components/markdown-confluence-sync/src/lib/confluence/ConfluenceSync.ts
index 35288675..3dda9549 100644
--- a/components/markdown-confluence-sync/src/lib/confluence/ConfluenceSync.ts
+++ b/components/markdown-confluence-sync/src/lib/confluence/ConfluenceSync.ts
@@ -163,14 +163,6 @@ export const ConfluenceSync: ConfluenceSyncConstructor = class ConfluenceSync
           "Confluence URL is required. Please set confluence.url option.",
         );
       }
-      if (
-        !this._personalAccessTokenOption.value &&
-        !this._authenticationOption.value
-      ) {
-        throw new Error(
-          "Confluence personal access token or authentication option is required. Please set confluence.personalAccessToken option or confluence.authentication option.",
-        );
-      }
       if (!this._spaceKeyOption.value) {
         throw new Error(
           "Confluence space id is required. Please set confluence.spaceId option.",

From f7c98f6df7872be3dc20eee831f242fa664d4de9 Mon Sep 17 00:00:00 2001
From: javierbrea <javier.brea@gmail.com>
Date: Fri, 17 Oct 2025 13:08:09 +0200
Subject: [PATCH 08/15] test: Use deprecated personalAccessToken in E2E to
 check it

---
 .../markdown-confluence-sync.config.cjs                     | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/components/markdown-confluence-sync/markdown-confluence-sync.config.cjs b/components/markdown-confluence-sync/markdown-confluence-sync.config.cjs
index ef50e098..4b4b21b9 100644
--- a/components/markdown-confluence-sync/markdown-confluence-sync.config.cjs
+++ b/components/markdown-confluence-sync/markdown-confluence-sync.config.cjs
@@ -31,11 +31,7 @@ module.exports = {
   ],
   confluence: {
     url: process.env.CONFLUENCE_URL,
-    authentication: {
-      oauth2: {
-        accessToken: process.env.CONFLUENCE_PAT,
-      },
-    },
+    personalAccessToken: process.env.CONFLUENCE_PAT,
     spaceKey: process.env.CONFLUENCE_SPACE_KEY,
     rootPageId: process.env.CONFLUENCE_ROOT_PAGE_ID,
     rootPageName: "Cross",

From a5d281088237a242f0a74ce9d34da01d303e78a8 Mon Sep 17 00:00:00 2001
From: javierbrea <javier.brea@gmail.com>
Date: Fri, 17 Oct 2025 13:37:56 +0200
Subject: [PATCH 09/15] docs: Update docs. Change E2E auth method to test
 warning

---
 components/confluence-sync/CHANGELOG.md       |  6 ++-
 components/confluence-sync/README.md          | 26 ++++++++--
 components/confluence-sync/package.json       |  2 +-
 .../markdown-confluence-sync/CHANGELOG.md     |  7 +++
 components/markdown-confluence-sync/README.md | 48 ++++++++++++++++---
 .../markdown-confluence-sync/package.json     |  2 +-
 .../src/lib/confluence/ConfluenceSync.ts      |  6 +++
 .../specs/confluence/ConfluenceSync.test.ts   | 17 -------
 8 files changed, 83 insertions(+), 31 deletions(-)

diff --git a/components/confluence-sync/CHANGELOG.md b/components/confluence-sync/CHANGELOG.md
index a280b537..036a6659 100644
--- a/components/confluence-sync/CHANGELOG.md
+++ b/components/confluence-sync/CHANGELOG.md
@@ -11,12 +11,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 #### Deprecated
 #### Removed
 
-## Unreleased
+## [2.1.0] - 2025-10-17
 
 ### Added
 
 * feat: Add authentication options (OAuth2, Basic, JWT). Deprecate personalAccessToken.
 
+### Changed
+
+* chore: Update confluence.js to 2.1.0
+
 ## [2.0.2] - 2025-07-11
 
 ### Fixed
diff --git a/components/confluence-sync/README.md b/components/confluence-sync/README.md
index b2254cf8..8b397faa 100644
--- a/components/confluence-sync/README.md
+++ b/components/confluence-sync/README.md
@@ -44,7 +44,7 @@ This library requires:
 
 * A Confluence instance.
 * The id of the Confluence space where the pages will be created.
-* A personal access token to authenticate. You can create a personal access token following the instructions in the [Atlassian documentation](https://support.atlassian.com/atlassian-account/docs/manage-api-tokens-for-your-atlassian-account/).
+* Valid authentication credentials to access the Confluence instance. It uses the `confluence.js` library internally, so it supports the [same authentication methods](https://github.com/MrRefactoring/confluence.js?tab=readme-ov-file#authentication) as it.
 
 ### Compatibility
 
@@ -68,7 +68,11 @@ import { ConfluenceSyncPages } from '@telefonica/confluence-sync';
 
 const confluenceSyncPages = new ConfluenceSyncPages({
   url: "https://your.confluence.com",
-  personalAccessToken: "*******",
+  authentication: {
+    oauth2: {
+      accessToken: "your-oauth2-access-token"
+    }
+  },
   spaceId: "your-space-id",
   rootPageId: "12345678"
   logLevel: "debug",
@@ -191,7 +195,11 @@ import { ConfluenceSyncPages, SyncModes } from '@telefonica/confluence-sync';
 
 const confluenceSyncPages = new ConfluenceSyncPages({
   url: "https://my.confluence.es",
-  personalAccessToken: "*******",
+  authentication: {
+    oauth2: {
+      accessToken: "my-oauth2-access-token"
+    }
+  },
   spaceId: "MY-SPACE",
   logLevel: "debug",
   dryRun: false,
@@ -214,7 +222,17 @@ await confluenceSyncPages.sync([
 The main class of the library. It receives a configuration object with the following properties:
 
 * `url`: URL of the Confluence instance.
-* `personalAccessToken`: Personal access token to authenticate in Confluence.
+* `personalAccessToken`: Personal access token to authenticate in Confluence. To be DEPRECATED in future versions. Use the `authentication` property instead.
+* `authentication`: Authentication options to access Confluence. It supports the following methods:
+  * `oauth2`: OAuth2 authentication. It requires:
+    * `accessToken`: Access token to authenticate.
+  * `basic`: Basic authentication.
+    * `email`: Email of the user.
+    * `apiToken`: API token to authenticate.
+  * `jwt`: JWT authentication.
+    * `issuer`: Issuer of the JWT.
+    * `secret`: Secret to sign the JWT.
+    * `expiryTimeSeconds`: Optional expiry time of the JWT in seconds.
 * `spaceId`: Key of the space where the pages will be created.
 * `rootPageId`: ID of the root page under the pages will be created. It only can be missing if the sync mode is `flat` and all the pages provided have an id.
 * `logLevel`: One of `silly`, `debug`, `info`, `warn`, `error` or `silent`. Default is `silent`.
diff --git a/components/confluence-sync/package.json b/components/confluence-sync/package.json
index e3921aa3..37178ed5 100644
--- a/components/confluence-sync/package.json
+++ b/components/confluence-sync/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@telefonica/confluence-sync",
   "description": "Creates/updates/deletes Confluence pages based on a list of objects containing the page contents. Supports nested pages and attachments upload",
-  "version": "2.0.2",
+  "version": "2.1.0",
   "license": "Apache-2.0",
   "author": "Telefónica Innovación Digital",
   "repository": {
diff --git a/components/markdown-confluence-sync/CHANGELOG.md b/components/markdown-confluence-sync/CHANGELOG.md
index 2cccfa11..8478c698 100644
--- a/components/markdown-confluence-sync/CHANGELOG.md
+++ b/components/markdown-confluence-sync/CHANGELOG.md
@@ -11,6 +11,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 #### Deprecated
 #### Removed
 
+## [2.2.0] - 2025-10-17
+
+### Added
+
+* feat: Update confluence-sync to 2.1.0. Add authentication options (OAuth2, Basic, JWT). Deprecate personalAccessToken.
+* feat: Add warning when using the deprecated personalAccessToken option.
+
 ## [2.1.1] - 2025-07-11
 
 ### Fixed
diff --git a/components/markdown-confluence-sync/README.md b/components/markdown-confluence-sync/README.md
index 0f753e4a..396f0deb 100644
--- a/components/markdown-confluence-sync/README.md
+++ b/components/markdown-confluence-sync/README.md
@@ -58,8 +58,8 @@ In order to be able to sync the markdown files with Confluence, you need to have
 
 * A [Confluence](https://www.atlassian.com/es/software/confluence) instance.
 * The id of the Confluence space where the pages will be created.
-* A personal access token to authenticate. You can create a personal access token following the instructions in the [Atlassian documentation](https://support.atlassian.com/atlassian-account/docs/manage-api-tokens-for-your-atlassian-account/).
 * Markdown file or files to be synced with Confluence. It can be as complex as a Docusaurus project docs folder, or as simple as a single README.md file.
+* Valid authentication credentials to access the Confluence instance. It uses the `confluence.js` library internally, so it supports the [same authentication methods](https://github.com/MrRefactoring/confluence.js?tab=readme-ov-file#authentication) as it.
 
 ### Compatibility
 
@@ -144,7 +144,11 @@ module.exports = {
   docsDir: "docs",
   confluence: {
     url: "https://my-confluence.es",
-    personalAccessToken: "*******",
+    authentication: {
+      oauth2: {
+        accessToken: "*******"
+      }
+    },
     spaceKey: "MY-SPACE",
     rootPageId: "my-root-page-id"
   }
@@ -254,7 +258,11 @@ module.exports = {
   filesPattern: "check*.{md,mdx}",
   confluence: {
     url: "https://my-confluence.es",
-    personalAccessToken: "*******",
+    authentication: {
+      oauth2: {
+        accessToken: "*******"
+      }
+    },
     spaceKey: "MY-SPACE",
     rootPageId: "my-root-page-id"
   }
@@ -276,7 +284,17 @@ The namespace for the configuration of this library is `markdown-confluence-sync
 | `filesMetadata` | `array` | Array of objects with the metadata of the files to sync. Each object must have the `path` property with the path of the file. For the rest of properties read the [Configuration per page](#configuration-per-page) section |  |
 | `docsDir` | `string` | Path to the docs directory. | `./docs` |
 | `confluence.url` | `string` | URL of the Confluence instance. | |
-| `confluence.personalAccessToken` | `string` | Personal access token to authenticate against the Confluence instance. | |
+| `confluence.personalAccessToken` | `string` | Deprecated. Personal access token to authenticate against the Confluence instance. | |
+| `confluence.authentication` | `object` | Object containing authentication options to access the Confluence instance. It supports the same methods [as the `confluence.js` library](https://github.com/MrRefactoring/confluence.js?tab=readme-ov-file#authentication). | |
+| `confluence.authentication.oauth2` | `object` | Object containing OAuth2 authentication options. | |
+| `confluence.authentication.oauth2.accessToken` | `string` | Access token for OAuth2 authentication. | |
+| `confluence.authentication.basic` | `object` | Object containing Basic authentication options. | |
+| `confluence.authentication.basic.email` | `string` | Email for Basic authentication. | |
+| `confluence.authentication.basic.apiToken` | `string` | ApiToken for Basic authentication. | |
+| `confluence.authentication.jwt` | `object` | Object containing JWT authentication options. | |
+| `confluence.authentication.jwt.issuer` | `string` | Issuer for JWT authentication. | |
+| `confluence.authentication.jwt.secret` | `string` | Secret for JWT authentication. | |
+| `confluence.authentication.jwt.expiryTimeSeconds` | `number` | Optional expiry time in seconds for JWT authentication. | |
 | `confluence.spaceKey` | `string` | Key of the Confluence space where the pages will be synced. | |
 | `confluence.rootPageId` | `string` | Id of the Confluence parent page where the pages will be synced. | |
 | `confluence.rootPageName` | `string` | Customize Confluence page titles by adding a prefix to all of them for improved organization and clarity | |
@@ -312,7 +330,12 @@ module.exports = {
   ignore: ["docs/no-sync/**"],
   confluence: {
     url: "https://my-confluence.es",
-    personalAccessToken: "*******",
+    authentication: {
+      basic: {
+        email: "<your-email>",
+        apiToken: "<your-api-token>"
+      }
+    },
     spaceKey: "MY-SPACE",
     rootPageId: "my-root-page-id"
   }
@@ -389,7 +412,13 @@ module.exports = {
   ],
   confluence: {
     url: "https://my.confluence.es",
-    personalAccessToken: "*******",
+    authentication: {
+      jwt: {
+        issuer: "my-issuer",
+        secret: "my-secret",
+        expiryTimeSeconds: 300,
+      },
+    },
     spaceKey: "MY-SPACE",
   },
 };
@@ -512,7 +541,12 @@ const markdownConfluenceSync = new MarkdownConfluenceSync({
   docsDir: path.resolve(__dirname, "..", "docs");
   confluence: {
     url: "https://my.confluence.es",
-    personalAccessToken: "*******",
+    authentication: {
+      basic: {
+        email: "<your-email>",
+        apiToken: "<your-api-token>"
+      }
+    },
     spaceKey: "MY-SPACE",
     rootPageId: "my-root-page-id"
   },
diff --git a/components/markdown-confluence-sync/package.json b/components/markdown-confluence-sync/package.json
index 685701a8..9980e753 100644
--- a/components/markdown-confluence-sync/package.json
+++ b/components/markdown-confluence-sync/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@telefonica/markdown-confluence-sync",
   "description": "Creates/updates/deletes Confluence pages based on markdown files in a directory. Supports Mermaid diagrams and per-page configuration using frontmatter metadata. Works great with Docusaurus",
-  "version": "2.1.1",
+  "version": "2.2.0",
   "license": "Apache-2.0",
   "author": "Telefónica Innovación Digital",
   "repository": {
diff --git a/components/markdown-confluence-sync/src/lib/confluence/ConfluenceSync.ts b/components/markdown-confluence-sync/src/lib/confluence/ConfluenceSync.ts
index 3dda9549..ea749494 100644
--- a/components/markdown-confluence-sync/src/lib/confluence/ConfluenceSync.ts
+++ b/components/markdown-confluence-sync/src/lib/confluence/ConfluenceSync.ts
@@ -177,6 +177,12 @@ export const ConfluenceSync: ConfluenceSyncConstructor = class ConfluenceSync
         );
       }
 
+      if (this._personalAccessTokenOption.value) {
+        this._logger.warn(
+          "The 'personalAccessToken' option is deprecated and will be removed in future versions. Please use the 'authentication' option instead.",
+        );
+      }
+
       this._confluencePageTransformer = new ConfluencePageTransformer({
         noticeMessage: this._noticeMessageOption.value,
         noticeTemplate: this._noticeTemplateOption.value,
diff --git a/components/markdown-confluence-sync/test/unit/specs/confluence/ConfluenceSync.test.ts b/components/markdown-confluence-sync/test/unit/specs/confluence/ConfluenceSync.test.ts
index e2eaeb7f..bfb734b4 100644
--- a/components/markdown-confluence-sync/test/unit/specs/confluence/ConfluenceSync.test.ts
+++ b/components/markdown-confluence-sync/test/unit/specs/confluence/ConfluenceSync.test.ts
@@ -109,23 +109,6 @@ describe("confluenceSync", () => {
       );
     });
 
-    it("should fail if the personalAccessToken option is not defined", async () => {
-      // Arrange
-      const confluenceSync = new ConfluenceSync(confluenceSyncOptions);
-      await config.load({
-        ...CONFIG,
-        confluence: {
-          url: "foo",
-        },
-      });
-
-      // Act
-      // Assert
-      await expect(async () => await confluenceSync.sync([])).rejects.toThrow(
-        "Confluence personal access token is required. Please set confluence.personalAccessToken option.",
-      );
-    });
-
     it("should fail if the spaceKey option is not defined", async () => {
       // Arrange
       const confluenceSync = new ConfluenceSync(confluenceSyncOptions);

From 5834554c22aa51514a0cb10147ca886478a7fd4d Mon Sep 17 00:00:00 2001
From: javierbrea <javier.brea@gmail.com>
Date: Fri, 17 Oct 2025 13:39:57 +0200
Subject: [PATCH 10/15] test: Restore authentication method to oauth2

---
 .../markdown-confluence-sync.config.cjs                     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/components/markdown-confluence-sync/markdown-confluence-sync.config.cjs b/components/markdown-confluence-sync/markdown-confluence-sync.config.cjs
index 4b4b21b9..ef50e098 100644
--- a/components/markdown-confluence-sync/markdown-confluence-sync.config.cjs
+++ b/components/markdown-confluence-sync/markdown-confluence-sync.config.cjs
@@ -31,7 +31,11 @@ module.exports = {
   ],
   confluence: {
     url: process.env.CONFLUENCE_URL,
-    personalAccessToken: process.env.CONFLUENCE_PAT,
+    authentication: {
+      oauth2: {
+        accessToken: process.env.CONFLUENCE_PAT,
+      },
+    },
     spaceKey: process.env.CONFLUENCE_SPACE_KEY,
     rootPageId: process.env.CONFLUENCE_ROOT_PAGE_ID,
     rootPageName: "Cross",

From c4b0ded9a3735c81c0269ac75614adab845c71f4 Mon Sep 17 00:00:00 2001
From: javierbrea <javier.brea@gmail.com>
Date: Fri, 17 Oct 2025 14:05:32 +0200
Subject: [PATCH 11/15] chore: Remove branch from E2E workflow

---
 .github/workflows/test-e2e.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
index 7f43f18c..595447c8 100644
--- a/.github/workflows/test-e2e.yml
+++ b/.github/workflows/test-e2e.yml
@@ -7,7 +7,6 @@ on:
   push:
     branches:
       - main
-      - feat/56/custom-auth-methods
 
 permissions:
   contents: read

From 20e47fa760dacaedbc03498b19e58579b5558650 Mon Sep 17 00:00:00 2001
From: javierbrea <javier.brea@gmail.com>
Date: Fri, 17 Oct 2025 14:10:10 +0200
Subject: [PATCH 12/15] docs: Improve docs

---
 components/confluence-sync/CHANGELOG.md                |  2 ++
 .../src/confluence/CustomConfluenceClient.ts           | 10 ++++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/components/confluence-sync/CHANGELOG.md b/components/confluence-sync/CHANGELOG.md
index 036a6659..82394744 100644
--- a/components/confluence-sync/CHANGELOG.md
+++ b/components/confluence-sync/CHANGELOG.md
@@ -19,7 +19,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+* feat: Use confluence.js library to retrieve also data about page children, not only pages. The new version 2.1.0 of confluence.js supports passing pagination options to get all children pages.
 * chore: Update confluence.js to 2.1.0
+* refactor: Adapt error handling to the new confluence.js error structure.
 
 ## [2.0.2] - 2025-07-11
 
diff --git a/components/confluence-sync/src/confluence/CustomConfluenceClient.ts b/components/confluence-sync/src/confluence/CustomConfluenceClient.ts
index 6e5c86e8..1ce274c1 100644
--- a/components/confluence-sync/src/confluence/CustomConfluenceClient.ts
+++ b/components/confluence-sync/src/confluence/CustomConfluenceClient.ts
@@ -68,6 +68,11 @@ function isJWTAuthentication(
   );
 }
 
+/**
+ * Type guard to check if the authentication is valid
+ * @param auth The authentication object to check
+ * @returns True if the authentication is valid, false otherwise
+ */
 function isAuthentication(
   auth: unknown,
 ): auth is ConfluenceClientAuthenticationConfig {
@@ -92,14 +97,15 @@ export const CustomConfluenceClient: ConfluenceClientConstructor = class CustomC
     this._config = config;
 
     if (
-      isAuthentication(config.authentication) === false &&
-      config.personalAccessToken === undefined
+      !isAuthentication(config.authentication) &&
+      !config.personalAccessToken
     ) {
       throw new Error(
         "Either authentication or personalAccessToken must be provided",
       );
     }
 
+    // Backward compatibility with personalAccessToken
     const authentication = isAuthentication(config.authentication)
       ? config.authentication
       : {

From edad910fb64604595fc5883af83098a77067135d Mon Sep 17 00:00:00 2001
From: javierbrea <javier.brea@gmail.com>
Date: Fri, 17 Oct 2025 14:14:12 +0200
Subject: [PATCH 13/15] chore: Add missing license headers

---
 .../confluence-sync/src/confluence/errors/CustomError.ts       | 3 +++
 .../confluence-sync/src/confluence/errors/ErrorHelpers.ts      | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/components/confluence-sync/src/confluence/errors/CustomError.ts b/components/confluence-sync/src/confluence/errors/CustomError.ts
index 7ce4f5fa..2a706cc0 100644
--- a/components/confluence-sync/src/confluence/errors/CustomError.ts
+++ b/components/confluence-sync/src/confluence/errors/CustomError.ts
@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: 2025 Telefónica Innovación Digital
+// SPDX-License-Identifier: Apache-2.0
+
 export class CustomError extends Error {
   constructor(...args: ConstructorParameters<typeof Error>) {
     super(...args);
diff --git a/components/confluence-sync/src/confluence/errors/ErrorHelpers.ts b/components/confluence-sync/src/confluence/errors/ErrorHelpers.ts
index 450c22d0..6fd81de8 100644
--- a/components/confluence-sync/src/confluence/errors/ErrorHelpers.ts
+++ b/components/confluence-sync/src/confluence/errors/ErrorHelpers.ts
@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: 2025 Telefónica Innovación Digital
+// SPDX-License-Identifier: Apache-2.0
+
 /**
  * Returns the error message from the cause if it is an instance of Error, otherwise returns the cause itself.
  * @param cause Cause of an error. It might be another error, or a string usually

From c8845a7bbd63a6a7fa0b551442a7276cfbb4c4a6 Mon Sep 17 00:00:00 2001
From: javierbrea <javier.brea@gmail.com>
Date: Fri, 17 Oct 2025 14:20:17 +0200
Subject: [PATCH 14/15] chore: Decrease unit tests coverag threshold

---
 components/markdown-confluence-sync/jest.unit.config.cjs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/components/markdown-confluence-sync/jest.unit.config.cjs b/components/markdown-confluence-sync/jest.unit.config.cjs
index 6772cc25..68594b11 100644
--- a/components/markdown-confluence-sync/jest.unit.config.cjs
+++ b/components/markdown-confluence-sync/jest.unit.config.cjs
@@ -20,10 +20,10 @@ module.exports = {
   // An object that configures minimum threshold enforcement for coverage results
   coverageThreshold: {
     global: {
-      branches: 99,
-      functions: 99,
-      lines: 99,
-      statements: 99,
+      branches: 98,
+      functions: 98,
+      lines: 98,
+      statements: 98,
     },
   },
 

From ab4d8e46dc822bc9b5c76fd80b7ac8eb865198db Mon Sep 17 00:00:00 2001
From: javierbrea <javier.brea@gmail.com>
Date: Fri, 17 Oct 2025 14:26:30 +0200
Subject: [PATCH 15/15] chore: Delete renovate config

---
 renovate.json | 56 ---------------------------------------------------
 1 file changed, 56 deletions(-)
 delete mode 100644 renovate.json

diff --git a/renovate.json b/renovate.json
deleted file mode 100644
index 5530d8af..00000000
--- a/renovate.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": [
-    "config:recommended"
-  ],
-  "constraints": {
-    "pnpm": "9.4.0",
-    "node": "22.4.0"
-  },
-  "baseBranches": [
-    "release"
-  ],
-  "automerge": true,
-  "platformAutomerge": true,
-  "automergeStrategy": "squash",
-  "major": {
-    "automerge": false
-  },
-  "minor": {
-    "automerge": true
-  },
-  "separateMultipleMajor": false,
-  "rangeStrategy": "pin",
-  "packageRules": [
-    {
-      "groupName": "all patch and minor dependencies",
-      "groupSlug": "all-patch-and-minor-dependencies",
-      "matchUpdateTypes": [
-        "patch",
-        "minor"
-      ],
-      "matchPackageNames": [
-        "*"
-      ]
-    },
-    {
-      "matchDepTypes": [
-        "peerDependencies",
-        "engines"
-      ],
-      "rangeStrategy": "widen"
-    }
-  ],
-  "labels": [
-    "dependencies",
-    "renovate"
-  ],
-  "minimumReleaseAge": "5 days",
-  "prHourlyLimit": 1,
-  "prConcurrentLimit": 2,
-  "timezone": "Europe/Madrid",
-  "schedule": [
-    "after 5pm every weekday"
-  ],
-  "dependencyDashboard": true
-}