Skip to content
This repository was archived by the owner on Jun 30, 2022. It is now read-only.

Commit 5760202

Browse files
lauren-millslauren-mills
committed
updated skills with whitelist changes
1 parent e10f3a1 commit 5760202

File tree

35 files changed

+152
-85
lines changed

35 files changed

+152
-85
lines changed

‎skills/src/csharp/automotiveskill/automotiveskill/AutomotiveSkill.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
<PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.5.1" />
2828
<PackageReference Include="Microsoft.Bot.Builder.Integration.ApplicationInsights.Core" Version="4.5.1" />
2929
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.5.1" />
30-
<PackageReference Include="Microsoft.Bot.Builder.Skills" Version="4.5.3" />
31-
<PackageReference Include="Microsoft.Bot.Builder.Solutions" Version="4.5.3" />
30+
<PackageReference Include="Microsoft.Bot.Builder.Skills" Version="4.6.0-rc4" />
31+
<PackageReference Include="Microsoft.Bot.Builder.Solutions" Version="4.6.0-rc4" />
3232
<PackageReference Include="Microsoft.Bot.Builder.TemplateManager" Version="4.5.1" />
3333
<PackageReference Include="Microsoft.Bot.Configuration" Version="4.5.1" />
3434
<PackageReference Include="Microsoft.Bot.Connector" Version="4.5.1" />

‎skills/src/csharp/automotiveskill/automotiveskill/Controllers/BotController.cs‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,22 @@
22
using Microsoft.Bot.Builder;
33
using Microsoft.Bot.Builder.Integration.AspNet.Core;
44
using Microsoft.Bot.Builder.Skills;
5+
using Microsoft.Bot.Builder.Skills.Auth;
56
using Microsoft.Bot.Builder.Solutions;
67

78
namespace AutomotiveSkill.Controllers
89
{
910
[ApiController]
1011
public class BotController : SkillController
1112
{
12-
public BotController(
13-
IBot bot,
14-
BotSettingsBase botSettings,
15-
IBotFrameworkHttpAdapter botFrameworkHttpAdapter,
16-
SkillWebSocketAdapter skillWebSocketAdapter)
17-
: base(bot, botSettings, botFrameworkHttpAdapter, skillWebSocketAdapter)
18-
{
19-
}
20-
}
13+
public BotController(
14+
IBot bot,
15+
BotSettingsBase botSettings,
16+
IBotFrameworkHttpAdapter botFrameworkHttpAdapter,
17+
SkillWebSocketAdapter skillWebSocketAdapter,
18+
IWhitelistAuthenticationProvider whitelistAuthenticationProvider)
19+
: base(bot, botSettings, botFrameworkHttpAdapter, skillWebSocketAdapter, whitelistAuthenticationProvider)
20+
{
21+
}
22+
}
2123
}

‎skills/src/csharp/automotiveskill/automotiveskill/Startup.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,9 @@ public void ConfigureServices(IServiceCollection services)
110110
services.AddTransient<SkillWebSocketBotAdapter, AutomotiveSkillWebSocketBotAdapter>();
111111
services.AddTransient<SkillWebSocketAdapter>();
112112

113+
// Register WhiteListAuthProvider
114+
services.AddSingleton<IWhitelistAuthenticationProvider, WhitelistAuthenticationProvider>();
115+
113116
// Configure bot
114117
services.AddTransient<MainDialog>();
115118
services.AddTransient<IBot, DialogBot<MainDialog>>();

‎skills/src/csharp/emailskill/emailskill/Controllers/BotController.cs‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,22 @@
22
using Microsoft.Bot.Builder;
33
using Microsoft.Bot.Builder.Integration.AspNet.Core;
44
using Microsoft.Bot.Builder.Skills;
5+
using Microsoft.Bot.Builder.Skills.Auth;
56
using Microsoft.Bot.Builder.Solutions;
67

78
namespace EmailSkill.Controllers
89
{
910
[ApiController]
1011
public class BotController : SkillController
1112
{
12-
public BotController(
13-
IBot bot,
14-
BotSettingsBase botSettings,
15-
IBotFrameworkHttpAdapter botFrameworkHttpAdapter,
16-
SkillWebSocketAdapter skillWebSocketAdapter)
17-
: base(bot, botSettings, botFrameworkHttpAdapter, skillWebSocketAdapter)
18-
{
19-
}
20-
}
13+
public BotController(
14+
IBot bot,
15+
BotSettingsBase botSettings,
16+
IBotFrameworkHttpAdapter botFrameworkHttpAdapter,
17+
SkillWebSocketAdapter skillWebSocketAdapter,
18+
IWhitelistAuthenticationProvider whitelistAuthenticationProvider)
19+
: base(bot, botSettings, botFrameworkHttpAdapter, skillWebSocketAdapter, whitelistAuthenticationProvider)
20+
{
21+
}
22+
}
2123
}

‎skills/src/csharp/emailskill/emailskill/EmailSkill.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@
4747
<PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.5.1" />
4848
<PackageReference Include="Microsoft.Bot.Builder.Integration.ApplicationInsights.Core" Version="4.5.1" />
4949
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.5.1" />
50-
<PackageReference Include="Microsoft.Bot.Builder.Skills" Version="4.6.0-daily6" />
51-
<PackageReference Include="Microsoft.Bot.Builder.Solutions" Version="4.6.0-daily6" />
50+
<PackageReference Include="Microsoft.Bot.Builder.Skills" Version="4.6.0-rc4" />
51+
<PackageReference Include="Microsoft.Bot.Builder.Solutions" Version="4.6.0-rc4" />
5252
<PackageReference Include="Microsoft.Bot.Builder.TemplateManager" Version="4.5.1" />
5353
<PackageReference Include="Microsoft.Bot.Configuration" Version="4.5.1" />
5454
<PackageReference Include="Microsoft.Bot.Connector" Version="4.5.1" />

