Jo 13138 (#15)

* Moving forward to a using a flow for the user. * More changes to the flow. * Working on the flow. * Finished the flow for connecting to an account. * Fixed current unittests. * Small cleanup in the Authorize controller. * Some minor fixes. * - Updated Nuget packages. - Followed up on new rulesets. * Added guards in ConnectDialog Removed try..catch
ALM-Rangers · May 8, 2017 · 78f2688 · 78f2688
1 parent 1fbe3c1
commit 78f2688
Show file tree

Hide file tree

Showing 32 changed files with 622 additions and 369 deletions.
diff --git a/src/Common/ProductionCodeRules.ruleset b/src/Common/ProductionCodeRules.ruleset
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RuleSet Name="Production code ruleset" Description="This rule set contains all rules except a few which are not appropriate for production code." ToolsVersion="14.0">
+<RuleSet Name="Production code ruleset" Description="This rule set contains all rules except a few which are not appropriate for production code." ToolsVersion="15.0">
   <IncludeAll Action="Warning" />
   <Rules AnalyzerId="Microsoft.Analyzers.ManagedCodeAnalysis" RuleNamespace="Microsoft.Rules.Managed">
     <Rule Id="CA1020" Action="None" />
+    <Rule Id="CA1305" Action="None" />
   </Rules>
   <Rules AnalyzerId="StyleCop.Analyzers" RuleNamespace="StyleCop.Analyzers">
     <Rule Id="SA1305" Action="Warning" />

diff --git a/src/Team-Services-Bot.AcceptanceTests/CommonSteps.cs b/src/Team-Services-Bot.AcceptanceTests/CommonSteps.cs
@@ -3,7 +3,7 @@
 // Licensed under the MIT License. See License.txt in the project root for license information.
 // </copyright>
 // <summary>
-// Contains the specflow steps to perform an echo.
+// Contains the common specflow steps.
 // </summary>
 // ———————————————————————————————
 

diff --git a/src/Team-Services-Bot.AcceptanceTests/EchoSteps.cs b/src/Team-Services-Bot.AcceptanceTests/EchoSteps.cs
@@ -9,7 +9,6 @@
 
 namespace Vsar.TSBot.AcceptanceTests
 {
-    using System;
     using System.Linq;
     using FluentAssertions;
     using Microsoft.Bot.Connector.DirectLine;

diff --git a/src/Team-Services-Bot.AcceptanceTests/Features/Echo.feature b/src/Team-Services-Bot.AcceptanceTests/Features/Echo.feature
diff --git a/src/Team-Services-Bot.AcceptanceTests/Features/Echo.feature.cs b/src/Team-Services-Bot.AcceptanceTests/Features/Echo.feature.cs
diff --git a/src/Team-Services-Bot.AcceptanceTests/Team-Services-Bot.AcceptanceTests.csproj b/src/Team-Services-Bot.AcceptanceTests/Team-Services-Bot.AcceptanceTests.csproj
@@ -75,23 +75,23 @@
     <Reference Include="Gherkin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=86496cfa5b4a5851, processorArchitecture=MSIL">
       <HintPath>..\packages\SpecFlow.CustomPlugin.2.1.0\lib\net45\Gherkin.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Bot.Builder, Version=3.5.8.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Bot.Builder.3.5.8.0\lib\net46\Microsoft.Bot.Builder.dll</HintPath>
+    <Reference Include="Microsoft.Bot.Builder, Version=3.5.9.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Bot.Builder.3.5.9.0\lib\net46\Microsoft.Bot.Builder.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Bot.Builder.Autofac, Version=3.5.8.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Bot.Builder.3.5.8.0\lib\net46\Microsoft.Bot.Builder.Autofac.dll</HintPath>
+    <Reference Include="Microsoft.Bot.Builder.Autofac, Version=3.5.9.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Bot.Builder.3.5.9.0\lib\net46\Microsoft.Bot.Builder.Autofac.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Bot.Connector, Version=3.5.8.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Bot.Builder.3.5.8.0\lib\net46\Microsoft.Bot.Connector.dll</HintPath>
+    <Reference Include="Microsoft.Bot.Connector, Version=3.5.9.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Bot.Builder.3.5.9.0\lib\net46\Microsoft.Bot.Connector.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Bot.Connector.DirectLine, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Bot.Connector.DirectLine.3.0.0\lib\net45\Microsoft.Bot.Connector.DirectLine.dll</HintPath>
+    <Reference Include="Microsoft.Bot.Connector.DirectLine, Version=3.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Bot.Connector.DirectLine.3.0.1\lib\net45\Microsoft.Bot.Connector.DirectLine.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.IdentityModel.Protocol.Extensions, Version=1.0.40306.1554, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.IdentityModel.Protocol.Extensions.1.0.4.403061554\lib\net45\Microsoft.IdentityModel.Protocol.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Rest.ClientRuntime, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Rest.ClientRuntime.2.3.6\lib\net45\Microsoft.Rest.ClientRuntime.dll</HintPath>
+      <HintPath>..\packages\Microsoft.Rest.ClientRuntime.2.3.7\lib\net452\Microsoft.Rest.ClientRuntime.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\MSTest.TestFramework.1.1.17\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
@@ -100,8 +100,8 @@
       <HintPath>..\packages\MSTest.TestFramework.1.1.17\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
       <EmbedInteropTypes>False</EmbedInteropTypes>
     </Reference>
-    <Reference Include="Moq, Version=4.7.9.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
-      <HintPath>..\packages\Moq.4.7.9\lib\net45\Moq.dll</HintPath>
+    <Reference Include="Moq, Version=4.7.10.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
+      <HintPath>..\packages\Moq.4.7.10\lib\net45\Moq.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
@@ -166,11 +166,6 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>Controller.feature</DependentUpon>
     </Compile>
-    <Compile Include="Features\Echo.feature.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Echo.feature</DependentUpon>
-    </Compile>
     <Compile Include="Properties\GlobalSuppressions.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
@@ -180,10 +175,6 @@
       <Generator>SpecFlowSingleFileGenerator</Generator>
       <LastGenOutput>Controller.feature.cs</LastGenOutput>
     </None>
-    <None Include="Features\Echo.feature">
-      <Generator>SpecFlowSingleFileGenerator</Generator>
-      <LastGenOutput>Echo.feature.cs</LastGenOutput>
-    </None>
     <None Include="packages.config">
       <SubType>Designer</SubType>
     </None>

diff --git a/src/Team-Services-Bot.AcceptanceTests/packages.config b/src/Team-Services-Bot.AcceptanceTests/packages.config
@@ -18,12 +18,12 @@
   <package id="Microsoft.AnalyzerPowerPack" version="1.1.0" targetFramework="net462" />
   <package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net462" />
   <package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net462" />
-  <package id="Microsoft.Bot.Builder" version="3.5.8.0" targetFramework="net462" />
-  <package id="Microsoft.Bot.Connector.DirectLine" version="3.0.0" targetFramework="net462" />
+  <package id="Microsoft.Bot.Builder" version="3.5.9.0" targetFramework="net462" />
+  <package id="Microsoft.Bot.Connector.DirectLine" version="3.0.1" targetFramework="net462" />
   <package id="Microsoft.CodeAnalysis.FxCopAnalyzers" version="1.1.0" targetFramework="net462" />
   <package id="Microsoft.IdentityModel.Protocol.Extensions" version="1.0.4.403061554" targetFramework="net462" />
-  <package id="Microsoft.Rest.ClientRuntime" version="2.3.6" targetFramework="net462" />
-  <package id="Moq" version="4.7.9" targetFramework="net462" />
+  <package id="Microsoft.Rest.ClientRuntime" version="2.3.7" targetFramework="net462" />
+  <package id="Moq" version="4.7.10" targetFramework="net462" />
   <package id="MSTest.TestAdapter" version="1.1.17" targetFramework="net462" />
   <package id="MSTest.TestFramework" version="1.1.17" targetFramework="net462" />
   <package id="Newtonsoft.Json" version="10.0.2" targetFramework="net462" />

diff --git a/src/Team-Services-Bot.Api.UnitTests/Dialogs/ConnectDialogTests.cs b/src/Team-Services-Bot.Api.UnitTests/Dialogs/ConnectDialogTests.cs
@@ -10,18 +10,16 @@
 namespace Vsar.TSBot.UnitTests
 {
     using System;
-    using System.Collections.Generic;
     using System.Linq;
     using System.Threading.Tasks;
     using System.Web.Http;
     using Autofac;
     using Autofac.Integration.WebApi;
+    using Cards;
     using Dialogs;
     using Microsoft.ApplicationInsights;
     using Microsoft.Bot.Builder.Dialogs;
-    using Microsoft.Bot.Connector;
     using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using Resources;
 
     /// <summary>
     /// Contains Test methods for <see cref="ConnectDialog"/>
@@ -44,18 +42,22 @@ public ConnectDialogTests()
         [TestMethod]
         public async Task FirstTimeConnectionTest()
         {
-            var toBot = this.Fixture.CreateMessage();
-            toBot.From.Id = Guid.NewGuid().ToString();
-            toBot.Text = "connect anaccount";
+            var fromId = Guid.NewGuid().ToString();
+            var toBot1 = this.Fixture.CreateMessage();
+            toBot1.From.Id = fromId;
+            toBot1.Text = "Hi";
+
+            var toBot2 = this.Fixture.CreateMessage();
+            toBot2.From.Id = fromId;
+            toBot2.Text = "connect anaccount";
 
             const string appId = "AnAppId";
             const string authorizeUrl = "https://www.authorizationUrl.com";
             const string scope =
-                "vso.agentpools_manage%20vso.build_execute%20vso.chat_manage%20vso.code_manage%20vso.code_status%20" +
-                "vso.connected_server%20vso.dashboards_manage%20vso.entitlements%20vso.extension.data_write%20" +
-                "vso.extension_manage%20vso.gallery_acquire%20vso.gallery_manage%20vso.identity%20vso.loadtest_write%20" +
-                "vso.notification_manage%20vso.packaging_manage%20vso.profile_write%20vso.project_manage%20" +
-                "vso.release_manage%20vso.security_manage%20vso.serviceendpoint_manage%20vso.test_write%20vso.work_write";
+                "vso.agentpools%20vso.build_execute%20vso.chat_write%20vso.code%20vso.connected_server%20" +
+                "vso.dashboards%20vso.entitlements%20vso.extension%20vso.extension.data%20vso.gallery%20" +
+                "vso.identity%20vso.loadtest%20vso.notification%20vso.packaging%20vso.project%20" +
+                "vso.release_execute%20vso.serviceendpoint%20vso.taskgroups%20vso.test%20vso.work";
 
             var builder = this.Fixture.Build();
             builder.RegisterType<TelemetryClient>();
@@ -69,19 +71,21 @@ public async Task FirstTimeConnectionTest()
             GlobalConfiguration.Configure(config => config.DependencyResolver = new AutofacWebApiDependencyResolver(container));
             var root = new RootDialog();
 
-            var toUser = await this.Fixture.GetResponse(container, root, toBot);
+            // First trigger the welcome message.
+            await this.Fixture.GetResponse(container, root, toBot1);
+            var toUser = await this.Fixture.GetResponse(container, root, toBot2);
 
             var attachment = toUser.Attachments.FirstOrDefault();
             Assert.IsNotNull(attachment, "Expecting an attachment.");
 
-            var card = attachment.Content as SigninCard;
+            var card = attachment.Content as LogOnCard;
             Assert.IsNotNull(card, "Missing signin card.");
 
             var button = card.Buttons.FirstOrDefault();
             Assert.IsNotNull(button, "Button is missing");
 
             var expected =
-                $"https://app.vssps.visualstudio.com/oauth2/authorize?client_id={appId}&response_type=Assertion&state={toBot.ChannelId};{toBot.From.Id}&scope={scope}&redirect_uri={authorizeUrl}/";
+                $"https://app.vssps.visualstudio.com/oauth2/authorize?client_id={appId}&response_type=Assertion&state={toBot2.ChannelId};{toBot2.From.Id}&scope={scope}&redirect_uri={authorizeUrl}/";
             Assert.AreEqual(expected.ToLower(), button.Value.ToString().ToLower(), "OAuth url is invalid.");
         }
 

diff --git a/src/Team-Services-Bot.Api.UnitTests/Dialogs/RootDialogTests.cs b/src/Team-Services-Bot.Api.UnitTests/Dialogs/RootDialogTests.cs
@@ -9,15 +9,6 @@
 
 namespace Vsar.TSBot.UnitTests
 {
-    using System;
-    using System.Threading.Tasks;
-    using System.Web.Http;
-    using Autofac;
-    using Autofac.Integration.WebApi;
-    using Dialogs;
-    using FluentAssertions;
-    using Microsoft.ApplicationInsights;
-    using Microsoft.Bot.Builder.Dialogs;
     using Microsoft.VisualStudio.TestTools.UnitTesting;
 
     /// <summary>
@@ -33,32 +24,5 @@ public RootDialogTests()
             : base(new DialogFixture())
         {
         }
-
-        /// <summary>
-        /// Temporary
-        /// </summary>
-        /// <returns>Nothing.</returns>
-        [TestMethod]
-        public async Task EchoDialog()
-        {
-            var toBot = this.Fixture.CreateMessage();
-            toBot.From.Id = Guid.NewGuid().ToString();
-            toBot.Text = "Test";
-
-            var builder = this.Fixture.Build();
-            builder.RegisterType<TelemetryClient>();
-            builder
-                .RegisterType<EchoDialog>()
-                .As<IDialog<object>>();
-
-            var container = builder.Build();
-            GlobalConfiguration.Configure(config => config.DependencyResolver = new AutofacWebApiDependencyResolver(container));
-
-            var root = new RootDialog();
-
-            var toUser = await this.Fixture.GetResponse(container, root, toBot);
-
-            toUser.Text.Should().Contain("4").And.Contain("Test");
-        }
     }
 }