auth0-deploy-cli 7.4.0 → 7.5.2

package/lib/tools/auth0/handlers/connections.js

@@ -1,125 +1,157 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
 });
-exports.default = exports.schema = undefined;
-
-var _dec, _class;
-
-var _default = require("./default");
-
-var _default2 = _interopRequireDefault(_default);
-
-var _utils = require("../../utils");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function _applyDecoratedDescriptor(target, property, decorators, descriptor, context) { var desc = {}; Object.keys(descriptor).forEach(function (key) { desc[key] = descriptor[key]; }); desc.enumerable = !!desc.enumerable; desc.configurable = !!desc.configurable; if ('value' in desc || desc.initializer) { desc.writable = true; } desc = decorators.slice().reverse().reduce(function (desc, decorator) { return decorator(target, property, desc) || desc; }, desc); if (context && desc.initializer !== void 0) { desc.value = desc.initializer ? desc.initializer.call(context) : void 0; desc.initializer = undefined; } if (desc.initializer === void 0) { Object.defineProperty(target, property, desc); desc = null; } return desc; }
-
-const schema = exports.schema = {
-  type: 'array',
-  items: {
-    type: 'object',
-    properties: {
-      name: {
-        type: 'string'
-      },
-      strategy: {
-        type: 'string'
-      },
-      options: {
-        type: 'object'
-      },
-      enabled_clients: {
-        type: 'array',
-        items: {
-          type: 'string'
-        }
-      },
-      realms: {
-        type: 'array',
-        items: {
-          type: 'string'
-        }
-      },
-      metadata: {
-        type: 'object'
-      }
-    },
-    required: ['name', 'strategy']
-  }
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-let ConnectionsHandler = (_dec = (0, _default.order)('60'), (_class = class ConnectionsHandler extends _default2.default {
-  constructor(config) {
-    super({ ...config,
-      type: 'connections',
-      stripUpdateFields: ['strategy', 'name']
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
-  }
-
-  objString(connection) {
-    return super.objString({
-      name: connection.name,
-      id: connection.id
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addExcludedConnectionPropertiesToChanges = exports.schema = void 0;
+const dot_prop_1 = __importDefault(require("dot-prop"));
+const lodash_1 = __importDefault(require("lodash"));
+const default_1 = __importStar(require("./default"));
+const utils_1 = require("../../utils");
+exports.schema = {
+    type: 'array',
+    items: {
+        type: 'object',
+        properties: {
+            name: { type: 'string' },
+            strategy: { type: 'string' },
+            options: { type: 'object' },
+            enabled_clients: { type: 'array', items: { type: 'string' } },
+            realms: { type: 'array', items: { type: 'string' } },
+            metadata: { type: 'object' }
+        },
+        required: ['name', 'strategy']
+    }
+};
+// addExcludedConnectionPropertiesToChanges superimposes excluded properties on the `options` object. The Auth0 API
+// will overwrite the options property when updating connections, so it is necessary to add excluded properties back in to prevent those excluded properties from being deleted.
+// This use case is common because organizations may not want to expose sensitive connection details, but want to preserve them in the tenant.
+// exported only for unit testing purposes
+const addExcludedConnectionPropertiesToChanges = ({ proposedChanges, existingConnections, config }) => {
+    var _a, _b;
+    if (proposedChanges.update.length === 0)
+        return proposedChanges;
+    const excludedFields = ((_b = (_a = config()) === null || _a === void 0 ? void 0 : _a.EXCLUDED_PROPS) === null || _b === void 0 ? void 0 : _b.connections) || [];
+    if (excludedFields.length === 0)
+        return proposedChanges;
+    const existingConnectionsMap = lodash_1.default.keyBy(existingConnections, 'id');
+    const excludedOptions = excludedFields.filter(
+    // Only include fields that pertain to options
+    (excludedField) => excludedField.startsWith('options'));
+    const newProposedUpdates = proposedChanges.update.map((proposedConnection) => {
+        const currConnection = existingConnectionsMap[proposedConnection.id];
+        const currentExcludedPropertyValues = excludedOptions.reduce((agg, excludedField) => {
+            if (!dot_prop_1.default.has(currConnection, excludedField))
+                return agg;
+            const currentExcludedFieldValue = dot_prop_1.default.get(currConnection, excludedField);
+            dot_prop_1.default.set(agg, excludedField, currentExcludedFieldValue);
+            return agg;
+        }, {});
+        return Object.assign(Object.assign({}, proposedConnection), { options: Object.assign(Object.assign({}, proposedConnection.options), currentExcludedPropertyValues.options) });
     });
-  }
-
-  getFormattedOptions(connection, clients) {
-    try {
-      return {
-        options: { ...connection.options,
-          idpinitiated: { ...connection.options.idpinitiated,
-            client_id: (0, _utils.convertClientNameToId)(connection.options.idpinitiated.client_id, clients)
-          }
+    return Object.assign(Object.assign({}, proposedChanges), { update: newProposedUpdates });
+};
+exports.addExcludedConnectionPropertiesToChanges = addExcludedConnectionPropertiesToChanges;
+class ConnectionsHandler extends default_1.default {
+    constructor(config) {
+        super(Object.assign(Object.assign({}, config), { type: 'connections', stripUpdateFields: ['strategy', 'name'] }));
+    }
+    objString(connection) {
+        return super.objString({ name: connection.name, id: connection.id });
+    }
+    getFormattedOptions(connection, clients) {
+        try {
+            return {
+                options: Object.assign(Object.assign({}, connection.options), { idpinitiated: Object.assign(Object.assign({}, connection.options.idpinitiated), { client_id: (0, utils_1.convertClientNameToId)(connection.options.idpinitiated.client_id, clients) }) })
+            };
+        }
+        catch (e) {
+            return {};
         }
-      };
-    } catch (e) {
-      return {};
     }
-  }
-
-  async getType() {
-    if (this.existing) return this.existing;
-    const connections = await this.client.connections.getAll({
-      paginate: true,
-      include_totals: true
-    });
-    this.existing = connections.filter(c => c.strategy !== 'auth0');
-    return this.existing;
-  }
-
-  async calcChanges(assets) {
-    const {
-      connections
-    } = assets;
-    if (!connections) return {};
-    const clients = await this.client.clients.getAll({
-      paginate: true,
-      include_totals: true
-    });
-    const existingConnections = await this.client.connections.getAll({
-      paginate: true,
-      include_totals: true
-    });
-    const formatted = assets.connections.map(connection => ({ ...connection,
-      ...this.getFormattedOptions(connection, clients),
-      enabled_clients: (0, _utils.getEnabledClients)(assets, connection, existingConnections, clients)
-    }));
-    return super.calcChanges({ ...assets,
-      connections: formatted
-    });
-  }
-
-  async processChanges(assets) {
-    const {
-      connections
-    } = assets;
-    if (!connections) return;
-    const excludedConnections = assets.exclude && assets.exclude.connections || [];
-    const changes = await this.calcChanges(assets);
-    await super.processChanges(assets, (0, _utils.filterExcluded)(changes, excludedConnections));
-  }
-
-}, (_applyDecoratedDescriptor(_class.prototype, "processChanges", [_dec], Object.getOwnPropertyDescriptor(_class.prototype, "processChanges"), _class.prototype)), _class));
-exports.default = ConnectionsHandler;
+    getType() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.existing)
+                return this.existing;
+            const connections = yield this.client.connections.getAll({ paginate: true, include_totals: true });
+            // Filter out database connections
+            this.existing = connections.filter((c) => c.strategy !== 'auth0');
+            return this.existing;
+        });
+    }
+    calcChanges(assets) {
+        const _super = Object.create(null, {
+            calcChanges: { get: () => super.calcChanges }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            const { connections } = assets;
+            // Do nothing if not set
+            if (!connections)
+                return {};
+            // Convert enabled_clients by name to the id
+            const clients = yield this.client.clients.getAll({ paginate: true, include_totals: true });
+            const existingConnections = yield this.client.connections.getAll({ paginate: true, include_totals: true });
+            const formatted = assets.connections.map((connection) => (Object.assign(Object.assign(Object.assign({}, connection), this.getFormattedOptions(connection, clients)), { enabled_clients: (0, utils_1.getEnabledClients)(assets, connection, existingConnections, clients) })));
+            const proposedChanges = yield _super.calcChanges.call(this, Object.assign(Object.assign({}, assets), { connections: formatted }));
+            const proposedChangesWithExcludedProperties = (0, exports.addExcludedConnectionPropertiesToChanges)({ proposedChanges, existingConnections, config: this.config });
+            return proposedChangesWithExcludedProperties;
+        });
+    }
+    // Run after clients are updated so we can convert all the enabled_clients names to id's
+    processChanges(assets) {
+        const _super = Object.create(null, {
+            processChanges: { get: () => super.processChanges }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            const { connections } = assets;
+            // Do nothing if not set
+            if (!connections)
+                return;
+            const excludedConnections = (assets.exclude && assets.exclude.connections) || [];
+            const changes = yield this.calcChanges(assets);
+            yield _super.processChanges.call(this, assets, (0, utils_1.filterExcluded)(changes, excludedConnections));
+        });
+    }
+}
+__decorate([
+    (0, default_1.order)('60')
+], ConnectionsHandler.prototype, "processChanges", null);
+exports.default = ConnectionsHandler;

package/lib/tools/auth0/handlers/databases.js

@@ -1,132 +1,135 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
 });
-exports.default = exports.schema = undefined;
-
-var _dec, _class;
-
-var _default = require("./default");
-
-var _default2 = _interopRequireDefault(_default);
-
-var _constants = require("../../constants");
-
-var _constants2 = _interopRequireDefault(_constants);
-
-var _utils = require("../../utils");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function _applyDecoratedDescriptor(target, property, decorators, descriptor, context) { var desc = {}; Object.keys(descriptor).forEach(function (key) { desc[key] = descriptor[key]; }); desc.enumerable = !!desc.enumerable; desc.configurable = !!desc.configurable; if ('value' in desc || desc.initializer) { desc.writable = true; } desc = decorators.slice().reverse().reduce(function (desc, decorator) { return decorator(target, property, desc) || desc; }, desc); if (context && desc.initializer !== void 0) { desc.value = desc.initializer ? desc.initializer.call(context) : void 0; desc.initializer = undefined; } if (desc.initializer === void 0) { Object.defineProperty(target, property, desc); desc = null; } return desc; }
-
-const schema = exports.schema = {
-  type: 'array',
-  items: {
-    type: 'object',
-    properties: {
-      strategy: {
-        type: 'string',
-        enum: ['auth0'],
-        default: 'auth0'
-      },
-      name: {
-        type: 'string'
-      },
-      options: {
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.schema = void 0;
+const default_1 = __importStar(require("./default"));
+const constants_1 = __importDefault(require("../../constants"));
+const utils_1 = require("../../utils");
+exports.schema = {
+    type: 'array',
+    items: {
         type: 'object',
         properties: {
-          customScripts: {
-            type: 'object',
-            properties: { ..._constants2.default.DATABASE_SCRIPTS.reduce((o, script) => ({ ...o,
-                [script]: {
-                  type: 'string'
+            strategy: { type: 'string', enum: ['auth0'], default: 'auth0' },
+            name: { type: 'string' },
+            options: {
+                type: 'object',
+                properties: {
+                    customScripts: {
+                        type: 'object',
+                        properties: Object.assign({}, constants_1.default.DATABASE_SCRIPTS.reduce((o, script) => (Object.assign(Object.assign({}, o), { [script]: { type: 'string' } })), {}))
+                    }
                 }
-              }), {})
             }
-          }
-        }
-      }
-    },
-    required: ['name']
-  }
+        },
+        required: ['name']
+    }
 };
-let DatabaseHandler = (_dec = (0, _default.order)('60'), (_class = class DatabaseHandler extends _default2.default {
-  constructor(config) {
-    super({ ...config,
-      type: 'databases',
-      stripUpdateFields: ['strategy', 'name']
-    });
-  }
-
-  objString(db) {
-    return super.objString({
-      name: db.name,
-      id: db.id
-    });
-  }
-
-  getClientFN(fn) {
-    if (fn === this.functions.update) {
-      return (params, payload) => this.client.connections.get(params).then(connection => {
-        payload.options = { ...connection.options,
-          ...payload.options
-        };
-        return this.client.connections.update(params, payload);
-      });
+class DatabaseHandler extends default_1.default {
+    constructor(config) {
+        super(Object.assign(Object.assign({}, config), { type: 'databases', stripUpdateFields: ['strategy', 'name'] }));
     }
-
-    return this.client.connections[fn].bind(this.client.connections);
-  }
-
-  async getType() {
-    if (this.existing) return this.existing;
-    this.existing = this.client.connections.getAll({
-      strategy: 'auth0',
-      paginate: true,
-      include_totals: true
-    });
-    return this.existing;
-  }
-
-  async calcChanges(assets) {
-    const {
-      databases
-    } = assets;
-    if (!databases) return {};
-    const clients = await this.client.clients.getAll({
-      paginate: true,
-      include_totals: true
-    });
-    const existingDatabasesConecctions = await this.client.connections.getAll({
-      strategy: 'auth0',
-      paginate: true,
-      include_totals: true
-    });
-    const formatted = databases.map(db => {
-      if (db.enabled_clients) {
-        return { ...db,
-          enabled_clients: (0, _utils.getEnabledClients)(assets, db, existingDatabasesConecctions, clients)
-        };
-      }
-
-      return db;
-    });
-    return super.calcChanges({ ...assets,
-      databases: formatted
-    });
-  }
-
-  async processChanges(assets) {
-    const {
-      databases
-    } = assets;
-    if (!databases) return;
-    const excludedConnections = assets.exclude && assets.exclude.databases || [];
-    const changes = await this.calcChanges(assets);
-    await super.processChanges(assets, (0, _utils.filterExcluded)(changes, excludedConnections));
-  }
-
-}, (_applyDecoratedDescriptor(_class.prototype, "processChanges", [_dec], Object.getOwnPropertyDescriptor(_class.prototype, "processChanges"), _class.prototype)), _class));
-exports.default = DatabaseHandler;
+    objString(db) {
+        return super.objString({ name: db.name, id: db.id });
+    }
+    getClientFN(fn) {
+        // Override this as a database is actually a connection but we are treating them as a different object
+        // If we going to update database, we need to get current options first
+        if (fn === this.functions.update) {
+            return (params, payload) => this.client.connections.get(params)
+                .then((connection) => {
+                payload.options = Object.assign(Object.assign({}, connection.options), payload.options);
+                return this.client.connections.update(params, payload);
+            });
+        }
+        return this.client.connections[fn].bind(this.client.connections);
+    }
+    getType() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.existing)
+                return this.existing;
+            this.existing = this.client.connections.getAll({ strategy: 'auth0', paginate: true, include_totals: true });
+            return this.existing;
+        });
+    }
+    calcChanges(assets) {
+        const _super = Object.create(null, {
+            calcChanges: { get: () => super.calcChanges }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            const { databases } = assets;
+            // Do nothing if not set
+            if (!databases)
+                return {};
+            // Convert enabled_clients by name to the id
+            const clients = yield this.client.clients.getAll({ paginate: true, include_totals: true });
+            const existingDatabasesConecctions = yield this.client.connections.getAll({ strategy: 'auth0', paginate: true, include_totals: true });
+            const formatted = databases.map((db) => {
+                if (db.enabled_clients) {
+                    return Object.assign(Object.assign({}, db), { enabled_clients: (0, utils_1.getEnabledClients)(assets, db, existingDatabasesConecctions, clients) });
+                }
+                return db;
+            });
+            return _super.calcChanges.call(this, Object.assign(Object.assign({}, assets), { databases: formatted }));
+        });
+    }
+    // Run after clients are updated so we can convert all the enabled_clients names to id's
+    processChanges(assets) {
+        const _super = Object.create(null, {
+            processChanges: { get: () => super.processChanges }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            const { databases } = assets;
+            // Do nothing if not set
+            if (!databases)
+                return;
+            const excludedConnections = (assets.exclude && assets.exclude.databases) || [];
+            const changes = yield this.calcChanges(assets);
+            yield _super.processChanges.call(this, assets, (0, utils_1.filterExcluded)(changes, excludedConnections));
+        });
+    }
+}
+__decorate([
+    (0, default_1.order)('60')
+], DatabaseHandler.prototype, "processChanges", null);
+exports.default = DatabaseHandler;