Added application only check to some more commands

src/m365/base/ToDoCommand.spec.ts

@@ -0,0 +1,46 @@
+import assert from 'assert';
+import sinon from 'sinon';
+import auth from '../../Auth.js';
+import { telemetry } from '../../telemetry.js';
+import PowerAutomateCommand from './PowerAutomateCommand.js';
+import { accessToken } from '../../utils/accessToken.js';
+
+class MockCommand extends PowerAutomateCommand {
+  public get name(): string {
+    return 'mock';
+  }
+
+  public get description(): string {
+    return 'Mock command';
+  }
+
+  public async commandAction(): Promise<void> {
+  }
+
+  public commandHelp(): void {
+  }
+}
+
+describe('ToDoCommand', () => {
+  const cmd = new MockCommand();
+
+  before(() => {
+    sinon.stub(telemetry, 'trackEvent').returns();
+    auth.service.accessTokens[auth.defaultResource] = {
+      expiresOn: 'abc',
+      accessToken: 'abc'
+    };
+    auth.service.connected = true;
+  });
+
+  after(() => {
+    sinon.restore();
+    auth.service.connected = false;
+  });
+
+  it('throws error when trying to use the command using application only permissions', () => {
+    sinon.stub(accessToken, 'isAppOnlyAccessToken').returns(true);
+    auth.service.connected = true;
+    assert.throws(() => (cmd as any).initAction({ options: {} }, {}));
+  });
+});

src/m365/base/ToDoCommand.ts

@@ -0,0 +1,12 @@
+import { CommandArgs } from '../../Command.js';
+import { Logger } from '../../cli/Logger.js';
+import { accessToken } from '../../utils/accessToken.js';
+import GraphCommand from './GraphCommand.js';
+
+export default abstract class ToDoCommand extends GraphCommand {
+  protected initAction(args: CommandArgs, logger: Logger): void {
+    super.initAction(args, logger);
+
+    accessToken.ensureDelegatedAccessToken();
+  }
+}

src/m365/outlook/commands/message/message-list.spec.ts

@@ -13,6 +13,7 @@ import { sinonUtil } from '../../../../utils/sinonUtil.js';
 import commands from '../../commands.js';
 import command from './message-list.js';
 import { settingsNames } from '../../../../settingsNames.js';
