Merge pull request #903 from Accenture/develop

5.0.1

.github/ISSUE_TEMPLATE/bug.yml

@@ -39,6 +39,7 @@ body:
           label: Version
           description: What version of our software are you running? (mcdev --version)
           options:
+              - 5.0.1
               - 5.0.0
               - 4.3.4
               - 4.3.3

lib/metadataTypes/User.js

@@ -149,33 +149,41 @@ class User extends MetadataType {
         // convert SSO / Federation Token into API compliant format
         if (metadata.SsoIdentity || metadata.SsoIdentities) {
             const ssoIdentity = {};
+            let error = false;
             if (metadata.SsoIdentity) {
                 // assume metadata.SsoIdentity is an object
                 ssoIdentity.IsActive = metadata.SsoIdentity.IsActive;
-                ssoIdentity.FederatedId = metadata.SsoIdentity.FederatedId;
+                ssoIdentity.FederatedID = metadata.SsoIdentity.FederatedID;
                 delete metadata.SsoIdentity;
             } else if (Array.isArray(metadata.SsoIdentities)) {
                 // be nice and allow SsoIdentities as an alternative if its an array of objects
                 ssoIdentity.IsActive = metadata.SsoIdentities[0].IsActive;
-                ssoIdentity.FederatedId = metadata.SsoIdentities[0].FederatedId;
+                ssoIdentity.FederatedID = metadata.SsoIdentities[0].FederatedID;
             } else if (
                 Array.isArray(metadata.SsoIdentities?.SsoIdentity) &&
                 metadata.SsoIdentities?.SsoIdentity.length
             ) {
                 // API-compliant format already provided; just use it
                 ssoIdentity.IsActive = metadata.SsoIdentities.SsoIdentity[0]?.IsActive;
-                ssoIdentity.FederatedId = metadata.SsoIdentities.SsoIdentity[0]?.FederatedId;
+                ssoIdentity.FederatedID = metadata.SsoIdentities.SsoIdentity[0]?.FederatedID;
             } else {
+                error = true;
+            }
+            if (
+                (ssoIdentity.IsActive !== true && ssoIdentity.IsActive !== false) ||
+                !ssoIdentity.FederatedID ||
+                error
+            ) {
                 throw new TypeError(
-                    'SsoIdentity should be an object with IsActive and FederatedId properties.'
+                    'SsoIdentity should be an object with IsActive and FederatedID properties.'
                 );
             }
             // if SsoIdentity is set, assume this was on purpose and bring it
             metadata.SsoIdentities = {
                 SsoIdentity: [
                     {
                         IsActive: ssoIdentity.IsActive,
-                        FederatedId: ssoIdentity.FederatedId,
+                        FederatedID: ssoIdentity.FederatedID,
                     },
                 ],
             };

lib/metadataTypes/definitions/User.definition.js

@@ -196,19 +196,19 @@ module.exports = {
             retrieving: false, // retrieve not supported by API
             template: false,
         },
-        'SsoIdentities[]': {
+        'SsoIdentities.SsoIdentity': {
             isCreateable: true,
             isUpdateable: true,
-            retrieving: false,
+            retrieving: false, // retrieve not supported by API
             template: false,
         },
-        'SsoIdentities[].IsActive': {
+        'SsoIdentities.SsoIdentity[].IsActive': {
             isCreateable: true,
             isUpdateable: true,
             retrieving: false,
             template: false,
         },
-        'SsoIdentities[].FederatedID': {
+        'SsoIdentities.SsoIdentity[].FederatedID': {
             isCreateable: true,
             isUpdateable: true,
             retrieving: false,

lib/util/auth.js

@@ -129,7 +129,16 @@ function setupSDK(sessionKey, authObject) {
                 if (Util.OPTIONS.api === 'cli') {
                     console.log(`${Util.color.fgMagenta}API REQUEST >>${Util.color.reset}`, msg); // eslint-disable-line no-console
                 } else if (Util.OPTIONS.api === 'log') {
+                    let data;
+                    if (msg.data) {
+                        data = msg.data;
+                        delete msg.data;
+                    }
                     Util.logger.debug('API REQUEST >> ' + JSON.stringify(msg, null, 2));
+                    if (data) {
+                        // printing it separately leads to better formatting
+                        Util.logger.debug('API REQUEST body >> \n  ' + data);
+                    }
                 }
             },
             logResponse: (res) => {
@@ -138,7 +147,7 @@ function setupSDK(sessionKey, authObject) {
                 if (Util.OPTIONS.api === 'cli') {
                     console.log(`${Util.color.fgMagenta}API RESPONSE <<${Util.color.reset}`, msg); // eslint-disable-line no-console
                 } else if (Util.OPTIONS.api === 'log') {
-                    Util.logger.debug('API RESPONSE << ' + msg);
+                    Util.logger.debug('API RESPONSE body << \n  ' + msg);
                 }
             },
         },

package.json

@@ -1,6 +1,6 @@
 {
     "name": "mcdev",
-    "version": "5.0.0",
+    "version": "5.0.1",
     "description": "Accenture Salesforce Marketing Cloud DevTools",
     "author": "Accenture: joern.berkefeld, douglas.midgley, robert.zimmermann, maciej.barnas",
     "license": "MIT",

test/mockRoot/.mcdevrc.json

@@ -76,5 +76,5 @@
             "triggeredSend"
         ]
     },
-    "version": "5.0.0"
+    "version": "5.0.1"
 }