fix js lint

microsoft · Dec 19, 2023 · 1bf5c80 · 1bf5c80
1 parent c33ec8a
commit 1bf5c80
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 35 deletions.
diff --git a/libraries/botbuilder/src/botFrameworkAdapter.ts b/libraries/botbuilder/src/botFrameworkAdapter.ts
@@ -261,8 +261,7 @@ export class BotFrameworkAdapter
                     this.settings.appPassword || '',
                     this.settings.channelAuthTenant
                 );
-            }
-            else{
+            } else {
                 this.credentials = new MicrosoftAppCredentials(
                     this.settings.appId,
                     this.settings.appPassword || '',
@@ -1634,10 +1633,19 @@ export class BotFrameworkAdapter
             );
         } else {
             if (JwtTokenValidation.isGovernment(this.settings.channelService)) {
-                credentials = new MicrosoftGovernmentAppCredentials(appId, appPassword, this.settings.channelAuthTenant, oAuthScope);
-            }
-            else{
-                credentials = new MicrosoftAppCredentials(appId, appPassword, this.settings.channelAuthTenant, oAuthScope);
+                credentials = new MicrosoftGovernmentAppCredentials(
+                    appId,
+                    appPassword,
+                    this.settings.channelAuthTenant,
+                    oAuthScope
+                );
+            } else {
+                credentials = new MicrosoftAppCredentials(
+                    appId,
+                    appPassword,
+                    this.settings.channelAuthTenant,
+                    oAuthScope
+                );
             }
         }
 

diff --git a/libraries/botbuilder/src/botFrameworkHttpClient.ts b/libraries/botbuilder/src/botFrameworkHttpClient.ts
@@ -16,7 +16,7 @@ import {
     ICredentialProvider,
     JwtTokenValidation,
     MicrosoftAppCredentials,
-    MicrosoftGovernmentAppCredentials
+    MicrosoftGovernmentAppCredentials,
 } from 'botframework-connector';
 
 import { USER_AGENT } from './botFrameworkAdapter';

