Skip to content

10.0.4 snapshot #475

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vaibhav-db merged 6 commits into from
Dec 10, 2025
Merged

10.0.4 snapshot #475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
daca635
SYMPHONYP-1416 certificate-base-authentication-on-springbot
vaibhav-db Nov 28, 2025
c931397
Pull request #87: SYMPHONYP-1416 certificate-base-authentication-on-s…
vaibhav-db Dec 2, 2025
170aac1
SYMPHONYP-1416 certificate-base-authentication
vaibhav-db Dec 3, 2025
3d540e7
SYMPHONYP-1416 certificate-base-authentication
vaibhav-db Dec 3, 2025
5b2a0da
Pull request #88: SYMPHONYP-1416 certificate-base-authentication
vaibhav-db Dec 3, 2025
f0672f3
Updated version number
robmoffat Dec 9, 2025
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
6 changes: 3 additions & 3 deletions demos/claim-bot/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.finos.springbot</groupId>
<artifactId>spring-bot</artifactId>
<version>10.0.2-SNAPSHOT</version>
<version>10.0.4-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>

Expand All @@ -33,12 +33,12 @@
<dependency>
<groupId>org.finos.springbot</groupId>
<artifactId>symphony-bdk-chat-workflow-spring-boot-starter</artifactId>
<version>10.0.2-SNAPSHOT</version>
<version>10.0.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.finos.springbot</groupId>
<artifactId>teams-chat-workflow-spring-boot-starter</artifactId>
<version>10.0.2-SNAPSHOT</version>
<version>10.0.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
Expand Down
6 changes: 3 additions & 3 deletions demos/custom-help-bot/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.finos.springbot</groupId>
<artifactId>spring-bot</artifactId>
<version>10.0.2-SNAPSHOT</version>
<version>10.0.4-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand All @@ -29,13 +29,13 @@
<dependency>
<groupId>org.finos.springbot</groupId>
<artifactId>symphony-bdk-chat-workflow-spring-boot-starter</artifactId>
<version>10.0.2-SNAPSHOT</version>
<version>10.0.4-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.finos.springbot</groupId>
<artifactId>teams-chat-workflow-spring-boot-starter</artifactId>
<version>10.0.2-SNAPSHOT</version>
<version>10.0.4-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
</dependencies>
Expand Down
6 changes: 3 additions & 3 deletions demos/demo-bot/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.finos.springbot</groupId>
<artifactId>spring-bot</artifactId>
<version>10.0.2-SNAPSHOT</version>
<version>10.0.4-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand All @@ -28,13 +28,13 @@
<dependency>
<groupId>org.finos.springbot</groupId>
<artifactId>symphony-bdk-chat-workflow-spring-boot-starter</artifactId>
<version>10.0.2-SNAPSHOT</version>
<version>10.0.4-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.finos.springbot</groupId>
<artifactId>teams-chat-workflow-spring-boot-starter</artifactId>
<version>10.0.2-SNAPSHOT</version>
<version>10.0.4-SNAPSHOT</version>
<scope>compile</scope>
</dependency>

Expand Down
6 changes: 3 additions & 3 deletions demos/rooms-bot/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.finos.springbot</groupId>
<artifactId>spring-bot</artifactId>
<version>10.0.2-SNAPSHOT</version>
<version>10.0.4-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand All @@ -23,12 +23,12 @@
<dependency>
<groupId>org.finos.springbot</groupId>
<artifactId>symphony-bdk-chat-workflow-spring-boot-starter</artifactId>
<version>10.0.2-SNAPSHOT</version>
<version>10.0.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.finos.springbot</groupId>
<artifactId>teams-chat-workflow-spring-boot-starter</artifactId>
<version>10.0.2-SNAPSHOT</version>
<version>10.0.4-SNAPSHOT</version>
</dependency>
</dependencies>

Expand Down
6 changes: 3 additions & 3 deletions demos/todo-bot/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.finos.springbot</groupId>
<artifactId>spring-bot</artifactId>
<version>10.0.2-SNAPSHOT</version>
<version>10.0.4-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>

