@microsoft/teamsfx 0.7.0-rc.1 → 0.7.1-beta.65870165d.0

package/README.md

@@ -205,14 +205,13 @@ Use `axios` library to make HTTP request to Azure Function.
 
 ```ts
 const teamsfx = new TeamsFx();
-const token = teamsfx.getCredential().getToken(""); // Get SSO token for the user
+const credential = teamsfx.getCredential();
+// Create an API client that uses SSO token to authenticate requests
+const apiClient = createApiClient(
+  teamsfx.getConfig("apiEndpoint"),
+  new BearerTokenAuthProvider(async ()=> (await credential.getToken(""))!.token));
 // Call API hosted in Azure Functions on behalf of user
-const apiEndpoint = teamsfx.getConfig("apiEndpoint");
-const response = await axios.default.get(apiEndpoint + "api/httptrigger1", {
-  headers: {
-    authorization: "Bearer " + token,
-  },
-});
+const response = await apiClient.get("/api/" + functionName);
 ```
 
 ### Access SQL database in Azure Function
@@ -287,6 +286,27 @@ dialogs.add(
 );
 ```
 
+### Create API client to call existing API in Bot / Azure Function
+
+```ts
+const teamsfx = new TeamsFx();
+
+// Create an API Key auth provider. Following auth providers are also available:
+// BearerTokenAuthProvider, BasicAuthProvider, CertificateAuthProvider
+const authProvider = new ApiKeyProvider("your_api_key_name", 
+  teamsfx.getConfig("YOUR_API_KEY_VALUE"), // This reads the value of YOUR_API_KEY_VALUE environment variable
+  ApiKeyLocation.Header);
+
+// Create an API client using above auth provider
+// You can also implement AuthProvider interface and use it here
+const apiClient = createApiClient(
+  teamsfx.getConfig("YOUR_API_ENDPOINT"), // This reads YOUR_API_ENDPOINT environment variable
+  authProvider);
+
+// Send a GET request to "relative_api_path"
+const response = await apiClient.get("relative_api_path");
+```
+
 ## Advanced Customization
 
 ### Configure log

package/dist/index.esm2017.mjs

@@ -1972,35 +1972,33 @@ class CommandResponseMiddleware {
         }
     }
     async onTurn(context, next) {
-        const type = this.classifyActivity(context.activity);
-        switch (type) {
-            case ActivityType.CurrentBotMessaged:
-                // Invoke corresponding command handler for the command response
-                const commandText = this.getActivityText(context.activity);
-                const message = {
-                    text: commandText,
-                };
-                for (const handler of this.commandHandlers) {
-                    const matchResult = this.shouldTrigger(handler.triggerPatterns, commandText);
-                    // It is important to note that the command bot will stop processing handlers
-                    // when the first command handler is matched.
-                    if (!!matchResult) {
-                        message.matches = Array.isArray(matchResult) ? matchResult : void 0;
-                        const response = await handler.handleCommandReceived(context, message);
+        if (context.activity.type === ActivityTypes.Message) {
+            // Invoke corresponding command handler for the command response
+            const commandText = this.getActivityText(context.activity);
+            const message = {
+                text: commandText,
+            };
+            for (const handler of this.commandHandlers) {
+                const matchResult = this.shouldTrigger(handler.triggerPatterns, commandText);
+                // It is important to note that the command bot will stop processing handlers
+                // when the first command handler is matched.
+                if (!!matchResult) {
+                    message.matches = Array.isArray(matchResult) ? matchResult : void 0;
+                    const response = await handler.handleCommandReceived(context, message);
+                    if (typeof response === "string") {
                         await context.sendActivity(response);
-                        break;
+                    }
+                    else {
+                        const replyActivity = response;
+                        if (replyActivity) {
+                            await context.sendActivity(replyActivity);
+                        }
                     }
                 }
-                break;
+            }
         }
         await next();
     }
-    classifyActivity(activity) {
-        if (activity.type === ActivityTypes.Message) {
-            return ActivityType.CurrentBotMessaged;
-        }
-        return ActivityType.Unknown;
-    }
     matchPattern(pattern, text) {
         if (text) {
             if (typeof pattern === "string") {