diff --git a/libraries/botframework-connector/src/auth/appCredentials.ts b/libraries/botframework-connector/src/auth/appCredentials.ts
@@ -45,17 +45,11 @@ export abstract class AppCredentials implements ServiceClientCredentials {
      * @param channelAuthTenant Optional. The oauth token tenant.
      * @param oAuthScope The scope for the token.
      */
-    constructor(
-        appId: string,
-        channelAuthTenant?: string,
-        oAuthScope: string = null
-    ) {
+    constructor(appId: string, channelAuthTenant?: string, oAuthScope: string = null) {
         this.appId = appId;
         this.tenant = channelAuthTenant;
         this.oAuthEndpoint = this.GetToChannelFromBotLoginUrlPrefix() + this.tenant;
-        this.oAuthScope = (oAuthScope && oAuthScope.length > 0)
-            ? oAuthScope
-            : this.GetToChannelFromBotOAuthScope();
+        this.oAuthScope = oAuthScope && oAuthScope.length > 0 ? oAuthScope : this.GetToChannelFromBotOAuthScope();
     }
 
     /**

diff --git a/libraries/botframework-connector/src/auth/microsoftGovernmentAppCredentials.ts b/libraries/botframework-connector/src/auth/microsoftGovernmentAppCredentials.ts
@@ -13,8 +13,7 @@ import { MicrosoftAppCredentials } from './microsoftAppCredentials';
  * MicrosoftGovermentAppCredentials auth implementation
  */
 export class MicrosoftGovernmentAppCredentials extends MicrosoftAppCredentials {
-
-      /**
+    /**
      * Initializes a new instance of the [MicrosoftGovernmentAppCredentials](xref:botframework-connector.MicrosoftGovernmentAppCredentials) class.
      *
      * @param {string} appId The Microsoft app ID.

diff --git a/libraries/botframework-connector/tests/auth/microsoftAppCredentials.test.js b/libraries/botframework-connector/tests/auth/microsoftAppCredentials.test.js
@@ -3,15 +3,21 @@ const assert = require('assert');
 
 describe('MicrosoftAppCredentialsTestSuite', function () {
     describe('MicrosoftAppCredentialsTestCase', function () {
-        it('AssertOAuthEndpointAndOAuthScope', function() {
-            var credentials = new MicrosoftAppCredentials("appId", "password", "tenantId", "audience");
-            assert.strictEqual(AuthenticationConstants.ToChannelFromBotLoginUrlPrefix + "tenantId", credentials.oAuthEndpoint);
-            assert.strictEqual("audience", credentials.oAuthScope);
-
-            var credentials = new MicrosoftAppCredentials("appId", "password");
-            assert.strictEqual(AuthenticationConstants.ToChannelFromBotLoginUrlPrefix + AuthenticationConstants.DefaultChannelAuthTenant, credentials.oAuthEndpoint);
-            assert.strictEqual(AuthenticationConstants.ToChannelFromBotOAuthScope, credentials.oAuthScope);
-          });
+        it('AssertOAuthEndpointAndOAuthScope', function () {
+            const credentials1 = new MicrosoftAppCredentials('appId', 'password', 'tenantId', 'audience');
+            assert.strictEqual(
+                AuthenticationConstants.ToChannelFromBotLoginUrlPrefix + 'tenantId',
+                credentials1.oAuthEndpoint
+            );
+            assert.strictEqual('audience', credentials1.oAuthScope);
 
+            const credentials2 = new MicrosoftAppCredentials('appId', 'password');
+            assert.strictEqual(
+                AuthenticationConstants.ToChannelFromBotLoginUrlPrefix +
+                    AuthenticationConstants.DefaultChannelAuthTenant,
+                credentials2.oAuthEndpoint
+            );
+            assert.strictEqual(AuthenticationConstants.ToChannelFromBotOAuthScope, credentials2.oAuthScope);
+        });
     });
 });
diff --git a/libraries/botframework-connector/tests/auth/microsoftGovernmentAppCredentials.test.js b/libraries/botframework-connector/tests/auth/microsoftGovernmentAppCredentials.test.js
@@ -3,15 +3,20 @@ const assert = require('assert');
 
 describe('MicrosoftGovernmentAppCredentialsTestSuite', function () {
     describe('MicrosoftGovernmentAppCredentialsTestCase', function () {
-        it('AssertOAuthEndpointAndOAuthScope', function() {
-            var credentials = new MicrosoftGovernmentAppCredentials("appId", "password", "tenantId", "audience");
-            assert.strictEqual(GovernmentConstants.ToChannelFromBotLoginUrlPrefix + "tenantId", credentials.oAuthEndpoint);
-            assert.strictEqual("audience", credentials.oAuthScope);
-
-            var credentials = new MicrosoftGovernmentAppCredentials("appId", "password");
-            assert.strictEqual(GovernmentConstants.ToChannelFromBotLoginUrlPrefix + GovernmentConstants.DefaultChannelAuthTenant, credentials.oAuthEndpoint);
-            assert.strictEqual(GovernmentConstants.ToChannelFromBotOAuthScope, credentials.oAuthScope);
-          });
+        it('AssertOAuthEndpointAndOAuthScope', function () {
+            const credentials1 = new MicrosoftGovernmentAppCredentials('appId', 'password', 'tenantId', 'audience');
+            assert.strictEqual(
+                GovernmentConstants.ToChannelFromBotLoginUrlPrefix + 'tenantId',
+                credentials1.oAuthEndpoint
+            );
+            assert.strictEqual('audience', credentials1.oAuthScope);
 
+            const credentials2 = new MicrosoftGovernmentAppCredentials('appId', 'password');
+            assert.strictEqual(
+                GovernmentConstants.ToChannelFromBotLoginUrlPrefix + GovernmentConstants.DefaultChannelAuthTenant,
+                credentials2.oAuthEndpoint
+            );
+            assert.strictEqual(GovernmentConstants.ToChannelFromBotOAuthScope, credentials2.oAuthScope);
+        });
     });
 });