+import { accessToken } from '../../../../utils/accessToken.js';
 
 describe(commands.MESSAGE_LIST, () => {
   let log: string[];
@@ -353,6 +354,11 @@ describe(commands.MESSAGE_LIST, () => {
     sinon.stub(telemetry, 'trackEvent').returns();
     sinon.stub(pid, 'getProcessName').returns('');
     sinon.stub(session, 'getId').returns('');
+    sinon.stub(accessToken, 'isAppOnlyAccessToken').returns(false);
+    auth.service.accessTokens[auth.defaultResource] = {
+      expiresOn: 'abc',
+      accessToken: 'abc'
+    };
     auth.service.connected = true;
     commandInfo = cli.getCommandInfo(command);
   });
@@ -566,6 +572,14 @@ describe(commands.MESSAGE_LIST, () => {
       new CommandError('An error has occurred'));
   });
 
+  it('throws error when using application permissions', async () => {
+    sinonUtil.restore(accessToken.isAppOnlyAccessToken);
+    sinon.stub(accessToken, 'isAppOnlyAccessToken').returns(true);
+
+    await assert.rejects(command.action(logger, { options: {} } as any),
+      new CommandError('This command does not support application-only permissions.'));
+  });
+
   it('fails validation if neither folderId nor folderName are specified', async () => {
     sinon.stub(cli, 'getSettingWithDefaultValue').callsFake((settingName, defaultValue) => {
       if (settingName === settingsNames.prompt) {

src/m365/outlook/commands/message/message-list.ts

@@ -8,6 +8,7 @@ import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
 import { Outlook } from '../../Outlook.js';
 import { cli } from '../../../../cli/cli.js';
+import { accessToken } from '../../../../utils/accessToken.js';
 
 interface CommandArgs {
   options: Options;
@@ -67,6 +68,8 @@ class OutlookMessageListCommand extends GraphCommand {
 
   public async commandAction(logger: Logger, args: CommandArgs): Promise<void> {
     try {
+      accessToken.ensureDelegatedAccessToken();
+
       const folderId = await this.getFolderId(args);
 
       const url: string = folderId ? `me/mailFolders/${folderId}/messages` : 'me/messages';

src/m365/outlook/commands/message/message-move.spec.ts

@@ -13,6 +13,7 @@ import { sinonUtil } from '../../../../utils/sinonUtil.js';
 import commands from '../../commands.js';
 import command from './message-move.js';
 import { settingsNames } from '../../../../settingsNames.js';
+import { accessToken } from '../../../../utils/accessToken.js';
 
 describe(commands.MESSAGE_MOVE, () => {
   let log: string[];
@@ -24,6 +25,11 @@ describe(commands.MESSAGE_MOVE, () => {
     sinon.stub(telemetry, 'trackEvent').returns();
     sinon.stub(pid, 'getProcessName').returns('');
     sinon.stub(session, 'getId').returns('');
+    sinon.stub(accessToken, 'isAppOnlyAccessToken').returns(false);
+    auth.service.accessTokens[auth.defaultResource] = {
+      expiresOn: 'abc',
+      accessToken: 'abc'
+    };
     auth.service.connected = true;
     commandInfo = cli.getCommandInfo(command);
   });
@@ -371,6 +377,14 @@ describe(commands.MESSAGE_MOVE, () => {
       new CommandError('An error has occurred'));
   });
 
+  it('throws error when using application permissions', async () => {
+    sinonUtil.restore(accessToken.isAppOnlyAccessToken);
+    sinon.stub(accessToken, 'isAppOnlyAccessToken').returns(true);
+
+    await assert.rejects(command.action(logger, { options: { id: 'AAMkAGVmMDEzMTM4LTZmYWUtNDdkNC1hMDZiLTU1OGY5OTZhYmY4OABGAAAAAAAiQ8W967B7TKBjgx9rVEURBwAiIsqMbYjsT5e-T7KzowPTAAAAAAEMAAAiIsqMbYjsT5e-T7KzowPTAALvuv07AAA', sourceFolderId: 'inbox', targetFolderId: 'archive' } } as any),
+      new CommandError('This command does not support application-only permissions.'));
+  });
+
   it('passes validation if all required options specified', async () => {
     const actual = await command.validate({ options: { id: 'AAMkAGVmMDEzMTM4LTZmYWUtNDdkNC1hMDZiLTU1OGY5OTZhYmY4OABGAAAAAAAiQ8W967B7TKBjgx9rVEURBwAiIsqMbYjsT5e-T7KzowPTAAAAAAEMAAAiIsqMbYjsT5e-T7KzowPTAALvuv07AAA', sourceFolderId: 'inbox', targetFolderId: 'archive' } }, commandInfo);
     assert.strictEqual(actual, true);

src/m365/outlook/commands/message/message-move.ts

@@ -6,6 +6,7 @@ import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
 import { Outlook } from '../../Outlook.js';
 import { cli } from '../../../../cli/cli.js';
+import { accessToken } from '../../../../utils/accessToken.js';
 
 interface CommandArgs {
   options: Options;
@@ -83,6 +84,8 @@ class OutlookMessageMoveCommand extends GraphCommand {
     let targetFolder: string;
 
     try {
+      accessToken.ensureDelegatedAccessToken();
+
       sourceFolder = await this.getFolderId(args.options.sourceFolderId, args.options.sourceFolderName);
       targetFolder = await this.getFolderId(args.options.targetFolderId, args.options.targetFolderName);
 

src/m365/todo/commands/list/list-add.spec.ts

@@ -10,6 +10,7 @@ import { session } from '../../../../utils/session.js';
 import { sinonUtil } from '../../../../utils/sinonUtil.js';
 import commands from '../../commands.js';
 import command from './list-add.js';
+import { accessToken } from '../../../../utils/accessToken.js';
 
 describe(commands.LIST_ADD, () => {
   let log: string[];
@@ -20,6 +21,11 @@ describe(commands.LIST_ADD, () => {
     sinon.stub(telemetry, 'trackEvent').returns();
     sinon.stub(pid, 'getProcessName').returns('');
     sinon.stub(session, 'getId').returns('');
+    sinon.stub(accessToken, 'isAppOnlyAccessToken').returns(false);
+    auth.service.accessTokens[auth.defaultResource] = {
+      expiresOn: 'abc',
+      accessToken: 'abc'
+    };
     auth.service.connected = true;
   });
 

src/m365/todo/commands/list/list-add.ts

@@ -1,7 +1,7 @@
 import { Logger } from '../../../../cli/Logger.js';
 import GlobalOptions from '../../../../GlobalOptions.js';
 import request from '../../../../request.js';
-import GraphCommand from '../../../base/GraphCommand.js';
+import ToDoCommand from '../../../base/ToDoCommand.js';
 import commands from '../../commands.js';
 
 interface CommandArgs {
@@ -12,7 +12,7 @@ interface Options extends GlobalOptions {
   name: string;
 }
 
-class TodoListAddCommand extends GraphCommand {
+class TodoListAddCommand extends ToDoCommand {
   public get name(): string {
     return commands.LIST_ADD;
   }

src/m365/todo/commands/list/list-get.spec.ts

@@ -13,6 +13,7 @@ import { session } from '../../../../utils/session.js';
 import { sinonUtil } from '../../../../utils/sinonUtil.js';
 import commands from '../../commands.js';
 import command from './list-get.js';
+import { accessToken } from '../../../../utils/accessToken.js';
 
 describe(commands.LIST_GET, () => {
   let commandInfo: CommandInfo;
@@ -39,6 +40,11 @@ describe(commands.LIST_GET, () => {
     sinon.stub(telemetry, 'trackEvent').returns();
     sinon.stub(pid, 'getProcessName').returns('');
     sinon.stub(session, 'getId').returns('');
+    sinon.stub(accessToken, 'isAppOnlyAccessToken').returns(false);
+    auth.service.accessTokens[auth.defaultResource] = {
+      expiresOn: 'abc',
+      accessToken: 'abc'
+    };
     auth.service.connected = true;
     commandInfo = cli.getCommandInfo(command);
   });

src/m365/todo/commands/list/list-get.ts

@@ -2,7 +2,7 @@ import { Logger } from '../../../../cli/Logger.js';
 import GlobalOptions from '../../../../GlobalOptions.js';
 import request, { CliRequestOptions } from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
-import GraphCommand from '../../../base/GraphCommand.js';
+import ToDoCommand from '../../../base/ToDoCommand.js';
 import commands from '../../commands.js';
 import { ToDoList } from '../../ToDoList.js';
 
@@ -15,7 +15,7 @@ interface Options extends GlobalOptions {
   name?: string;
 }
 
-class TodoListGetCommand extends GraphCommand {
+class TodoListGetCommand extends ToDoCommand {
   public get name(): string {
     return commands.LIST_GET;
   }

src/m365/todo/commands/list/list-list.spec.ts

@@ -10,6 +10,7 @@ import { session } from '../../../../utils/session.js';
 import { sinonUtil } from '../../../../utils/sinonUtil.js';
 import commands from '../../commands.js';
 import command from './list-list.js';
+import { accessToken } from '../../../../utils/accessToken.js';
 
 describe(commands.LIST_LIST, () => {
   let log: string[];
@@ -20,6 +21,11 @@ describe(commands.LIST_LIST, () => {
     sinon.stub(telemetry, 'trackEvent').returns();
     sinon.stub(pid, 'getProcessName').returns('');
     sinon.stub(session, 'getId').returns('');
+    sinon.stub(accessToken, 'isAppOnlyAccessToken').returns(false);
+    auth.service.accessTokens[auth.defaultResource] = {
+      expiresOn: 'abc',
+      accessToken: 'abc'
+    };
     auth.service.connected = true;
   });
 

src/m365/todo/commands/list/list-list.ts

@@ -1,10 +1,10 @@
 import { Logger } from '../../../../cli/Logger.js';
 import { odata } from '../../../../utils/odata.js';
-import GraphCommand from '../../../base/GraphCommand.js';
+import ToDoCommand from '../../../base/ToDoCommand.js';
 import commands from '../../commands.js';
 import { ToDoList } from '../../ToDoList.js';
 
-class TodoListListCommand extends GraphCommand {
+class TodoListListCommand extends ToDoCommand {
   public get name(): string {
     return commands.LIST_LIST;
   }

src/m365/todo/commands/list/list-remove.spec.ts

@@ -13,6 +13,7 @@ import { sinonUtil } from '../../../../utils/sinonUtil.js';
 import commands from '../../commands.js';
 import command from './list-remove.js';
 import { settingsNames } from '../../../../settingsNames.js';
+import { accessToken } from '../../../../utils/accessToken.js';
 
 describe(commands.LIST_REMOVE, () => {
   let log: string[];
@@ -24,6 +25,11 @@ describe(commands.LIST_REMOVE, () => {
     sinon.stub(telemetry, 'trackEvent').returns();
     sinon.stub(pid, 'getProcessName').returns('');
     sinon.stub(session, 'getId').returns('');
+    sinon.stub(accessToken, 'isAppOnlyAccessToken').returns(false);
+    auth.service.accessTokens[auth.defaultResource] = {
+      expiresOn: 'abc',
+      accessToken: 'abc'
+    };
     auth.service.connected = true;
     sinon.stub(cli, 'promptForConfirmation').resolves(true);
     commandInfo = cli.getCommandInfo(command);

src/m365/todo/commands/list/list-remove.ts

@@ -2,7 +2,7 @@ import { cli } from '../../../../cli/cli.js';
 import { Logger } from '../../../../cli/Logger.js';
 import GlobalOptions from '../../../../GlobalOptions.js';
 import request from '../../../../request.js';
-import GraphCommand from '../../../base/GraphCommand.js';
+import ToDoCommand from '../../../base/ToDoCommand.js';
 import commands from '../../commands.js';
 
 interface CommandArgs {
@@ -15,7 +15,7 @@ interface Options extends GlobalOptions {
   force?: boolean;
 }
 
-class TodoListRemoveCommand extends GraphCommand {
+class TodoListRemoveCommand extends ToDoCommand {
   public get name(): string {
     return commands.LIST_REMOVE;
   }

src/m365/todo/commands/list/list-set.spec.ts

@@ -13,6 +13,7 @@ import { sinonUtil } from '../../../../utils/sinonUtil.js';
 import commands from '../../commands.js';
 import command from './list-set.js';
 import { settingsNames } from '../../../../settingsNames.js';
+import { accessToken } from '../../../../utils/accessToken.js';
 
 describe(commands.LIST_SET, () => {
   let log: string[];
@@ -24,6 +25,11 @@ describe(commands.LIST_SET, () => {
     sinon.stub(telemetry, 'trackEvent').returns();
     sinon.stub(pid, 'getProcessName').returns('');
     sinon.stub(session, 'getId').returns('');
+    sinon.stub(accessToken, 'isAppOnlyAccessToken').returns(false);
+    auth.service.accessTokens[auth.defaultResource] = {
+      expiresOn: 'abc',
+      accessToken: 'abc'
+    };
     auth.service.connected = true;
     commandInfo = cli.getCommandInfo(command);
   });

src/m365/todo/commands/list/list-set.ts

@@ -1,7 +1,7 @@
 import { Logger } from '../../../../cli/Logger.js';
 import GlobalOptions from '../../../../GlobalOptions.js';
 import request from '../../../../request.js';
-import GraphCommand from '../../../base/GraphCommand.js';
+import ToDoCommand from '../../../base/ToDoCommand.js';
 import commands from '../../commands.js';
 
 interface CommandArgs {
@@ -14,7 +14,7 @@ interface Options extends GlobalOptions {
   newName: string;
 }
 
-class TodoListSetCommand extends GraphCommand {
+class TodoListSetCommand extends ToDoCommand {
   public get name(): string {
     return commands.LIST_SET;
   }

src/m365/todo/commands/task/task-add.spec.ts

@@ -12,6 +12,7 @@ import { session } from '../../../../utils/session.js';
 import { sinonUtil } from '../../../../utils/sinonUtil.js';
 import commands from '../../commands.js';
 import command from './task-add.js';
+import { accessToken } from '../../../../utils/accessToken.js';
 
 describe(commands.TASK_ADD, () => {
   let log: string[];
@@ -44,6 +45,11 @@ describe(commands.TASK_ADD, () => {
     sinon.stub(telemetry, 'trackEvent').returns();
     sinon.stub(pid, 'getProcessName').returns('');
     sinon.stub(session, 'getId').returns('');
+    sinon.stub(accessToken, 'isAppOnlyAccessToken').returns(false);
+    auth.service.accessTokens[auth.defaultResource] = {
+      expiresOn: 'abc',
+      accessToken: 'abc'
+    };
     auth.service.connected = true;
     commandInfo = cli.getCommandInfo(command);
   });

src/m365/todo/commands/task/task-add.ts

@@ -2,7 +2,7 @@ import { Logger } from '../../../../cli/Logger.js';
 import GlobalOptions from '../../../../GlobalOptions.js';
 import request, { CliRequestOptions } from '../../../../request.js';
 import { validation } from '../../../../utils/validation.js';
-import GraphCommand from '../../../base/GraphCommand.js';
+import ToDoCommand from '../../../base/ToDoCommand.js';
 import commands from '../../commands.js';
 
 interface CommandArgs {
@@ -24,7 +24,7 @@ interface Options extends GlobalOptions {
   status?: string;
 }
 
-class TodoTaskAddCommand extends GraphCommand {
+class TodoTaskAddCommand extends ToDoCommand {
   private static readonly allowedStatuses: string[] = ['notStarted', 'inProgress', 'completed', 'waitingOnOthers', 'deferred'];
 
   public get name(): string {