@microsoft/teamsfx-core 2.0.4-alpha.ef9e92acd.0 → 2.0.4-alpha.f2e5373f1.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/templates/plugins/resource/aad/auth/tab/csharp/GetUserProfile.razor

@@ -91,8 +91,7 @@
     
     private GraphServiceClient GetGraphServiceClient()
     {
-        var msGraphAuthProvider = new MsGraphAuthProvider(teamsUserCredential, _scope);
-        var client = new GraphServiceClient(msGraphAuthProvider);
+        var client = new GraphServiceClient(teamsUserCredential, new string[] { _scope });
         return client;
     }
 }

package/build/component/driver/middleware/updateProgress.d.ts

@@ -1,6 +0,0 @@
-/**
- * @author Ning Tang <ning.tang@microsoft.com>
- */
-import { Middleware } from "@feathersjs/hooks/lib";
-export declare function updateProgress(eventName: string): Middleware;
-//# sourceMappingURL=updateProgress.d.ts.map

package/build/component/driver/middleware/updateProgress.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"updateProgress.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/middleware/updateProgress.ts"],"names":[],"mappings":"AAGA;;GAEG;AAEH,OAAO,EAAE,UAAU,EAA6B,MAAM,uBAAuB,CAAC;AAG9E,wBAAgB,cAAc,CAAC,SAAS,EAAE,MAAM,GAAG,UAAU,CAM5D"}

package/build/component/driver/middleware/updateProgress.js

@@ -1,15 +0,0 @@
-"use strict";
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateProgress = void 0;
-function updateProgress(eventName) {
-    return async (ctx, next) => {
-        var _a;
-        const driverContext = ctx.arguments[1];
-        await ((_a = driverContext.progressBar) === null || _a === void 0 ? void 0 : _a.next(eventName));
-        await next();
-    };
-}
-exports.updateProgress = updateProgress;
-//# sourceMappingURL=updateProgress.js.map

package/build/component/driver/middleware/updateProgress.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"updateProgress.js","sourceRoot":"","sources":["../../../../src/component/driver/middleware/updateProgress.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AASlC,SAAgB,cAAc,CAAC,SAAiB;IAC9C,OAAO,KAAK,EAAE,GAAgB,EAAE,IAAkB,EAAE,EAAE;;QACpD,MAAM,aAAa,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC,CAAsB,CAAC;QAC5D,MAAM,CAAA,MAAA,aAAa,CAAC,WAAW,0CAAE,IAAI,CAAC,SAAS,CAAC,CAAA,CAAC;QACjD,MAAM,IAAI,EAAE,CAAC;IACf,CAAC,CAAC;AACJ,CAAC;AAND,wCAMC"}

package/build/core/FxCoreImplementV3.d.ts

@@ -1,47 +0,0 @@
-import { ApiOperation, CreateProjectResult, Func, FxError, Inputs, InputsWithProjectPath, OpenAIPluginManifest, Result, Tools, Void } from "@microsoft/teamsfx-api";
-import { DotenvParseOutput } from "dotenv";
-import "../component/driver/index";
-import { CoreHookContext, PreProvisionResForVS, VersionCheckRes } from "./types";
-import { ErrorResult } from "../component/generator/copilotPlugin/helper";
-export declare class FxCoreV3Implement {
-    tools: Tools;
-    isFromSample?: boolean;
-    settingsVersion?: string;
-    constructor(tools: Tools);
-    dispatch<Inputs, ExecuteRes>(exec: (inputs: Inputs) => Promise<ExecuteRes>, inputs: Inputs): Promise<ExecuteRes>;
-    dispatchUserTask<Inputs, ExecuteRes>(exec: (func: Func, inputs: Inputs) => Promise<ExecuteRes>, func: Func, inputs: Inputs): Promise<ExecuteRes>;
-    createProject(inputs: Inputs): Promise<Result<CreateProjectResult, FxError>>;
-    provisionResources(inputs: Inputs, ctx?: CoreHookContext): Promise<Result<Void, FxError>>;
-    deployArtifacts(inputs: Inputs, ctx?: CoreHookContext): Promise<Result<Void, FxError>>;
-    deployAadManifest(inputs: Inputs): Promise<Result<Void, FxError>>;
-    publishApplication(inputs: Inputs, ctx?: CoreHookContext): Promise<Result<Void, FxError>>;
-    deployTeamsManifest(inputs: Inputs, ctx?: CoreHookContext): Promise<Result<Void, FxError>>;
-    executeUserTask(func: Func, inputs: Inputs): Promise<Result<any, FxError>>;
-    addWebpart(inputs: Inputs): Promise<Result<Void, FxError>>;
-    publishInDeveloperPortal(inputs: Inputs): Promise<Result<Void, FxError>>;
-    grantPermission(inputs: Inputs): Promise<Result<any, FxError>>;
-    checkPermission(inputs: Inputs): Promise<Result<any, FxError>>;
-    listCollaborator(inputs: Inputs): Promise<Result<any, FxError>>;
-    /**
-     * get all dot envs
-     */
-    getDotEnvs(inputs: InputsWithProjectPath): Promise<Result<{
-        [name: string]: DotenvParseOutput;
-    }, FxError>>;
-    phantomMigrationV3(inputs: Inputs): Promise<Result<Void, FxError>>;
-    innerMigrationV3(inputs: Inputs): Promise<Result<Void, FxError>>;
-    projectVersionCheck(inputs: Inputs): Promise<Result<VersionCheckRes, FxError>>;
-    preProvisionForVS(inputs: Inputs): Promise<Result<PreProvisionResForVS, FxError>>;
-    preCheckYmlAndEnvForVS(inputs: Inputs): Promise<Result<Void, FxError>>;
-    createEnv(inputs: Inputs): Promise<Result<Void, FxError>>;
-    createEnvCopyV3(targetEnvName: string, sourceEnvName: string, projectPath: string): Promise<Result<Void, FxError>>;
-    buildAadManifest(inputs: Inputs): Promise<Result<Void, FxError>>;
-    validateManifest(inputs: Inputs): Promise<Result<any, FxError>>;
-    validateAppPackage(inputs: Inputs): Promise<Result<any, FxError>>;
-    createAppPackage(inputs: Inputs): Promise<Result<any, FxError>>;
-    copilotPluginAddAPI(inputs: Inputs): Promise<Result<any, FxError>>;
-    copilotPluginLoadOpenAIManifest(inputs: Inputs): Promise<Result<OpenAIPluginManifest, FxError>>;
-    copilotPluginListOperations(inputs: Inputs): Promise<Result<ApiOperation[], ErrorResult[]>>;
-    previewWithManifest(inputs: Inputs): Promise<Result<string, FxError>>;
-}
-//# sourceMappingURL=FxCoreImplementV3.d.ts.map

package/build/core/FxCoreImplementV3.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"FxCoreImplementV3.d.ts","sourceRoot":"","sources":["../../src/core/FxCoreImplementV3.ts"],"names":[],"mappings":"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"}