Some more merge conflict fixes...

pnp · May 9, 2024 · a4bf019 · a4bf019
1 parent e8b9d1c
commit a4bf019
Show file tree

Hide file tree

Showing 15 changed files with 32 additions and 32 deletions.
diff --git a/src/m365/base/PowerAppsCommand.spec.ts b/src/m365/base/PowerAppsCommand.spec.ts
@@ -30,16 +30,16 @@ describe('PowerAppsCommand', () => {
   before(() => {
     sinon.stub(telemetry, 'trackEvent').returns();
     sinon.stub(accessToken, 'isAppOnlyAccessToken').returns(false);
-    auth.service.accessTokens[auth.defaultResource] = {
+    auth.connection.accessTokens[auth.defaultResource] = {
       expiresOn: 'abc',
       accessToken: 'abc'
     };
-    auth.service.connected = true;
+    auth.connection.active = true;
   });
 
   after(() => {
     sinon.restore();
-    auth.service.connected = false;
+    auth.connection.active = false;
   });
 
   it('returns correct resource', () => {
@@ -85,8 +85,8 @@ describe('PowerAppsCommand', () => {
   it('throws error when trying to use the command using application only permissions', () => {
     sinonUtil.restore(accessToken.isAppOnlyAccessToken);
     sinon.stub(accessToken, 'isAppOnlyAccessToken').returns(true);
-    auth.service.connected = true;
-    auth.service.cloudType = CloudType.Public;
+    auth.connection.active = true;
+    auth.connection.cloudType = CloudType.Public;
     assert.throws(() => (cmd as any).initAction({ options: {} }, {}));
   });
 });
diff --git a/src/m365/base/PowerAutomateCommand.spec.ts b/src/m365/base/PowerAutomateCommand.spec.ts
@@ -30,16 +30,16 @@ describe('PowerAutomateCommand', () => {
   before(() => {
     sinon.stub(telemetry, 'trackEvent').returns();
     sinon.stub(accessToken, 'isAppOnlyAccessToken').returns(false);
-    auth.service.accessTokens[auth.defaultResource] = {
+    auth.connection.accessTokens[auth.defaultResource] = {
       expiresOn: 'abc',
       accessToken: 'abc'
     };
-    auth.service.connected = true;
+    auth.connection.active = true;
   });
 
   after(() => {
     sinon.restore();
-    auth.service.connected = false;
+    auth.connection.active = false;
   });
 
   it('returns correct resource', () => {
@@ -85,8 +85,8 @@ describe('PowerAutomateCommand', () => {
   it('throws error when trying to use the command using application only permissions', () => {
     sinonUtil.restore(accessToken.isAppOnlyAccessToken);
     sinon.stub(accessToken, 'isAppOnlyAccessToken').returns(true);
-    auth.service.connected = true;
-    auth.service.cloudType = CloudType.Public;
+    auth.connection.active = true;
+    auth.connection.cloudType = CloudType.Public;
     assert.throws(() => (cmd as any).initAction({ options: {} }, {}));
   });
 });
diff --git a/src/m365/base/PowerBICommand.spec.ts b/src/m365/base/PowerBICommand.spec.ts
@@ -32,7 +32,7 @@ describe('PowerBICommand', () => {
     sinon.stub(pid, 'getProcessName').returns('');
     sinon.stub(session, 'getId').returns('');
     sinon.stub(accessToken, 'isAppOnlyAccessToken').returns(false);
-    auth.service.accessTokens[auth.defaultResource] = {
+    auth.connection.accessTokens[auth.defaultResource] = {
       expiresOn: 'abc',
       accessToken: 'abc'
     };
@@ -107,7 +107,7 @@ describe('PowerBICommand', () => {
     const cmd = new MockCommand();
     sinonUtil.restore(accessToken.isAppOnlyAccessToken);
     sinon.stub(accessToken, 'isAppOnlyAccessToken').returns(true);
-    auth.service.connected = true;
+    auth.connection.active = true;
     assert.throws(() => (cmd as any).initAction({ options: {} }, {}));
   });
 });
diff --git a/src/m365/base/PowerBICommand.ts b/src/m365/base/PowerBICommand.ts
@@ -11,7 +11,7 @@ export default abstract class PowerBICommand extends Command {
   protected initAction(args: CommandArgs, logger: Logger): void {
     super.initAction(args, logger);
 
-    if (!auth.service.connected) {
+    if (!auth.connection.active) {
       // we fail no login in the base command command class
       return;
     }

diff --git a/src/m365/base/PowerPlatformCommand.spec.ts b/src/m365/base/PowerPlatformCommand.spec.ts
@@ -30,15 +30,15 @@ describe('PowerPlatformCommand', () => {
   before(() => {
     sinon.stub(telemetry, 'trackEvent').returns();
     sinon.stub(accessToken, 'isAppOnlyAccessToken').returns(false);
-    auth.service.accessTokens[auth.defaultResource] = {
+    auth.connection.accessTokens[auth.defaultResource] = {
       expiresOn: 'abc',
       accessToken: 'abc'
     };
   });
 
   after(() => {
     sinon.restore();
-    auth.service.connected = false;
+    auth.connection.active = false;
   });
 
   it('returns correct bapi resource', () => {
@@ -84,8 +84,8 @@ describe('PowerPlatformCommand', () => {
   it('throws error when trying to use the command using application only permissions', () => {
     sinonUtil.restore(accessToken.isAppOnlyAccessToken);
     sinon.stub(accessToken, 'isAppOnlyAccessToken').returns(true);
-    auth.service.connected = true;
-    auth.service.cloudType = CloudType.Public;
+    auth.connection.active = true;
+    auth.connection.cloudType = CloudType.Public;
     assert.throws(() => (cmd as any).initAction({ options: {} }, {}));
   });
 });
diff --git a/src/m365/base/ToDoCommand.spec.ts b/src/m365/base/ToDoCommand.spec.ts
@@ -26,21 +26,21 @@ describe('ToDoCommand', () => {
 
   before(() => {
     sinon.stub(telemetry, 'trackEvent').returns();
-    auth.service.accessTokens[auth.defaultResource] = {
+    auth.connection.accessTokens[auth.defaultResource] = {
       expiresOn: 'abc',
       accessToken: 'abc'
     };
-    auth.service.connected = true;
+    auth.connection.active = true;
   });
 
   after(() => {
     sinon.restore();
-    auth.service.connected = false;
+    auth.connection.active = false;
   });
 
   it('throws error when trying to use the command using application only permissions', () => {
     sinon.stub(accessToken, 'isAppOnlyAccessToken').returns(true);
-    auth.service.connected = true;
+    auth.connection.active = true;
     assert.throws(() => (cmd as any).initAction({ options: {} }, {}));
   });
 });
diff --git a/src/m365/base/VivaEngageCommand.spec.ts b/src/m365/base/VivaEngageCommand.spec.ts
@@ -36,7 +36,7 @@ describe('VivaEngageCommand', () => {
     sinon.stub(pid, 'getProcessName').returns('');
     sinon.stub(session, 'getId').returns('');
     sinon.stub(accessToken, 'isAppOnlyAccessToken').returns(false);
-    auth.service.accessTokens[auth.defaultResource] = {
+    auth.connection.accessTokens[auth.defaultResource] = {
       expiresOn: 'abc',
       accessToken: 'abc'
     };
@@ -142,7 +142,7 @@ describe('VivaEngageCommand', () => {
     const cmd = new MockCommand();
     sinonUtil.restore(accessToken.isAppOnlyAccessToken);
     sinon.stub(accessToken, 'isAppOnlyAccessToken').returns(true);
-    auth.service.connected = true;
+    auth.connection.active = true;
     assert.throws(() => (cmd as any).initAction({ options: {} }, {}));
   });
 });
diff --git a/src/m365/base/VivaEngageCommand.ts b/src/m365/base/VivaEngageCommand.ts
@@ -11,7 +11,7 @@ export default abstract class VivaEngageCommand extends Command {
   protected initAction(args: CommandArgs, logger: Logger): void {
     super.initAction(args, logger);
 
-    if (!auth.service.connected) {
+    if (!auth.connection.active) {
       // we fail no login in the base command command class
       return;
     }

diff --git a/src/m365/pa/commands/app/app-consent-set.spec.ts b/src/m365/pa/commands/app/app-consent-set.spec.ts
@@ -31,7 +31,7 @@ describe(commands.APP_CONSENT_SET, () => {
     sinon.stub(pid, 'getProcessName').returns('');
     sinon.stub(session, 'getId').returns('');
     sinon.stub(accessToken, 'isAppOnlyAccessToken').returns(false);
-    auth.service.accessTokens[auth.defaultResource] = {
+    auth.connection.accessTokens[auth.defaultResource] = {
       expiresOn: 'abc',
       accessToken: 'abc'
     };

diff --git a/src/m365/pa/commands/app/app-export.spec.ts b/src/m365/pa/commands/app/app-export.spec.ts
@@ -154,7 +154,7 @@ describe(commands.APP_EXPORT, () => {
     sinon.stub(pid, 'getProcessName').returns('');
     sinon.stub(session, 'getId').returns('');
     sinon.stub(accessToken, 'isAppOnlyAccessToken').returns(false);
-    auth.service.accessTokens[auth.defaultResource] = {
+    auth.connection.accessTokens[auth.defaultResource] = {
       expiresOn: 'abc',
       accessToken: 'abc'
     };

diff --git a/src/m365/pa/commands/app/app-get.spec.ts b/src/m365/pa/commands/app/app-get.spec.ts
@@ -500,7 +500,7 @@ describe(commands.APP_GET, () => {
     sinon.stub(pid, 'getProcessName').returns('');
     sinon.stub(session, 'getId').returns('');
     sinon.stub(accessToken, 'isAppOnlyAccessToken').returns(false);
-    auth.service.accessTokens[auth.defaultResource] = {
+    auth.connection.accessTokens[auth.defaultResource] = {
       expiresOn: 'abc',
       accessToken: 'abc'
     };

diff --git a/src/m365/pa/commands/app/app-list.spec.ts b/src/m365/pa/commands/app/app-list.spec.ts
@@ -27,7 +27,7 @@ describe(commands.APP_LIST, () => {
     sinon.stub(pid, 'getProcessName').returns('');
     sinon.stub(session, 'getId').returns('');
     sinon.stub(accessToken, 'isAppOnlyAccessToken').returns(false);
-    auth.service.accessTokens[auth.defaultResource] = {
+    auth.connection.accessTokens[auth.defaultResource] = {
       expiresOn: 'abc',
       accessToken: 'abc'
     };

diff --git a/src/m365/pa/commands/app/app-owner-set.spec.ts b/src/m365/pa/commands/app/app-owner-set.spec.ts
@@ -210,7 +210,7 @@ describe(commands.APP_OWNER_SET, () => {
     sinon.stub(pid, 'getProcessName').returns('');
     sinon.stub(session, 'getId').returns('');
     sinon.stub(accessToken, 'isAppOnlyAccessToken').returns(false);
-    auth.service.accessTokens[auth.defaultResource] = {
+    auth.connection.accessTokens[auth.defaultResource] = {
       expiresOn: 'abc',
       accessToken: 'abc'
     };

diff --git a/src/utils/accessToken.spec.ts b/src/utils/accessToken.spec.ts
@@ -7,7 +7,7 @@ import auth from '../Auth.js';
 describe('utils/accessToken', () => {
 
   before(() => {
-    auth.service.accessTokens[auth.defaultResource] = {
+    auth.connection.accessTokens[auth.defaultResource] = {
       expiresOn: 'abc',
       accessToken: 'abc'
     };
@@ -21,7 +21,7 @@ describe('utils/accessToken', () => {
 
   after(() => {
     sinon.restore();
-    auth.service.connected = false;
+    auth.connection.active = false;
   });
 
   it('isAppOnlyAccessToken returns undefined when access token is undefined', () => {

diff --git a/src/utils/accessToken.ts b/src/utils/accessToken.ts
@@ -100,7 +100,7 @@ export const accessToken = {
    * @throws {string} Will throw an error if the access token is an application-only access token.
    */
   ensureDelegatedAccessToken(): void {
-    const accessToken = auth.service.accessTokens[auth.defaultResource].accessToken;
+    const accessToken = auth.connection.accessTokens[auth.defaultResource].accessToken;
     if (this.isAppOnlyAccessToken(accessToken)) {
       throw 'This command does not support application-only permissions.';
     }