Expand All @@ -23,12 +23,12 @@
<dependency>
<groupId>org.finos.springbot</groupId>
<artifactId>symphony-bdk-chat-workflow-spring-boot-starter</artifactId>
<version>10.0.2-SNAPSHOT</version>
<version>10.0.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.finos.springbot</groupId>
<artifactId>teams-chat-workflow-spring-boot-starter</artifactId>
<version>10.0.2-SNAPSHOT</version>
<version>10.0.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
Expand Down
14 changes: 7 additions & 7 deletions libs/chat-workflow-coverage/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>org.finos.springbot</groupId>
<artifactId>spring-bot</artifactId>
<version>10.0.2-SNAPSHOT</version>
<version>10.0.4-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>

Expand Down Expand Up @@ -56,32 +56,32 @@
<dependency>
<groupId>org.finos.springbot</groupId>
<artifactId>chat-workflow</artifactId>
<version>10.0.2-SNAPSHOT</version>
<version>10.0.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.finos.springbot</groupId>
<artifactId>chat-workflow-testing</artifactId>
<version>10.0.2-SNAPSHOT</version>
<version>10.0.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.finos.springbot</groupId>
<artifactId>symphony-bdk-chat-workflow-spring-boot-starter</artifactId>
<version>10.0.2-SNAPSHOT</version>
<version>10.0.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.finos.springbot</groupId>
<artifactId>teams-chat-workflow-spring-boot-starter</artifactId>
<version>10.0.2-SNAPSHOT</version>
<version>10.0.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.finos.springbot</groupId>
<artifactId>entity-json</artifactId>
<version>10.0.2-SNAPSHOT</version>
<version>10.0.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.finos.springbot</groupId>
<artifactId>entities</artifactId>
<version>10.0.2-SNAPSHOT</version>
<version>10.0.4-SNAPSHOT</version>
</dependency>

</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions libs/chat-workflow-testing/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>org.finos.springbot</groupId>
<artifactId>spring-bot</artifactId>
<version>10.0.2-SNAPSHOT</version>
<version>10.0.4-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>

Expand All @@ -22,7 +22,7 @@
<dependency>
<groupId>org.finos.springbot</groupId>
<artifactId>chat-workflow</artifactId>
<version>10.0.2-SNAPSHOT</version>
<version>10.0.4-SNAPSHOT</version>
</dependency>

<dependency>
Expand Down
4 changes: 2 additions & 2 deletions libs/chat-workflow/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>org.finos.springbot</groupId>
<artifactId>spring-bot</artifactId>
<version>10.0.2-SNAPSHOT</version>
<version>10.0.4-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>

Expand All @@ -33,7 +33,7 @@
<dependency>
<groupId>org.finos.springbot</groupId>
<artifactId>entity-json</artifactId>
<version>10.0.2-SNAPSHOT</version>
<version>10.0.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
Expand Down
2 changes: 1 addition & 1 deletion libs/entity-json/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>org.finos.springbot</groupId>
<artifactId>spring-bot</artifactId>
<version>10.0.2-SNAPSHOT</version>
<version>10.0.4-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>

Expand Down
8 changes: 4 additions & 4 deletions libs/symphony-bdk/symphony-bdk-chat-workflow-spring-boot-starter/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>org.finos.springbot</groupId>
<artifactId>spring-bot</artifactId>
<version>10.0.2-SNAPSHOT</version>
<version>10.0.4-SNAPSHOT</version>
<relativePath>../../..</relativePath>
</parent>

Expand All @@ -22,12 +22,12 @@
<dependency>
<groupId>org.finos.springbot</groupId>
<artifactId>chat-workflow</artifactId>
<version>10.0.2-SNAPSHOT</version>
<version>10.0.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.finos.springbot</groupId>
<artifactId>entities</artifactId>
<version>10.0.2-SNAPSHOT</version>
<version>10.0.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.finos.symphony.bdk</groupId>
Expand All @@ -43,7 +43,7 @@
<dependency>
<groupId>org.finos.springbot</groupId>
<artifactId>chat-workflow-testing</artifactId>
<version>10.0.2-SNAPSHOT</version>
<version>10.0.4-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions libs/symphony/entities/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>org.finos.springbot</groupId>
<artifactId>spring-bot</artifactId>
<version>10.0.2-SNAPSHOT</version>
<version>10.0.4-SNAPSHOT</version>
<relativePath>../../..</relativePath>
</parent>

Expand All @@ -23,7 +23,7 @@
<dependency>
<groupId>org.finos.springbot</groupId>
<artifactId>entity-json</artifactId>
<version>10.0.2-SNAPSHOT</version>
<version>10.0.4-SNAPSHOT</version>
</dependency>


