From 9695fea48f30207dffe9897993af2446acb23b9a Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 8 Oct 2024 12:05:19 +0200
Subject: [PATCH] feat(Docuware): refs #8066 add username and password

---
 back/methods/docuware/core.js                 | 25 ++++++++++---------
 back/models/docuware-config.json              | 17 ++++++-------
 .../11291-purpleChico/00-firstScript.sql      |  2 ++
 3 files changed, 22 insertions(+), 22 deletions(-)
 create mode 100644 db/versions/11291-purpleChico/00-firstScript.sql

diff --git a/back/methods/docuware/core.js b/back/methods/docuware/core.js
index 760909aa3..9545cd878 100644
--- a/back/methods/docuware/core.js
+++ b/back/methods/docuware/core.js
@@ -9,15 +9,16 @@ module.exports = Self => {
      */
     Self.getOptions = async() => {
         const {url, username, password} = await Self.app.models.DocuwareConfig.findOne();
-        const {IdentityServiceUrl} = await axios.get(`${url}/Home/IdentityServiceInfo`);
-        const {token_endpoint} = await axios.get(`${IdentityServiceUrl}/.well-known/openid-configuration`);
-        const {access_token} = await axios.post(token_endpoint, {
+        const {data: {IdentityServiceUrl}} = await axios.get(`${url}/Home/IdentityServiceInfo`);
+        const {data: {token_endpoint}} = await axios.get(`${IdentityServiceUrl}/.well-known/openid-configuration`);
+        const data = await axios.post(token_endpoint, JSON.stringify({
             grant_type: 'password',
             scope: 'docuware.platform',
             client_id: 'docuware.platform.net.client',
-            username, // falta añadirlos
-            password // falta añadirlos
-        });
+            username,
+            password
+        }));
+        console.log('data: ', data);
 
         const headers = {
             headers: {
@@ -42,8 +43,8 @@ module.exports = Self => {
      * @return {number} - The fileCabinet id
      */
     Self.getDialog = async(code, action, fileCabinetId) => {
-        if (!process.env.NODE_ENV)
-            return Math.floor(Math.random() + 100);
+        // if (!process.env.NODE_ENV)
+        // return Math.floor(Math.random() + 100);
 
         const docuwareInfo = await Self.app.models.Docuware.findOne({
             where: {
@@ -69,8 +70,8 @@ module.exports = Self => {
      * @return {number} - The fileCabinet id
      */
     Self.getFileCabinet = async code => {
-        if (!process.env.NODE_ENV)
-            return Math.floor(Math.random() + 100);
+        // if (!process.env.NODE_ENV)
+        // return Math.floor(Math.random() + 100);
 
         const options = await Self.getOptions();
         const docuwareInfo = await Self.app.models.Docuware.findOne({
@@ -95,7 +96,7 @@ module.exports = Self => {
      * @return {object} - The data
      */
     Self.get = async(code, filter, parse) => {
-        if (!process.env.NODE_ENV) return;
+        // if (!process.env.NODE_ENV) return;
 
         const options = await Self.getOptions();
         const fileCabinetId = await Self.getFileCabinet(code);
@@ -118,7 +119,7 @@ module.exports = Self => {
      * @return {object} - The data
      */
     Self.getById = async(code, id, parse) => {
-        if (!process.env.NODE_ENV) return;
+        // if (!process.env.NODE_ENV) return;
 
         const docuwareInfo = await Self.app.models.Docuware.findOne({
             fields: ['findById'],
diff --git a/back/models/docuware-config.json b/back/models/docuware-config.json
index 9d06c4874..244ae2790 100644
--- a/back/models/docuware-config.json
+++ b/back/models/docuware-config.json
@@ -18,15 +18,12 @@
         },
         "cookie": {
             "type": "string"
+        },
+        "username": {
+            "type": "string"
+        },
+        "password": {
+            "type": "string"
         }
-    },
-    "acls": [
-        {
-            "property": "*",
-            "accessType": "*",
-            "principalType": "ROLE",
-            "principalId": "$everyone",
-            "permission": "ALLOW"
-	    }
-    ]
+    }
 }
diff --git a/db/versions/11291-purpleChico/00-firstScript.sql b/db/versions/11291-purpleChico/00-firstScript.sql
new file mode 100644
index 000000000..db66c4c98
--- /dev/null
+++ b/db/versions/11291-purpleChico/00-firstScript.sql
@@ -0,0 +1,2 @@
+ALTER TABLE vn.docuwareConfig ADD IF NOT EXISTS username varchar(100) NULL;
+ALTER TABLE vn.docuwareConfig ADD IF NOT EXISTS password varchar(100) NULL;