@hubspot/local-dev-lib 0.5.0-experimental.11 → 0.5.0-experimental.12
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/config/migrate.js +3 -1
- package/lib/personalAccessKey.js +2 -2
- package/package.json +1 -1
package/config/migrate.js
CHANGED
|
@@ -64,7 +64,9 @@ function mergeConfigProperties(toConfig, fromConfig, force) {
|
|
|
64
64
|
config_1.DEFAULT_ACCOUNT,
|
|
65
65
|
];
|
|
66
66
|
propertiesToCheck.forEach(prop => {
|
|
67
|
-
if (toConfig[prop] !== undefined &&
|
|
67
|
+
if (toConfig[prop] !== undefined &&
|
|
68
|
+
fromConfig[prop] !== undefined &&
|
|
69
|
+
toConfig[prop] !== fromConfig[prop]) {
|
|
68
70
|
conflicts.push({
|
|
69
71
|
property: prop,
|
|
70
72
|
oldValue: fromConfig[prop],
|
package/lib/personalAccessKey.js
CHANGED
|
@@ -159,12 +159,12 @@ async function updateConfigWithAccessToken(token, personalAccessKey, env, name,
|
|
|
159
159
|
accountId: portalId,
|
|
160
160
|
accountType,
|
|
161
161
|
personalAccessKey,
|
|
162
|
-
name: name || account?.name
|
|
162
|
+
name: name || account?.name,
|
|
163
163
|
authType: auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value,
|
|
164
164
|
auth: { tokenInfo: { accessToken, expiresAt } },
|
|
165
165
|
parentAccountId,
|
|
166
166
|
env: accountEnv,
|
|
167
|
-
};
|
|
167
|
+
}; // Account may temporarily not have a name before prompted to add one in the CLI
|
|
168
168
|
// Add new account if it doesn't exist, otherwise update existing account
|
|
169
169
|
if (account) {
|
|
170
170
|
(0, config_1.updateConfigAccount)(updatedAccount);
|
package/package.json
CHANGED