Expand Down
12 changes: 9 additions & 3 deletions libs/teams/teams-chat-workflow-spring-boot-starter/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>org.finos.springbot</groupId>
<artifactId>spring-bot</artifactId>
<version>10.0.2-SNAPSHOT</version>
<version>10.0.4-SNAPSHOT</version>
<relativePath>../../..</relativePath>
</parent>

Expand Down Expand Up @@ -42,7 +42,7 @@
<dependency>
<groupId>org.finos.springbot</groupId>
<artifactId>chat-workflow</artifactId>
<version>10.0.2-SNAPSHOT</version>
<version>10.0.4-SNAPSHOT</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -77,6 +77,12 @@
<artifactId>azure-storage-blob</artifactId>
<version>${azure-storage-blob.version}</version>
</dependency>

<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-identity</artifactId>
<version>${azure-identity.version}</version>
</dependency>

<dependency>
<groupId>com.azure</groupId>
Expand Down Expand Up @@ -129,7 +135,7 @@
<dependency>
<groupId>org.finos.springbot</groupId>
<artifactId>chat-workflow-testing</artifactId>
<version>10.0.2-SNAPSHOT</version>
<version>10.0.4-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
15 changes: 7 additions & 8 deletions ...ter/src/main/java/org/finos/springbot/teams/conversations/AbstractTeamsConversations.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import com.microsoft.bot.builder.teams.TeamsInfo;
import com.microsoft.bot.connector.ConnectorClient;
import com.microsoft.bot.connector.Conversations;
import com.microsoft.bot.connector.authentication.MicrosoftAppCredentials;
import com.microsoft.bot.schema.Activity;
import com.microsoft.bot.schema.ChannelAccount;
import com.microsoft.bot.schema.ConversationAccount;
Expand All @@ -40,11 +39,11 @@
*/
public abstract class AbstractTeamsConversations implements TeamsConversations {

private MicrosoftAppCredentials mac;
private SpringBotMicrosoftAppCredentials mac;
private BotFrameworkAdapter bfa;
private ChannelAccount botAccount;

public AbstractTeamsConversations(BotFrameworkAdapter bfa, MicrosoftAppCredentials mac, ChannelAccount botAccount) {
public AbstractTeamsConversations(BotFrameworkAdapter bfa, SpringBotMicrosoftAppCredentials mac, ChannelAccount botAccount) {
super();
this.mac = mac;
this.bfa = bfa;
Expand Down Expand Up @@ -145,7 +144,7 @@ protected String getOneToOneConversationId(TeamsUser tu) {
try {
ConversationParameters cp = new ConversationParameters();
cp.setIsGroup(false);
cp.setTenantId(mac.getChannelAuthTenant());
cp.setTenantId(mac.getTenantId());
cp.setMembers(Collections.singletonList(new ChannelAccount(tu.getKey())));

return getConversations().createConversation(cp).get().getId();
Expand All @@ -159,17 +158,17 @@ public ConversationAccount getConversationAccount(TeamsAddressable address) {
if (address instanceof TeamsUser) {
String chatForUser = getOneToOneConversationId((TeamsUser) address);
ConversationAccount ca = new ConversationAccount(chatForUser);
ca.setTenantId(mac.getChannelAuthTenant());
ca.setTenantId(mac.getTenantId());
ca.setConversationType("personal");
return ca;
} else if (address instanceof TeamsChannel) {
ConversationAccount ca = new ConversationAccount(address.getKey());
ca.setTenantId(mac.getChannelAuthTenant());
ca.setTenantId(mac.getTenantId());
ca.setConversationType("channel");
return ca;
} else if (address instanceof TeamsMultiwayChat) {
ConversationAccount ca = new ConversationAccount(address.getKey());
ca.setTenantId(mac.getChannelAuthTenant());
ca.setTenantId(mac.getTenantId());
ca.setConversationType("groupChat");
return ca;
} else {
Expand Down Expand Up @@ -226,7 +225,7 @@ private TurnContext getWorkingTurnContext(TeamsAddressable ta) {

TurnContext[] holder = new TurnContext[1];

bfa.continueConversation(mac.getAppId(), createConversationReference(ta), tc -> {
bfa.continueConversation(mac.getClientId(), createConversationReference(ta), tc -> {
holder[0] = tc;
return CompletableFuture.completedFuture(null);
}).get();
Expand Down
Loading
Loading