Skip to content
This repository was archived by the owner on Oct 3, 2025. It is now read-only.

[Skills Everywhere][#422][DotNet][JS] Replace custom SkillConversationIdFactory instance by SDK SkillConversationFactory #425

Merged
gabog merged 6 commits into from
May 27, 2021
Merged

[Skills Everywhere][#422][DotNet][JS] Replace custom SkillConversationIdFactory instance by SDK SkillConversationFactory #425

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
c1689e7
[JS] Replace ConversationIdFactory usage with the one from the SDK
GiulianoDolceTalianoSantoro May 26, 2021
0448640
[DotNet] Replace ConversationIdFactory usage with the one from the SDK
sw-joelmut May 26, 2021
16cf464
Add SkillConversationIdFactory storage instance
sw-joelmut May 26, 2021
9fd748f
Fix conversationIdFactory param in TokenExchangeSkillHandler for Wate…
sw-joelmut May 27, 2021
f867645
Remove unused import
sw-joelmut May 27, 2021
ebb4fe9
Merge branch 'main' into southworks/update/conversation-id-factory
ceciliaavila May 27, 2021
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
62 changes: 0 additions & 62 deletions Bots/DotNet/Consumers/CodeFirst/SimpleHostBot-2.1/SkillConversationIdFactory.cs
View file
Open in desktop

This file was deleted.

62 changes: 0 additions & 62 deletions Bots/DotNet/Consumers/CodeFirst/SimpleHostBot/SkillConversationIdFactory.cs
View file
Open in desktop

This file was deleted.

78 changes: 0 additions & 78 deletions Bots/DotNet/Consumers/CodeFirst/WaterfallHostBot/SkillConversationIdFactory.cs
View file
Open in desktop

This file was deleted.

78 changes: 0 additions & 78 deletions Bots/DotNet/Skills/CodeFirst/WaterfallSkillBot/SkillConversationIdFactory.cs
View file
Open in desktop

This file was deleted.

5 changes: 2 additions & 3 deletions Bots/JavaScript/Consumers/CodeFirst/SimpleHostBot/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const restify = require('restify');

// Import required bot services.
// See https://aka.ms/bot-services to learn more about the different parts of a bot.
const { BotFrameworkAdapter, TurnContext, ActivityTypes, ChannelServiceRoutes, ConversationState, InputHints, MemoryStorage, SkillHandler, SkillHttpClient, MessageFactory } = require('botbuilder');
const { BotFrameworkAdapter, TurnContext, ActivityTypes, ChannelServiceRoutes, ConversationState, InputHints, MemoryStorage, SkillHandler, SkillHttpClient, MessageFactory, SkillConversationIdFactory } = require('botbuilder');
const { AuthenticationConfiguration, SimpleCredentialProvider } = require('botframework-connector');

// Import required bot configuration.
Expand All @@ -21,7 +21,6 @@ require('dotenv').config({ path: ENV_FILE });
// This bot's main dialog.
const { HostBot } = require('./bots/hostBot');
const { SkillsConfiguration } = require('./skillsConfiguration');
const { SkillConversationIdFactory } = require('./skillConversationIdFactory');
const { allowedSkillsClaimsValidator } = require('./authentication/allowedSkillsClaimsValidator');
const { SetupDialog } = require('./dialogs/setupDialog');

Expand Down Expand Up @@ -126,7 +125,7 @@ const memoryStorage = new MemoryStorage();
const conversationState = new ConversationState(memoryStorage);

// Create the conversationIdFactory
const conversationIdFactory = new SkillConversationIdFactory();
const conversationIdFactory = new SkillConversationIdFactory(memoryStorage);

// Load skills configuration
const skillsConfig = new SkillsConfiguration();
Expand Down
31 changes: 0 additions & 31 deletions Bots/JavaScript/Consumers/CodeFirst/SimpleHostBot/skillConversationIdFactory.js
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions Bots/JavaScript/Consumers/CodeFirst/WaterfallHostBot/TokenExchangeSkillHandler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
const { v4 } = require('uuid');
const { ActivityEx, ActivityTypes, CardFactory, SkillHandler, tokenExchangeOperationName, TurnContext } = require('botbuilder');
const { JwtTokenValidation } = require('botframework-connector');
const { SkillConversationIdFactory } = require('./skillConversationIdFactory');

const WATERFALL_SKILL_BOT = 'WaterfallSkillBot';

Expand All @@ -14,7 +13,7 @@ const WATERFALL_SKILL_BOT = 'WaterfallSkillBot';
class TokenExchangeSkillHandler extends SkillHandler {
constructor (adapter, bot, conversationIdFactory, skillsConfig, skillClient,
credentialProvider, authConfig, channelProvider = null, logger = null) {
super(adapter, bot, SkillConversationIdFactory, credentialProvider, authConfig, channelProvider);
super(adapter, bot, conversationIdFactory, credentialProvider, authConfig, channelProvider);
this.adapter = adapter;
this.tokenExchangeProvider = adapter;

Expand Down
5 changes: 2 additions & 3 deletions Bots/JavaScript/Consumers/CodeFirst/WaterfallHostBot/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const restify = require('restify');

// Import required bot services.
// See https://aka.ms/bot-services to learn more about the different parts of a bot.
const { BotFrameworkAdapter, TurnContext, ActivityTypes, ChannelServiceRoutes, ConversationState, InputHints, MemoryStorage, SkillHttpClient, MessageFactory } = require('botbuilder');
const { BotFrameworkAdapter, TurnContext, ActivityTypes, ChannelServiceRoutes, ConversationState, InputHints, MemoryStorage, SkillHttpClient, MessageFactory, SkillConversationIdFactory } = require('botbuilder');
const { AuthenticationConfiguration, SimpleCredentialProvider } = require('botframework-connector');

// Import required bot configuration.
Expand All @@ -21,7 +21,6 @@ require('dotenv').config({ path: ENV_FILE });
// This bot's main dialog.
const { RootBot } = require('./bots/rootBot');
const { SkillsConfiguration } = require('./skillsConfiguration');
const { SkillConversationIdFactory } = require('./skillConversationIdFactory');
const { allowedSkillsClaimsValidator } = require('./authentication/allowedSkillsClaimsValidator');
const { MainDialog } = require('./dialogs/mainDialog');
const { LoggerMiddleware } = require('./middleware/loggerMiddleware');
Expand Down Expand Up @@ -147,7 +146,7 @@ const memoryStorage = new MemoryStorage();
const conversationState = new ConversationState(memoryStorage);

// Create the conversationIdFactory
const conversationIdFactory = new SkillConversationIdFactory();
const conversationIdFactory = new SkillConversationIdFactory(memoryStorage);

// Load skills configuration
const skillsConfig = new SkillsConfiguration();
Expand Down
Loading