@microsoft/teamsfx-core 2.0.4-alpha.4f379e6ab.0 → 2.0.4-alpha.5925cbfed.0

package/templates/plugins/resource/aad/auth/bot/js/sso/handleMessageExtensionQueryWithToken.js

@@ -1,9 +1,12 @@
 const { TeamsActivityHandler, CardFactory } = require("botbuilder");
 const {
   handleMessageExtensionQueryWithSSO,
-  createMicrosoftGraphClientWithCredential,
   OnBehalfOfUserCredential,
 } = require("@microsoft/teamsfx");
+const { Client } = require("@microsoft/microsoft-graph-client");
+const {
+  TokenCredentialAuthenticationProvider,
+} = require("@microsoft/microsoft-graph-client/authProviders/azureTokenCredentials");
 require("isomorphic-fetch");
 
 const oboAuthConfig = {
@@ -37,8 +40,15 @@ class TeamsBot extends TeamsActivityHandler {
         // Init OnBehalfOfUserCredential instance with SSO token
         const credential = new OnBehalfOfUserCredential(token.ssoToken, oboAuthConfig);
 
-        // Add scope for your Azure AD app. For example: Mail.Read, etc.
-        const graphClient = createMicrosoftGraphClientWithCredential(credential, "User.Read");
+        // Create an instance of the TokenCredentialAuthenticationProvider by passing the tokenCredential instance and options to the constructor
+        const authProvider = new TokenCredentialAuthenticationProvider(credential, {
+          scopes: ["User.Read"],
+        });
+
+        // Initialize Graph client instance with authProvider
+        const graphClient = Client.initWithMiddleware({
+          authProvider: authProvider,
+        });
 
         // Call graph api use `graph` instance to get user profile information.
         const profile = await graphClient.api("/me").get();

package/templates/plugins/resource/aad/auth/bot/js/sso/profileSsoCommandHandler.js

@@ -1,7 +1,8 @@
+const { OnBehalfOfUserCredential } = require("@microsoft/teamsfx");
+const { Client } = require("@microsoft/microsoft-graph-client");
 const {
-  OnBehalfOfUserCredential,
-  createMicrosoftGraphClientWithCredential,
-} = require("@microsoft/teamsfx");
+  TokenCredentialAuthenticationProvider,
+} = require("@microsoft/microsoft-graph-client/authProviders/azureTokenCredentials");
 require("isomorphic-fetch");
 
 const oboAuthConfig = {
@@ -19,8 +20,16 @@ class ProfileSsoCommandHandler {
 
     // Init OnBehalfOfUserCredential instance with SSO token
     const oboCredential = new OnBehalfOfUserCredential(tokenResponse.ssoToken, oboAuthConfig);
-    // Add scope for your Azure AD app. For example: Mail.Read, etc.
-    const graphClient = createMicrosoftGraphClientWithCredential(oboCredential, ["User.Read"]);
+
+    // Create an instance of the TokenCredentialAuthenticationProvider by passing the tokenCredential instance and options to the constructor
+    const authProvider = new TokenCredentialAuthenticationProvider(oboCredential, {
+      scopes: ["User.Read"],
+    });
+
+    // Initialize Graph client instance with authProvider
+    const graphClient = Client.initWithMiddleware({
+      authProvider: authProvider,
+    });
 
     // Call graph api use `graph` instance to get user profile information
     const me = await graphClient.api("/me").get();

package/templates/plugins/resource/aad/auth/bot/ts/sso/handleMessageExtensionQueryWithToken.ts

@@ -4,8 +4,9 @@ import {
   handleMessageExtensionQueryWithSSO,
   OnBehalfOfCredentialAuthConfig,
   OnBehalfOfUserCredential,
-  createMicrosoftGraphClientWithCredential,
 } from "@microsoft/teamsfx";
+import { Client } from "@microsoft/microsoft-graph-client";
+import { TokenCredentialAuthenticationProvider } from "@microsoft/microsoft-graph-client/authProviders/azureTokenCredentials";
 import "isomorphic-fetch";
 
 const oboAuthConfig: OnBehalfOfCredentialAuthConfig = {
@@ -40,8 +41,15 @@ export class TeamsBot extends TeamsActivityHandler {
         // Init OnBehalfOfUserCredential instance with SSO token
         const credential = new OnBehalfOfUserCredential(token.ssoToken, oboAuthConfig);
 
-        // Add scope for your Azure AD app. For example: Mail.Read, etc.
-        const graphClient = createMicrosoftGraphClientWithCredential(credential, "User.Read");
+        // Create an instance of the TokenCredentialAuthenticationProvider by passing the tokenCredential instance and options to the constructor
+        const authProvider = new TokenCredentialAuthenticationProvider(credential, {
+          scopes: ["User.Read"],
+        });
+
+        // Initialize Graph client instance with authProvider
+        const graphClient = Client.initWithMiddleware({
+          authProvider: authProvider,
+        });
 
         // Call graph api use `graph` instance to get user profile information.
         const profile = await graphClient.api("/me").get();

package/templates/plugins/resource/aad/auth/bot/ts/sso/profileSsoCommandHandler.ts

@@ -5,9 +5,10 @@ import {
   TeamsFxBotSsoCommandHandler,
   TeamsBotSsoPromptTokenResponse,
   OnBehalfOfUserCredential,
-  createMicrosoftGraphClientWithCredential,
   OnBehalfOfCredentialAuthConfig,
 } from "@microsoft/teamsfx";
+import { Client } from "@microsoft/microsoft-graph-client";
+import { TokenCredentialAuthenticationProvider } from "@microsoft/microsoft-graph-client/authProviders/azureTokenCredentials";
 import "isomorphic-fetch";
 
 const oboAuthConfig: OnBehalfOfCredentialAuthConfig = {
@@ -29,8 +30,16 @@ export class ProfileSsoCommandHandler implements TeamsFxBotSsoCommandHandler {
 
     // Init OnBehalfOfUserCredential instance with SSO token
     const oboCredential = new OnBehalfOfUserCredential(tokenResponse.ssoToken, oboAuthConfig);
-    // Add scope for your Azure AD app. For example: Mail.Read, etc.
-    const graphClient = createMicrosoftGraphClientWithCredential(oboCredential, ["User.Read"]);
+
+    // Create an instance of the TokenCredentialAuthenticationProvider by passing the tokenCredential instance and options to the constructor
+    const authProvider = new TokenCredentialAuthenticationProvider(oboCredential, {
+      scopes: ["User.Read"],
+    });
+
+    // Initialize Graph client instance with authProvider
+    const graphClient = Client.initWithMiddleware({
+      authProvider: authProvider,
+    });
 
     // Call graph api use `graph` instance to get user profile information
     const me = await graphClient.api("/me").get();

package/build/component/generator/copilotPlugin/constant.d.ts

@@ -1,4 +0,0 @@
-export declare enum TelemetryEvents {
-    CannotGetLogoFromOpenAIPlugin = "cannot-get-logo-from-openai-plugin"
-}
-//# sourceMappingURL=constant.d.ts.map

package/build/component/generator/copilotPlugin/constant.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"constant.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/copilotPlugin/constant.ts"],"names":[],"mappings":"AAGA,oBAAY,eAAe;IACzB,6BAA6B,uCAAuC;CACrE"}

package/build/component/generator/copilotPlugin/constant.js

@@ -1,10 +0,0 @@
-"use strict";
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.TelemetryEvents = void 0;
-var TelemetryEvents;
-(function (TelemetryEvents) {
-    TelemetryEvents["CannotGetLogoFromOpenAIPlugin"] = "cannot-get-logo-from-openai-plugin";
-})(TelemetryEvents = exports.TelemetryEvents || (exports.TelemetryEvents = {}));
-//# sourceMappingURL=constant.js.map

package/build/component/generator/copilotPlugin/constant.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"constant.js","sourceRoot":"","sources":["../../../../src/component/generator/copilotPlugin/constant.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,IAAY,eAEX;AAFD,WAAY,eAAe;IACzB,uFAAoE,CAAA;AACtE,CAAC,EAFW,eAAe,GAAf,uBAAe,KAAf,uBAAe,QAE1B"}