‎skills/src/csharp/emailskill/emailskill/Startup.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
using Microsoft.Bot.Builder.Integration.ApplicationInsights.Core;
2525
using Microsoft.Bot.Builder.Integration.AspNet.Core;
2626
using Microsoft.Bot.Builder.Skills;
27+
using Microsoft.Bot.Builder.Skills.Auth;
2728
using Microsoft.Bot.Builder.Solutions;
2829
using Microsoft.Bot.Builder.Solutions.Responses;
2930
using Microsoft.Bot.Builder.Solutions.TaskExtensions;
@@ -122,6 +123,9 @@ public void ConfigureServices(IServiceCollection services)
122123
services.AddTransient<SkillWebSocketBotAdapter, EmailSkillWebSocketBotAdapter>();
123124
services.AddTransient<SkillWebSocketAdapter>();
124125

126+
// Register WhiteListAuthProvider
127+
services.AddSingleton<IWhitelistAuthenticationProvider, WhitelistAuthenticationProvider>();
128+
125129
// Configure bot
126130
services.AddTransient<MainDialog>();
127131
services.AddTransient<IBot, DialogBot<MainDialog>>();

‎skills/src/csharp/experimental/bingsearchskill/bingsearchskill/BingSearchSkill.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@
7575
<PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.5.1" />
7676
<PackageReference Include="Microsoft.Bot.Builder.Integration.ApplicationInsights.Core" Version="4.5.1" />
7777
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.5.1" />
78-
<PackageReference Include="Microsoft.Bot.Builder.Skills" Version="4.5.3" />
79-
<PackageReference Include="Microsoft.Bot.Builder.Solutions" Version="4.5.3" />
78+
<PackageReference Include="Microsoft.Bot.Builder.Skills" Version="4.6.0-rc4" />
79+
<PackageReference Include="Microsoft.Bot.Builder.Solutions" Version="4.6.0-rc4" />
8080
<PackageReference Include="Microsoft.Bot.Builder.TemplateManager" Version="4.5.1" />
8181
<PackageReference Include="Microsoft.Bot.Configuration" Version="4.5.1" />
8282
<PackageReference Include="Microsoft.Bot.Connector" Version="4.5.1" />

‎skills/src/csharp/experimental/bingsearchskill/bingsearchskill/Controllers/BotController.cs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using Microsoft.Bot.Builder;
33
using Microsoft.Bot.Builder.Integration.AspNet.Core;
44
using Microsoft.Bot.Builder.Skills;
5+
using Microsoft.Bot.Builder.Skills.Auth;
56
using Microsoft.Bot.Builder.Solutions;
67

78
namespace BingSearchSkill.Controllers
@@ -13,8 +14,9 @@ public BotController(
1314
IBot bot,
1415
BotSettingsBase botSettings,
1516
IBotFrameworkHttpAdapter botFrameworkHttpAdapter,
16-
SkillWebSocketAdapter skillWebSocketAdapter)
17-
: base(bot, botSettings, botFrameworkHttpAdapter, skillWebSocketAdapter)
17+
SkillWebSocketAdapter skillWebSocketAdapter,
18+
IWhitelistAuthenticationProvider whitelistAuthenticationProvider)
19+
: base(bot, botSettings, botFrameworkHttpAdapter, skillWebSocketAdapter, whitelistAuthenticationProvider)
1820
{
1921
}
2022
}

‎skills/src/csharp/experimental/bingsearchskill/bingsearchskill/Startup.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
using Microsoft.Bot.Builder.Skills;
2828
using Microsoft.Bot.Builder.Solutions;
2929
using BingSearchSkill.Adapters;
30+
using Microsoft.Bot.Builder.Skills.Auth;
3031

3132
namespace BingSearchSkill
3233
{
@@ -105,6 +106,9 @@ public void ConfigureServices(IServiceCollection services)
105106
services.AddTransient<SkillWebSocketBotAdapter, CustomSkillAdapter>();
106107
services.AddTransient<SkillWebSocketAdapter>();
107108

109+
// Register WhiteListAuthProvider
110+
services.AddSingleton<IWhitelistAuthenticationProvider, WhitelistAuthenticationProvider>();
111+
108112
// Configure bot
109113
services.AddTransient<MainDialog>();
110114
services.AddTransient<IBot, DialogBot<MainDialog>>();

‎skills/src/csharp/experimental/eventskill/Controllers/BotController.cs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using Microsoft.Bot.Builder;
66
using Microsoft.Bot.Builder.Integration.AspNet.Core;
77
using Microsoft.Bot.Builder.Skills;
8+
using Microsoft.Bot.Builder.Skills.Auth;
89
using Microsoft.Bot.Builder.Solutions;
910

1011
namespace EventSkill.Controllers
@@ -16,8 +17,9 @@ public BotController(
1617
IBot bot,
1718
BotSettingsBase botSettings,
1819
IBotFrameworkHttpAdapter botFrameworkHttpAdapter,
19-
SkillWebSocketAdapter skillWebSocketAdapter)
20-
: base(bot, botSettings, botFrameworkHttpAdapter, skillWebSocketAdapter)
20+
SkillWebSocketAdapter skillWebSocketAdapter,
21+
IWhitelistAuthenticationProvider whitelistAuthenticationProvider)
22+
: base(bot, botSettings, botFrameworkHttpAdapter, skillWebSocketAdapter, whitelistAuthenticationProvider)
2123
{
2224
}
2325
}

0 commit comments

Comments
 (0)