Merge pull request 'refactor(vnUser): refs #7792 use twoFactorFk and add foreignKey' (!2937) from 7792-twoFactorFk into dev

Reviewed-on: #2937 Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2024-09-18 10:41:40 +00:00 · 2024-09-18 10:41:40 +00:00 · 9efc712859
parent 09dfacd753 79d79f0c9b
commit 9efc712859
4 changed files with 7 additions and 6 deletions
--- a/back/methods/vn-user/update-user.js
+++ b/back/methods/vn-user/update-user.js
@ -26,7 +26,7 @@ module.exports = Self => {
                description: 'The user lang'
            }, {
                arg: 'twoFactor',
-                type: 'string',
+                type: 'any',
                description: 'The user twoFactor'
            }
        ],
--- a/back/models/vn-user.json
+++ b/back/models/vn-user.json
@ -165,7 +165,8 @@
                "hasGrant",
                "realm",
                "email",
-                "emailVerified"
+                "emailVerified",
+                "twoFactor"
            ]
        }
    }
--- a/modules/account/back/model-config.json
+++ b/modules/account/back/model-config.json
@ -1,4 +1,7 @@
 {
+    "Account": {
+        "dataSource": "vn"
+    },
    "AccountConfig": {
        "dataSource": "vn"
    },
@ -47,9 +50,6 @@
    "SipConfig": {
        "dataSource": "vn"
    },
-    "Account": {
-        "dataSource": "vn"
-    },
    "UserLog": {
        "dataSource": "vn"
    },
--- a/myt.config.yml
+++ b/myt.config.yml
@ -394,4 +394,4 @@ localFixtures:
    - zoneExclusionGeo
    - zoneGeo
    - zoneIncluded
-    - zoneWarehouse
+    - zoneWarehouse