Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 21 additions & 21 deletions msteams-platform/bots/how-to/authentication/add-authentication.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,16 +42,16 @@ In this article you'll learn:

The resource group and the service plan aren't strictly necessary, but they allow you to conveniently release the resources you create. We recommend that you keep your resources organized and manageable.

You use a resource group to create individual resources for the Bot Framework. For performance, ensure that these resources are located in the same Azure region.
You use a resource group to create individual resources for the Agents SDK. For performance, ensure that these resources are located in the same Azure region.

1. In your browser, sign into the [**Microsoft Azure portal**][azure-portal].
1. In the left navigation panel, select **Resource groups**.
1. In the upper left of the displayed window, select **Add** tab to create a new resource group. Provide the following details:
2. In the left navigation panel, select **Resource groups**.
3. In the upper left of the displayed window, select **Add** tab to create a new resource group. Provide the following details:
1. **Subscription**. Use your existing subscription.
1. **Resource group**. Enter the name for the resource group. An example could be *TeamsResourceGroup*. Remember that the name must be unique.
1. From the **Region** dropdown menu, select *West US*, or a region close to your applications.
1. Select the **Review and create** button. You should see a banner that reads *Validation passed*.
1. Select the **Create** button. It might take a few minutes to create the resource group.
2. **Resource group**. Enter the name for the resource group. An example could be *TeamsResourceGroup*. Remember that the name must be unique.
3. From the **Region** dropdown menu, select *West US*, or a region close to your applications.
4. Select the **Review and create** button. You should see a banner that reads *Validation passed*.
5. Select the **Create** button. It might take a few minutes to create the resource group.

> [!TIP]
> As with the resources you'll create later in this tutorial, it's a good idea to pin this resource group to your dashboard for easy access. If you'd like to do so, select the pin icon 📌 in the upper right of the dashboard.
Expand Down Expand Up @@ -79,31 +79,31 @@ You use a resource group to create individual resources for the Bot Framework. F

## Create Azure Bot resource registration

The Azure Bot resource registration registers your web service as a bot with the Bot Framework, which provides you with a Microsoft App ID and App password (client secret).
The Azure Bot resource registration registers your web service as a bot with the Agents SDK, which provides you with a Microsoft App ID and App password (client secret).

