@pnp/cli-microsoft365 11.12.0-beta.8589b73 → 12.0.0-beta.8dff3ac

package/dist/Auth.js

@@ -262,7 +262,7 @@ export class Auth {
         return {
             auth: authConfig,
             cache: {
-                cachePlugin: msalCachePlugin
+                cachePlugin: await msalCachePlugin.getCachePlugin()
             },
             system: {
                 loggerOptions: {
@@ -735,8 +735,7 @@ export class Auth {
         await allConnectionsStorage.remove();
         // we need to manually clear MSAL cache, because MSAL doesn't have support
         // for logging out when using cert-based auth
-        const msalCache = this.getMsalCacheStorage();
-        await msalCache.remove();
+        await msalCachePlugin.clearMsalCache();
     }
     async removeConnectionInfo(connection, logger, debug) {
         const allConnections = await this.getAllConnections();
@@ -769,9 +768,6 @@ export class Auth {
     getConnectionStorage() {
         return new FileTokenStorage(FileTokenStorage.connectionInfoFilePath());
     }
-    getMsalCacheStorage() {
-        return new FileTokenStorage(FileTokenStorage.msalCacheFilePath());
-    }
     getAllConnectionsStorage() {
         return new FileTokenStorage(FileTokenStorage.allConnectionsFilePath());
     }

package/dist/auth/FileTokenStorage.js

@@ -2,9 +2,6 @@ import fs from 'fs';
 import os from 'os';
 import path from 'path';
 export class FileTokenStorage {
-    static msalCacheFilePath() {
-        return path.join(os.homedir(), '.cli-m365-msal.json');
-    }
     static connectionInfoFilePath() {
         return path.join(os.homedir(), '.cli-m365-connection.json');
     }

package/dist/auth/msalCachePlugin.js

@@ -1,29 +1,218 @@
-import { FileTokenStorage } from './FileTokenStorage.js';
-class MsalCachePlugin {
-    constructor() {
-        this.fileTokenStorage = new FileTokenStorage(FileTokenStorage.msalCacheFilePath());
+import fs from 'fs';
+import os from 'os';
+import path from 'path';
+import { lock } from 'proper-lockfile';
+const legacyCachePath = path.join(os.homedir(), '.cli-m365-msal.json');
+const fallbackCachePath = path.join(os.homedir(), '.cli-m365-msal-cache.json');
+const lockRetryCount = 500;
+const lockRetryDelay = 100;
+const staleLockThreshold = 10000;
+const persistenceConfiguration = {
+    cachePath: fallbackCachePath,
+    serviceName: 'cli-microsoft365',
+    accountName: 'msal-cache',
+    usePlaintextFileOnLinux: true
+};
+export const fileLock = { lock };
+let _initPromise;
+// Fallback ICachePlugin that stores tokens as plain JSON on disk.
+// @azure/msal-node-extensions ships a usePlaintextFileOnLinux option
+// for Linux systems without libsecret, but the package's barrel export
+// eagerly loads LibSecretPersistence which does `import keytar` at the
+// top level. When libsecret is missing, the entire dynamic import of
+// the package fails before any fallback logic can run. This class
+// provides equivalent file-based persistence without depending on the
+// package at all.
+// See: https://github.com/AzureAD/microsoft-authentication-library-for-js/issues/7170
+class FileCachePlugin {
+    constructor(cachePath) {
+        this.cachePath = cachePath;
     }
     async beforeCacheAccess(tokenCacheContext) {
+        await this.acquireLock();
         try {
-            const data = await this.fileTokenStorage.get();
-            tokenCacheContext.tokenCache.deserialize(data);
+            if (fs.existsSync(this.cachePath)) {
+                const data = fs.readFileSync(this.cachePath, 'utf8');
+                tokenCacheContext.tokenCache.deserialize(data);
+            }
         }
         catch {
             // Do nothing
         }
     }
     async afterCacheAccess(tokenCacheContext) {
-        if (!tokenCacheContext.cacheHasChanged) {
-            return;
-        }
         try {
-            await this.fileTokenStorage.set(tokenCacheContext.tokenCache.serialize());
+            if (tokenCacheContext.cacheHasChanged) {
+                if (fs.existsSync(this.cachePath)) {
+                    fs.chmodSync(this.cachePath, 0o600);
+                }
+                fs.writeFileSync(this.cachePath, tokenCacheContext.tokenCache.serialize(), { encoding: 'utf8', mode: 0o600 });
+            }
         }
         catch {
             // Do nothing
         }
+        finally {
+            await this.releaseLock();
+        }
+    }
+    async clearCache() {
+        await this.acquireLock();
+        try {
+            removeFile(this.cachePath);
+        }
+        finally {
+            await this.releaseLock();
+        }
+    }
+    async acquireLock() {
+        this.releaseCacheLock = await msalCachePlugin.acquireFileLock(this.cachePath);
+    }
+    async releaseLock() {
+        if (this.releaseCacheLock === undefined) {
+            return;
+        }
+        const releaseCacheLock = this.releaseCacheLock;
+        this.releaseCacheLock = undefined;
+        await releaseCacheLock();
+    }
+}
+class LockingCachePlugin {
+    constructor(plugin, lockPath) {
+        this.plugin = plugin;
+        this.lockPath = lockPath;
+    }
+    async beforeCacheAccess(tokenCacheContext) {
+        this.releaseCacheLock = await msalCachePlugin.acquireFileLock(this.lockPath);
+        try {
+            await this.plugin.beforeCacheAccess(tokenCacheContext);
+        }
+        catch (err) {
+            await this.releaseLock();
+            throw err;
+        }
+    }
+    async afterCacheAccess(tokenCacheContext) {
+        try {
+            await this.plugin.afterCacheAccess(tokenCacheContext);
+        }
+        finally {
+            await this.releaseLock();
+        }
+    }
+    async clearCache(clearCache) {
+        this.releaseCacheLock = await msalCachePlugin.acquireFileLock(this.lockPath);
+        try {
+            await clearCache();
+        }
+        finally {
+            await this.releaseLock();
+        }
+    }
+    async releaseLock() {
+        if (this.releaseCacheLock === undefined) {
+            return;
+        }
+        const releaseCacheLock = this.releaseCacheLock;
+        this.releaseCacheLock = undefined;
+        await releaseCacheLock();
     }
 }
-const msalCachePlugin = new MsalCachePlugin();
-export { msalCachePlugin };
+function removeFile(filePath) {
+    try {
+        fs.unlinkSync(filePath);
+    }
+    catch (err) {
+        if (err.code !== 'ENOENT') {
+            throw err;
+        }
+    }
+}
+export const msalCachePlugin = {
+    async acquireFileLock(cachePath) {
+        return await fileLock.lock(cachePath, {
+            lockfilePath: `${cachePath}.lockfile`,
+            realpath: false,
+            stale: staleLockThreshold,
+            update: staleLockThreshold / 2,
+            retries: {
+                retries: lockRetryCount,
+                factor: 1,
+                minTimeout: lockRetryDelay,
+                maxTimeout: lockRetryDelay,
+                randomize: false
+            }
+        });
+    },
+    async importMsalExtensions() {
+        return await import('@azure/msal-node-extensions');
+    },
+    async createNativePersistence() {
+        const { DataProtectionScope, PersistenceCachePlugin, PersistenceCreator } = await msalCachePlugin.importMsalExtensions();
+        const persistence = await PersistenceCreator.createPersistence({
+            ...persistenceConfiguration,
+            dataProtectionScope: DataProtectionScope.CurrentUser
+        });
+        const plugin = new LockingCachePlugin(new PersistenceCachePlugin(persistence), `${persistence.getFilePath()}.cli-m365`);
+        return {
+            plugin,
+            clearCache: async () => { await plugin.clearCache(async () => { await persistence.delete(); }); },
+            isFileFallback: false
+        };
+    },
+    createFileFallback() {
+        const plugin = new FileCachePlugin(persistenceConfiguration.cachePath);
+        return {
+            plugin,
+            clearCache: async () => { await plugin.clearCache(); },
+            isFileFallback: true
+        };
+    },
+    removeLegacyCache() {
+        removeFile(legacyCachePath);
+    },
+    async getCachePlugin() {
+        _initPromise ?? (_initPromise = (async () => {
+            msalCachePlugin.removeLegacyCache();
+            try {
+                return await msalCachePlugin.createNativePersistence();
+            }
+            catch (err) {
+                // Fall back to file-based cache only on Linux where libsecret
+                // may not be installed. On Windows (DPAPI) and macOS (Keychain)
+                // native persistence should always work.
+                if (process.platform === 'linux') {
+                    return msalCachePlugin.createFileFallback();
+                }
+                throw err;
+            }
+        })());
+        const { plugin } = await _initPromise;
+        return plugin;
+    },
+    async clearMsalCache() {
+        _initPromise ?? (_initPromise = (async () => {
+            msalCachePlugin.removeLegacyCache();
+            try {
+                return await msalCachePlugin.createNativePersistence();
+            }
+            catch (err) {
+                if (process.platform === 'linux') {
+                    return msalCachePlugin.createFileFallback();
+                }
+                throw err;
+            }
+        })());
+        const { clearCache, isFileFallback } = await _initPromise;
+        await clearCache();
+        // Also remove the file-based fallback cache to ensure no tokens
+        // remain if the machine previously used file-based persistence
+        if (!isFileFallback) {
+            await msalCachePlugin.createFileFallback().clearCache();
+        }
+    },
+    resetForTesting() {
+        _initPromise = undefined;
+    }
+};
 //# sourceMappingURL=msalCachePlugin.js.map

package/dist/m365/commands/logout.js

@@ -16,7 +16,6 @@ class LogoutCommand extends Command {
         if (this.verbose) {
             await logger.logToStderr('Logging out from Microsoft 365...');
         }
-        const deactivate = () => auth.connection.deactivate();
         try {
             await auth.clearConnectionInfo();
         }
@@ -24,10 +23,9 @@ class LogoutCommand extends Command {
             if (this.debug) {
                 await logger.logToStderr(new CommandError(error));
             }
+            throw new CommandError(error);
         }
-        finally {
-            deactivate();
-        }
+        auth.connection.deactivate();
     }
     async action(logger, args) {
         try {

package/dist/m365/entra/commands/m365group/m365group-remove.js

@@ -49,7 +49,7 @@ class EntraM365GroupRemoveCommand extends GraphCommand {
                 const spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);
                 // Delete the Microsoft 365 group site. This operation will also delete the group.
                 await this.deleteM365GroupSite(logger, siteUrl, spoAdminUrl);
-                if (args.options.skipRecycleBin) {
+                if (args.options.permanent) {
                     await this.deleteM365GroupFromRecycleBin(logger, groupId);
                     await this.deleteSiteFromRecycleBin(logger, siteUrl, spoAdminUrl);
                 }
@@ -169,7 +169,7 @@ _EntraM365GroupRemoveCommand_instances = new WeakSet(), _EntraM365GroupRemoveCom
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             force: (!(!args.options.force)).toString(),
-            skipRecycleBin: args.options.skipRecycleBin
+            permanent: !!args.options.permanent
         });
     });
 }, _EntraM365GroupRemoveCommand_initOptions = function _EntraM365GroupRemoveCommand_initOptions() {
@@ -180,7 +180,7 @@ _EntraM365GroupRemoveCommand_instances = new WeakSet(), _EntraM365GroupRemoveCom
     }, {
         option: '-f, --force'
     }, {
-        option: '--skipRecycleBin'
+        option: '--permanent'
     });
 }, _EntraM365GroupRemoveCommand_initValidators = function _EntraM365GroupRemoveCommand_initValidators() {
     this.validators.push(async (args) => {
@@ -193,6 +193,7 @@ _EntraM365GroupRemoveCommand_instances = new WeakSet(), _EntraM365GroupRemoveCom
     this.optionSets.push({ options: ['id', 'displayName'] });
 }, _EntraM365GroupRemoveCommand_initTypes = function _EntraM365GroupRemoveCommand_initTypes() {
     this.types.string.push('id', 'displayName');
+    this.types.boolean.push('permanent');
 };
 EntraM365GroupRemoveCommand.maxRetries = 10;
 export default new EntraM365GroupRemoveCommand();

package/dist/m365/spe/commands/container/container-remove.js

@@ -11,7 +11,7 @@ export const options = z.strictObject({
     name: z.string().optional().alias('n'),
     containerTypeId: z.uuid().optional(),
     containerTypeName: z.string().optional(),
-    recycle: z.boolean().optional(),
+    permanent: z.boolean().optional(),
     force: z.boolean().optional().alias('f')
 });
 class SpeContainerRemoveCommand extends GraphCommand {
@@ -46,7 +46,7 @@ class SpeContainerRemoveCommand extends GraphCommand {
     }
     async commandAction(logger, args) {
         if (!args.options.force) {
-            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove container '${args.options.id || args.options.name}'${!args.options.recycle ? ' permanently' : ''}?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to ${args.options.permanent ? 'permanently remove' : 'recycle'} container '${args.options.id || args.options.name}'?` });
             if (!result) {
                 return;
             }
@@ -63,13 +63,12 @@ class SpeContainerRemoveCommand extends GraphCommand {
                 },
                 responseType: 'json'
             };
-            if (args.options.recycle) {
-                await request.delete(requestOptions);
+            if (args.options.permanent) {
+                requestOptions.url += '/permanentDelete';
+                await request.post(requestOptions);
                 return;
             }
-            // Container should be permanently deleted
-            requestOptions.url += '/permanentDelete';
-            await request.post(requestOptions);
+            await request.delete(requestOptions);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);

package/dist/m365/spfx/commands/project/DeployWorkflow.js

@@ -30,8 +30,8 @@ export const workflow = {
                     run: "npm ci"
                 },
                 {
-                    name: "Bundle & Package",
-                    run: "gulp bundle --ship\ngulp package-solution --ship\n"
+                    name: "Build & Package",
+                    run: "npm run build"
                 },
                 {
                     name: "CLI for Microsoft 365 Login",
@@ -140,20 +140,12 @@ export const pipeline = {
                             }
                         },
                         {
-                            task: "Gulp@0",
-                            displayName: "Gulp bundle",
-                            inputs: {
-                                gulpFile: "./gulpfile.js",
-                                targets: "bundle",
-                                arguments: "--ship"
-                            }
-                        },
-                        {
-                            task: "Gulp@0",
-                            displayName: "Gulp package",
+                            task: "Npm@1",
+                            displayName: "Build and package",
                             inputs: {
-                                targets: "package-solution",
-                                arguments: "--ship"
+                                command: "custom",
+                                verbose: false,
+                                customCommand: "run build"
                             }
                         },
                         {

package/dist/m365/spfx/commands/project/project-azuredevops-pipeline-add.js

@@ -41,8 +41,9 @@ class SpfxProjectAzureDevOpsPipelineAddCommand extends BaseProjectCommand {
             const project = { path: this.projectRootPath };
             this.readAndParseJsonFile(path.join(this.projectRootPath, 'config', 'package-solution.json'), project, 'packageSolutionJson');
             const sppkgPath = project.packageSolutionJson?.paths?.zippedPackage;
-            this.updatePipeline(sppkgPath, pipeline, args.options);
-            this.savePipeline(pipeline);
+            const pipelineToSave = structuredClone(pipeline);
+            this.updatePipeline(sppkgPath, pipelineToSave, args.options);
+            this.savePipeline(pipelineToSave);
         }
         catch (error) {
             this.handleError(error);
@@ -108,6 +109,33 @@ class SpfxProjectAzureDevOpsPipelineAddCommand extends BaseProjectCommand {
             if (options.skipFeatureDeployment) {
                 script.script = script.script.replace(`m365 spo app deploy `, `m365 spo app deploy --skipFeatureDeployment `);
             }
+            if (versionRequirements.heft === undefined) {
+                let steps = this.getPipelineSteps(pipeline);
+                const npmBuildScript = steps.find(step => step.task && step.displayName === 'Build and package');
+                if (npmBuildScript) {
+                    pipeline.stages[0].jobs[0].steps = steps.filter(step => step !== npmBuildScript);
+                }
+                const gulpBundleStep = {
+                    task: 'Gulp@0',
+                    displayName: 'Gulp bundle',
+                    inputs: {
+                        gulpFile: './gulpfile.js',
+                        targets: 'bundle',
+                        arguments: '--ship'
+                    }
+                };
+                const gulpPackageStep = {
+                    task: 'Gulp@0',
+                    displayName: 'Gulp package',
+                    inputs: {
+                        targets: 'package-solution',
+                        arguments: '--ship'
+                    }
+                };
+                steps = this.getPipelineSteps(pipeline);
+                const installCLIStepIndex = steps.findIndex(step => step.task === 'Npm@1' && step.displayName === 'Install CLI for Microsoft 365');
+                pipeline.stages[0].jobs[0].steps.splice(installCLIStepIndex, 0, gulpBundleStep, gulpPackageStep);
+            }
         }
     }
     assignPipelineVariables(pipeline, variableName, newVariableValue) {

package/dist/m365/spfx/commands/project/project-github-workflow-add.js

@@ -43,8 +43,9 @@ class SpfxProjectGithubWorkflowAddCommand extends BaseProjectCommand {
             if (this.debug) {
                 await logger.logToStderr(`Adding GitHub workflow in the current SPFx project`);
             }
-            this.updateWorkflow(solutionName, sppkgPath, workflow, args.options);
-            this.saveWorkflow(workflow);
+            const workflowToSave = structuredClone(workflow);
+            this.updateWorkflow(solutionName, sppkgPath, workflowToSave, args.options);
+            this.saveWorkflow(workflowToSave);
         }
         catch (error) {
             this.handleError(error);
@@ -96,10 +97,19 @@ class SpfxProjectGithubWorkflowAddCommand extends BaseProjectCommand {
             const deployAction = this.getDeployAction(workflow);
             deployAction.with.APP_FILE_PATH = deployAction.with.APP_FILE_PATH.replace('{{ sppkgPath }}', sppkgPath);
         }
+        if (versionRequirements.heft === undefined) {
+            const buildAndPackageStep = this.getBuildAndPackageStep(workflow);
+            buildAndPackageStep.run = `gulp bundle --ship\ngulp package-solution --ship\n`;
+            buildAndPackageStep.name = 'Bundle & Package';
+        }
     }
     assignNodeVersion(workflow, nodeVersion) {
         workflow.jobs['build-and-deploy'].env.NodeVersion = nodeVersion;
     }
+    getBuildAndPackageStep(workflow) {
+        const steps = this.getWorkFlowSteps(workflow);
+        return steps.find(step => step.run && step.name === 'Build & Package');
+    }
     getLoginAction(workflow) {
         const steps = this.getWorkFlowSteps(workflow);
         return steps.find(step => step.uses && step.uses.indexOf('action-cli-login') >= 0);

package/dist/m365/spo/commands/cdn/cdn-get.js

@@ -1,14 +1,14 @@
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _SpoCdnGetCommand_instances, _SpoCdnGetCommand_initTelemetry, _SpoCdnGetCommand_initOptions, _SpoCdnGetCommand_initValidators, _SpoCdnGetCommand_initTypes;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import config from '../../../../config.js';
 import request from '../../../../request.js';
 import { spo } from '../../../../utils/spo.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    type: z.enum(['Public', 'Private']).optional().alias('t')
+});
 class SpoCdnGetCommand extends SpoCommand {
     get name() {
         return commands.CDN_GET;
@@ -16,14 +16,8 @@ class SpoCdnGetCommand extends SpoCommand {
     get description() {
         return 'Views current status of the specified Microsoft 365 CDN';
     }
-    constructor() {
-        super();
-        _SpoCdnGetCommand_instances.add(this);
-        this.validTypes = ['Public', 'Private'];
-        __classPrivateFieldGet(this, _SpoCdnGetCommand_instances, "m", _SpoCdnGetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoCdnGetCommand_instances, "m", _SpoCdnGetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoCdnGetCommand_instances, "m", _SpoCdnGetCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoCdnGetCommand_instances, "m", _SpoCdnGetCommand_initTypes).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         const cdnTypeString = args.options.type || 'Public';
@@ -59,26 +53,5 @@ class SpoCdnGetCommand extends SpoCommand {
         }
     }
 }
-_SpoCdnGetCommand_instances = new WeakSet(), _SpoCdnGetCommand_initTelemetry = function _SpoCdnGetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            cdnType: args.options.type || 'Public'
-        });
-    });
-}, _SpoCdnGetCommand_initOptions = function _SpoCdnGetCommand_initOptions() {
-    this.options.unshift({
-        option: '-t, --type [type]',
-        autocomplete: this.validTypes
-    });
-}, _SpoCdnGetCommand_initValidators = function _SpoCdnGetCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.type && !this.validTypes.includes(args.options.type)) {
-            return `'${args.options.type}' is not a valid CDN type. Allowed values are: ${this.validTypes.join(', ')}.`;
-        }
-        return true;
-    });
-}, _SpoCdnGetCommand_initTypes = function _SpoCdnGetCommand_initTypes() {
-    this.types.string.push('type');
-};
 export default new SpoCdnGetCommand();
 //# sourceMappingURL=cdn-get.js.map

package/dist/m365/spo/commands/cdn/cdn-origin-add.js

@@ -1,15 +1,16 @@
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _SpoCdnOriginAddCommand_instances, _SpoCdnOriginAddCommand_initTelemetry, _SpoCdnOriginAddCommand_initOptions, _SpoCdnOriginAddCommand_initValidators;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import config from '../../../../config.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { spo } from '../../../../utils/spo.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    type: z.enum(['Public', 'Private']).optional().alias('t'),
+    origin: z.string().alias('r')
+});
 class SpoCdnOriginAddCommand extends SpoCommand {
     get name() {
         return commands.CDN_ORIGIN_ADD;
@@ -17,12 +18,8 @@ class SpoCdnOriginAddCommand extends SpoCommand {
     get description() {
         return 'Adds CDN origin to the current SharePoint Online tenant';
     }
-    constructor() {
-        super();
-        _SpoCdnOriginAddCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoCdnOriginAddCommand_instances, "m", _SpoCdnOriginAddCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoCdnOriginAddCommand_instances, "m", _SpoCdnOriginAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoCdnOriginAddCommand_instances, "m", _SpoCdnOriginAddCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         const cdnTypeString = args.options.type || 'Public';
@@ -53,29 +50,5 @@ class SpoCdnOriginAddCommand extends SpoCommand {
         }
     }
 }
-_SpoCdnOriginAddCommand_instances = new WeakSet(), _SpoCdnOriginAddCommand_initTelemetry = function _SpoCdnOriginAddCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            cdnType: args.options.type || 'Public'
-        });
-    });
-}, _SpoCdnOriginAddCommand_initOptions = function _SpoCdnOriginAddCommand_initOptions() {
-    this.options.unshift({
-        option: '-t, --type [type]',
-        autocomplete: ['Public', 'Private']
-    }, {
-        option: '-r, --origin <origin>'
-    });
-}, _SpoCdnOriginAddCommand_initValidators = function _SpoCdnOriginAddCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.type) {
-            if (args.options.type !== 'Public' &&
-                args.options.type !== 'Private') {
-                return `${args.options.type} is not a valid CDN type. Allowed values are Public|Private`;
-            }
-        }
-        return true;
-    });
-};
 export default new SpoCdnOriginAddCommand();
 //# sourceMappingURL=cdn-origin-add.js.map