Skip to content
Merged
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
2 changes: 1 addition & 1 deletion samples/PABot/Bots/SsoBot.cs
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ private async Task TestOAuthCardSendScenario(ITurnContext<IMessageActivity> turn
logger.LogInformation($"ConversationId: {activity.Conversation.Id}");
logger.LogInformation($"Recipient: {activity.Recipient.Id}");

// This is the call that causes NullReferenceException when APX returns 202 with empty body
// This is the call that causes NullReferenceException when the Teams service returns 202 with empty body
ResourceResponse response = await connectorClient.Conversations.SendToConversationAsync(
(Microsoft.Bot.Schema.Activity)activity,
cancellationToken
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.Teams.Core/Schema/ConversationExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public static string ThreadId(this Conversation conversation)

/// <summary>
/// Construct a threaded conversation ID by appending <c>;messageid={messageId}</c>
/// to the conversation ID. This is the format APX uses to route messages
/// to the conversation ID. This is the format the Teams service uses to route messages
/// to a specific thread in a channel.
/// </summary>
/// <param name="conversationId">the conversation to thread into (e.g. <c>19:abc@thread.skype</c>)</param>
Expand Down
2 changes: 1 addition & 1 deletion test/IntegrationTests/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Teams SDK Integration Tests

This project runs integration tests against Teams Server (SMBA/APX) using bot and agentic identities.
This project runs integration tests against Teams Server using bot and agentic identities.

## Prerequisites

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@ public async Task ReplyToActivityWithHttpMessagesAsync_SetsReplyToIdProperty()
public async Task SendToConversationWithHttpMessagesAsync_WhenSendActivityReturnsNull_ReturnsStringEmptyForId()
{
// This test verifies the fix for the OAuth card null reference bug
// When APX returns 202 Accepted with no body, SendActivityAsync returns null
// When the Teams service returns 202 Accepted with no body, SendActivityAsync returns null
// We should return string.Empty for Id instead of null to maintain API contract

// Arrange
Expand Down Expand Up @@ -433,7 +433,7 @@ public async Task SendToConversationWithHttpMessagesAsync_WhenSendActivityReturn
public async Task ReplyToActivityWithHttpMessagesAsync_WhenSendActivityReturnsNull_ReturnsStringEmptyForId()
{
// This test verifies the fix for the OAuth card null reference bug in ReplyToActivity
// When APX returns 202 Accepted with no body, SendActivityAsync returns null
// When the Teams service returns 202 Accepted with no body, SendActivityAsync returns null
// We should return string.Empty for Id instead of null to maintain API contract

// Arrange
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ public void FromInboundActivity_IgnoresAgenticFieldsOnSender()
[Fact]
public void FromInboundActivity_FallsBackToRecipientId_WhenBotIdAbsent()
{
// Standard (non-agentic) inbound activity: SMBA does not populate BotId, but Recipient.Id
// Standard (non-agentic) inbound activity: the Teams service does not populate BotId, but Recipient.Id
// carries the Teams-style "28:<appId>" value.
CoreActivity activity = new()
{
Expand Down
4 changes: 2 additions & 2 deletions test/TeamsApisDemo/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
Console.WriteLine($"Running Teams Bot Application for appId '{teamsBotApplication.AppId}' with version '{TeamsBotApplication.Version}'.");


var smba = new Uri("https://smba.trafficmanager.net/amer");
var conversations = teamsBotApplication.Api.ForServiceUrl(smba).Conversations;
var serviceUrl = new Uri("https://smba.trafficmanager.net/amer");
var conversations = teamsBotApplication.Api.ForServiceUrl(serviceUrl).Conversations;

int pages = 1;
string cid = "19%3ALydFnezGKSkhYoiLNP6kZ8AuXQr36EDAkvG9CNJSPKc1%40thread.tacv2";
Expand Down
Loading