> [!IMPORTANT]
> You only need to register your bot if it's not hosted in Azure. If you [created a bot](/azure/bot-service/abs-quickstart?view=azure-bot-service-4.0&viewFallbackFrom=azure-bot-service-3.0&preserve-view=true) through the Azure portal then it's already registered with the service. If you created your bot through the [Bot Framework](https://dev.botframework.com/bots/new) or [Developer Portal](../../../concepts/build-and-test/teams-developer-portal.md) your bot isn't registered in Azure.
> You only need to register your bot if it's not hosted in Azure. If you [created a bot](/azure/bot-service/abs-quickstart?view=azure-bot-service-4.0&viewFallbackFrom=azure-bot-service-3.0&preserve-view=true) through the Azure portal then it's already registered with the service. If you created your bot through the [Agents SDK](https://dev.botframework.com/bots/new) or [Developer Portal](../../../concepts/build-and-test/teams-developer-portal.md) your bot isn't registered in Azure.

1. Visit [**Azure portal**][azure-portal] and search for **Azure Bot** in **Create a resource** section.
1. Open the **Azure Bot** and select **Create**.
1. Enter bot handle name in **Bot handle** field.
1. Select your **Subscription** from the dropdown list.
1. Select your **Resource group** from the dropdown list.
1. Select **Type of App** as **Multi Tenant** for **Microsoft App ID**.
2. Open the **Azure Bot** and select **Create**.
3. Enter bot handle name in **Bot handle** field.
4. Select your **Subscription** from the dropdown list.
5. Select your **Resource group** from the dropdown list.
6. Select **Type of App** as **Multi Tenant** for **Microsoft App ID**.

:::image type="content" source="../../../assets/images/adaptive-cards/multi-tenant.png" alt-text="Screenshot shows how to select multitenant for Microsoft AppID.":::

1. Select **Review + create**.
7. Select **Review + create**.

:::image type="content" source="../../../assets/images/adaptive-cards/create-azure-bot.png" alt-text="Screenshot shows how to create Azure bot.":::

1. If the validation passes, select **Create**.
8. If the validation passes, select **Create**.

Azure provisions your bot in a few moments.

:::image type="content" source="../../../assets/images/adaptive-cards/validation-pane.png" alt-text="Screenshot shows how Azure bot validation passes.":::

1. Select **Go to resource**. The bot and the related resources are listed in the resource group.
9. Select **Go to resource**. The bot and the related resources are listed in the resource group.

:::image type="content" source="../../../assets/images/adaptive-cards/go-to-resource-card.png" alt-text="Screenshot shows how to select resources group.":::

Expand Down Expand Up @@ -374,7 +374,7 @@ Alternatively, while in Visual Studio, you can follow these steps:

## Test the bot using the Emulator

Install [Microsoft Bot Framework Emulator](https://aka.ms/bot-framework-emulator-readme). For more information, see [test and debug with the Emulator](/azure/bot-service/bot-service-debug-emulator?view=azure-bot-service-4.0&tabs=csharp&preserve-view=true).
Install [Microsoft Agents SDK Emulator](https://aka.ms/bot-framework-emulator-readme). For more information, see [test and debug with the Emulator](/azure/bot-service/bot-service-debug-emulator?view=azure-bot-service-4.0&tabs=csharp&preserve-view=true).

In order for the bot sample sign-in to work, you must configure the Emulator.

Expand All @@ -385,7 +385,7 @@ If a bot requires authentication, you must configure the Emulator. To configure:
1. Start the Emulator.
1. In the Emulator, select the gear icon ⚙ in the bottom left, or the **Emulator Settings** tab in the upper right.
1. Check the box by **Use version 1.0 authentication tokens**.
1. Enter the local path to the **ngrok** tool. *See* the Bot Framework Emulator / ngrok tunneling integration [Wiki](https://github.com/Microsoft/BotFramework-Emulator/wiki/Tunneling-(ngrok)). For more tool information, see [ngrok](https://ngrok.com/).
1. Enter the local path to the **ngrok** tool. *See* the Agents SDK Emulator / ngrok tunneling integration [Wiki](https://github.com/Microsoft/BotFramework-Emulator/wiki/Tunneling-(ngrok)). For more tool information, see [ngrok](https://ngrok.com/).
1. Check the box by **Run ngrok when the Emulator starts up**.
1. Select the **Save** button.

Expand Down Expand Up @@ -463,7 +463,7 @@ and when for these, and just reference that from here, along with the set of ste

> [!NOTE]
> If you're having problems signing in, try to test the connection again as described in the previous steps. This could recreate the authentication token.
> With the Bot Framework Web Chat client in Azure, you may need to sign in several times before the authentication is established correctly.
> With the Agents SDK Web Chat client in Azure, you may need to sign in several times before the authentication is established correctly.

> [!div class="nextstepaction"]
> [I ran into an issue](https://github.com/MicrosoftDocs/msteams-docs/issues/new?template=Doc-Feedback.yaml&title=%5BI+ran+into+an+issue%5D+Test+the+deployed+bot&&author=%40surbhigupta&pageUrl=https%3A%2F%2Flearn.microsoft.com%2Fen-us%2Fmicrosoftteams%2Fplatform%2Fbots%2Fhow-to%2Fauthentication%2Fadd-authentication%3Ftabs%3Ddotnet%252Cdotnet-sample%23test-the-deployed-bot&contentSourceUrl=https%3A%2F%2Fgithub.com%2FMicrosoftDocs%2Fmsteams-docs%2Fblob%2Fmain%2Fmsteams-platform%2Fbots%2Fhow-to%2Fauthentication%2Fadd-authentication.md&documentVersionIndependentId=70952f91-56e9-ff08-59f6-e237d4aaeca9&platformId=cc53b20b-69e0-cb70-1ca7-9b939c969c92&metadata=*%2BID%253A%2Be473e1f3-69f5-bcfa-bcab-54b098b59c80%2B%250A*%2BService%253A%2B%2A%2Amsteams%2A%2A)
Expand Down Expand Up @@ -517,7 +517,7 @@ It launches ngrok to listen on the port you specify. In return, it gives you an
1. In the left panel, select **Settings**.
1. In the right panel, in the **Messaging endpoint** box, enter the ngrok URL, in our example, `https://dea822bf.ngrok.io/api/messages`.
1. Start your bot locally, for example in Visual Studio debug mode.
1. Test the bot while running locally using the Bot Framework portal's **Test Web chat**. Like the Emulator, this test doesn't allow you to access Teams-specific functionality.
1. Test the bot while running locally using the Agents SDK portal's **Test Web chat**. Like the Emulator, this test doesn't allow you to access Teams-specific functionality.
1. In the terminal window where `ngrok` is running you can see HTTP traffic between the bot and the web chat client. If you want a more detailed view, in a browser window enter `http://127.0.0.1:4040` you obtained from the previous terminal window. The following image is an example:

:::image type="content" source="../../../assets/images/authentication/auth-bot-teams-ngrok-testing.png" alt-text="Screenshot shows auth bot teams ngrok testing.":::
Expand Down
2 changes: 1 addition & 1 deletion msteams-platform/bots/how-to/bots-filesv4.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ ms.owner: angovil

> [!IMPORTANT]
>
> * This article is based on the v4 Bot Framework SDK.
> * This article is based on the v4 Agents SDK.
> * Bots don't support sending and receiving files in Government Community Cloud High (GCC High), Department of Defense (DoD), and Teams operated by 21Vianet environments.

There are two ways to send files to and receive files from a bot:
Expand Down
6 changes: 3 additions & 3 deletions msteams-platform/bots/how-to/create-a-bot-commands-menu.md
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ Bots in a group or channel respond only when they're mentioned `@botname` in a m

* [Sample code reference](https://github.com/OfficeDev/Microsoft-Teams-Samples/blob/main/samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.Web/Bots/MessageExtension.cs#L19)

You can parse out the **\@Mention** portion of the message text using a static method provided with the Microsoft Bot Framework. It's a method of the `Activity` class named `RemoveRecipientMention`.
You can parse out the **\@Mention** portion of the message text using a static method provided with the Microsoft Agents SDK. It's a method of the `Activity` class named `RemoveRecipientMention`.

The C# code to parse out the **\@Mention** portion of the message text is as follows:

Expand All @@ -191,7 +191,7 @@ var modifiedText = turnContext.Activity.RemoveRecipientMention();

* [Sample code reference](https://github.com/OfficeDev/Microsoft-Teams-Samples/blob/main/samples/bot-people-picker-adaptive-card/nodejs/bots/teamsBot.js#L21)

You can parse out the **\@Mention** portion of the message text using a static method provided with the Bot Framework. It's a method of the `TurnContext` class named `removeMentionText`.
You can parse out the **\@Mention** portion of the message text using a static method provided with the Agents SDK. It's a method of the `TurnContext` class named `removeMentionText`.

The JavaScript code to parse out the **\@Mention** portion of the message text is as follows:

Expand All @@ -206,7 +206,7 @@ const modifiedText = TurnContext.removeMentionText(turnContext.activity, turnCon

* [Sample code reference](https://github.com/OfficeDev/Microsoft-Teams-Samples/blob/main/samples/bot-conversation/python/bots/teams_conversation_bot.py#L34)

You can parse out the **@Mention** portion of the message text using a static method provided with the Bot Framework. It's a method of the `TurnContext` class named `remove_recipient_mention`.
You can parse out the **@Mention** portion of the message text using a static method provided with the Agents SDK. It's a method of the `TurnContext` class named `remove_recipient_mention`.

The Python code to parse out the **\@Mention** portion of the message text is as follows:

Expand Down
2 changes: 1 addition & 1 deletion msteams-platform/bots/how-to/rate-limit.md
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ The following table provides the per bot per thread limits:
| Get conversations | 3600 | 3600 |

>[!NOTE]
> Previous versions of `TeamsInfo.getMembers` and `TeamsInfo.GetMembersAsync` APIs are being deprecated. They are throttled to five requests per minute and return a maximum of 10K members per team. To update your Bot Framework SDK and the code to use the latest paginated API endpoints, see [Bot API changes for team and chat members](../../resources/team-chat-member-api-changes.md).
> Previous versions of `TeamsInfo.getMembers` and `TeamsInfo.GetMembersAsync` APIs are being deprecated. They are throttled to five requests per minute and return a maximum of 10K members per team. To update your Agents SDK and the code to use the latest paginated API endpoints, see [Bot API changes for team and chat members](../../resources/team-chat-member-api-changes.md).

You can also handle rate limit using the per thread limit for all bots.

Expand Down