Add LtiAdvantage submodule, update LineItems view

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "shared/LtiAdvantage"]
+	path = shared/LtiAdvantage
+	url = https://github.com/learningcom/LtiAdvantage

AdvantageTool.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.28010.2019
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.30804.86
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{777D9453-8256-4AD3-ADDF-BE34047DFFEB}"
 	ProjectSection(SolutionItems) = preProject
@@ -10,9 +10,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AdvantageTool", "src\AdvantageTool.csproj", "{4EBF015D-9B8C-4A2E-8A72-658F931718C0}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LtiAdvantage", "..\..\LTI\LtiAdvantage\src\LtiAdvantage\LtiAdvantage.csproj", "{097C6757-60C8-44C2-B378-F9A8E3A08377}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LtiAdvantage", "shared\LtiAdvantage\src\LtiAdvantage\LtiAdvantage.csproj", "{52E66378-7670-4E6E-978C-D3B16883506C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LtiAdvantage.IdentityModel", "..\..\LTI\LtiAdvantage\src\LtiAdvantage.IdentityModel\LtiAdvantage.IdentityModel.csproj", "{C55CD2BF-0A0E-43F2-A285-E82904CCD727}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LtiAdvantage.IdentityModel", "shared\LtiAdvantage\src\LtiAdvantage.IdentityModel\LtiAdvantage.IdentityModel.csproj", "{B04A07BC-C551-478E-8B6C-377D219EC8FF}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -24,14 +24,14 @@ Global
 		{4EBF015D-9B8C-4A2E-8A72-658F931718C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4EBF015D-9B8C-4A2E-8A72-658F931718C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4EBF015D-9B8C-4A2E-8A72-658F931718C0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{097C6757-60C8-44C2-B378-F9A8E3A08377}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{097C6757-60C8-44C2-B378-F9A8E3A08377}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{097C6757-60C8-44C2-B378-F9A8E3A08377}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{097C6757-60C8-44C2-B378-F9A8E3A08377}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C55CD2BF-0A0E-43F2-A285-E82904CCD727}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C55CD2BF-0A0E-43F2-A285-E82904CCD727}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C55CD2BF-0A0E-43F2-A285-E82904CCD727}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C55CD2BF-0A0E-43F2-A285-E82904CCD727}.Release|Any CPU.Build.0 = Release|Any CPU
+		{52E66378-7670-4E6E-978C-D3B16883506C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{52E66378-7670-4E6E-978C-D3B16883506C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{52E66378-7670-4E6E-978C-D3B16883506C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{52E66378-7670-4E6E-978C-D3B16883506C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B04A07BC-C551-478E-8B6C-377D219EC8FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B04A07BC-C551-478E-8B6C-377D219EC8FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B04A07BC-C551-478E-8B6C-377D219EC8FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B04A07BC-C551-478E-8B6C-377D219EC8FF}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

README.md

@@ -2,6 +2,15 @@
 
 # LTI Advantage Tool
 
-Sample LTI Advantage Tool for .NET Core. See https://advantagetool.azurewebsites.net/
+Most of the interesting stuff is in [src/Pages/Tool.cshtml.cs](src/Pages/Tool.cshtml.cs)
 
-Most of the interesting stuff is in https://github.com/andyfmiller/LtiAdvantageTool/blob/master/src/Pages/Tool.cshtml.cs
+## Useful Links
+
+Debugging Tools
+
+* [OpenID Connect debugger](https://oidcdebugger.com/)
+
+LTI Specifications
+* [Learning Tools Interoperability Core Specification 1.3 | IMS Global Learning Consortium](https://www.imsglobal.org/spec/lti/v1p3/)
+* [Learning Tools Interoperability Names and Role Provisioning Services Version 2.0 | IMS Global Learning Consortium](https://www.imsglobal.org/spec/lti-nrps/v2p0)
+* [Learning Tools Interoperability Assignment and Grade Services Version 2.0 | IMS Global Learning Consortium](https://www.imsglobal.org/spec/lti-ags/v2p0)

Start-AdvantageTool.ps1

@@ -0,0 +1 @@
+dotnet run --project .\src\AdvantageTool.csproj

src/AdvantageTool.csproj

@@ -21,8 +21,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\LTI\LtiAdvantage\src\LtiAdvantage.IdentityModel\LtiAdvantage.IdentityModel.csproj" />
-    <ProjectReference Include="..\..\..\LTI\LtiAdvantage\src\LtiAdvantage\LtiAdvantage.csproj" />
+    <ProjectReference Include="..\shared\LtiAdvantage\src\LtiAdvantage.IdentityModel\LtiAdvantage.IdentityModel.csproj" />
+    <ProjectReference Include="..\shared\LtiAdvantage\src\LtiAdvantage\LtiAdvantage.csproj" />
   </ItemGroup>
 
   <ItemGroup>

src/Pages/Catalog.cshtml.cs

@@ -107,15 +107,18 @@ public async Task<IActionResult> OnPostAssignActivities()
 
             var contentItems = new List<ContentItem>();
             var customParameters = LtiRequest.Custom;
+            var platform = await _context.GetPlatformByIssuerAsync(LtiRequest.Iss);
+
             foreach (var activity in Activities)
             {
                 if (activity.Selected)
                 {
+                    var url = Url.Page("/Tool", null, new { platformId = platform.PlatformId }, Request.Scheme);
                     var contentItem = new LtiLinkItem
                     {
                         Title = activity.Title,
                         Text = activity.Description,
-                        Url = Url.Page("./Tool", null, null, Request.Scheme),
+                        Url = url,
                         Custom = new Dictionary<string, string>
                         {
                             { "activity_id", activity.Id.ToString() }
@@ -143,11 +146,10 @@ public async Task<IActionResult> OnPostAssignActivities()
             response.AddClaim(new Claim(JwtRegisteredClaimNames.Exp, EpochTime.GetIntDate(DateTime.UtcNow.AddMinutes(5)).ToString()));
             response.AddClaim(new Claim(JwtRegisteredClaimNames.Nonce, IdentityModel.CryptoRandom.CreateRandomKeyString(8)));
 
-            var platform = await _context.GetPlatformByIssuerAsync(LtiRequest.Iss);
             var credentials = PemHelper.SigningCredentialsFromPemString(platform.PrivateKey);
             var jwt = handler.WriteToken(new JwtSecurityToken(new JwtHeader(credentials), response));
 
-            return Post("id_token", jwt, LtiRequest.DeepLinkingSettings.DeepLinkReturnUrl);
+            return Post("JWT", jwt, LtiRequest.DeepLinkingSettings.DeepLinkReturnUrl);
         }
 
         /// <summary>

src/Pages/Components/LineItems/Default.cshtml

@@ -3,17 +3,22 @@
 @if (Model != null)
 {
     <div class="row">
-        <div class="col-12">
+        <div class="col-12 mb-3">
             <div class="card bg-transparent">
                 <form method="post">
                     <input type="hidden" name="id_token" value="@Model.IdToken" />
                     <h5 class="card-header">
                         Gradebook
-                        <button type="submit" class="btn btn-light btn-sm float-right" asp-page-handler="CreateLineItem">
-                            Add a line item for <span class="font-italic">@Model.LtiRequest.ResourceLink.Title</span>
-                        </button>
                     </h5>
+
                     <div class="card-body">
+                        <div class="form-group">
+                            <label>Resource Link ID</label>
+                            <input type="text" name="resource_link_id" value="@Model.LtiRequest.ResourceLink.Title" class="form-control mb-3 w-25"/>
+                            <button type="submit" class="btn btn-light btn-sm form-control w-25" asp-page-handler="CreateLineItem">
+                                Add a line item
+                            </button>
+                        </div>
                         @Model.Status
                         @if (Model.LineItems == null)
                         {
@@ -29,7 +34,16 @@
                                         <th scope="col" class="border-left-0 border-top-0"></th>
                                         @foreach (var lineItem in Model.LineItems.OrderBy(l => l.Header))
                                         {
-                                            <th scope="col" class="text-center">@lineItem.Header</th>
+                                            <th scope="col" class="text-center">
+                                                @lineItem.Header
+                                                @{var deleteRouteData = new Dictionary<string, string> { { "lineItemUrl", lineItem.AgsLineItem.Id } };}
+                                                <button type="submit" class="btn btn-sm btn-link"
+                                                        data-toggle="tooltip" title="Delete line item"
+                                                        asp-page-handler="DeleteLineItem"
+                                                        asp-all-route-data="@deleteRouteData">
+                                                    <i class="fa fa-minus-square fa-lg text-light"></i>
+                                                </button>
+                                            </th>
                                         }
                                     </tr>
                                 </thead>
@@ -74,4 +88,41 @@
             </div>
         </div>
     </div>
-}
+    <div class="row">
+        <div class="col-4 mb-3">
+            <div class="card bg-transparent">
+                <h5 class="card-header">
+                    Members
+                </h5>
+                <div class="card-body">
+                    @if (Model.Members == null)
+                    {
+                        <p>
+                            This context does not have any members.
+                        </p>
+                    }
+                    else
+                    {
+                        <table class="table table-bordered table-responsive-sm border-0">
+                            <thead>
+                                <tr>
+                                    <th scope="col" class="text-center">UserId</th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                @foreach (var member in Model.Members)
+                                {
+                                    <tr>
+                                        <td>
+                                            @member.Key
+                                        </td>
+                                    </tr>
+                                }
+                            </tbody>
+                        </table>
+                    }
+                </div>
+            </div>
+        </div>
+    </div>
+ }

src/Pages/Components/LineItems/LineItemsViewComponent.cs

@@ -62,16 +62,19 @@ public async Task<IViewComponentResult> InvokeAsync(string idToken)
                 return View(model);
             }
 
-            // Get all the line items
+            // Get all the members of the course
+            model.Members = new Dictionary<string, string>();
+
             try
             {
                 var httpClient = _httpClientFactory.CreateClient();
                 httpClient.SetBearerToken(tokenResponse.AccessToken);
 
+                httpClient.DefaultRequestHeaders.Accept.Clear();
                 httpClient.DefaultRequestHeaders.Accept
-                    .Add(new MediaTypeWithQualityHeaderValue(Constants.MediaTypes.LineItemContainer));
+                    .Add(new MediaTypeWithQualityHeaderValue(Constants.MediaTypes.MembershipContainer));
 
-                using (var response = await httpClient.GetAsync(model.LtiRequest.AssignmentGradeServices?.LineItemsUrl))
+                using (var response = await httpClient.GetAsync(model.LtiRequest.NamesRoleService.ContextMembershipUrl))
                 {
                     if (!response.IsSuccessStatusCode)
                     {
@@ -80,34 +83,32 @@ public async Task<IViewComponentResult> InvokeAsync(string idToken)
                     }
 
                     var content = await response.Content.ReadAsStringAsync();
-                    model.LineItems = JsonConvert.DeserializeObject<List<LineItem>>(content)
-                        .Select(i => new MyLineItem
+                    var membership = JsonConvert.DeserializeObject<MembershipContainer>(content);
+                    foreach (var member in membership.Members.OrderBy(m => m.FamilyName).ThenBy(m => m.GivenName))
+                    {
+                        if (!model.Members.ContainsKey(member.UserId))
                         {
-                            AgsLineItem = i,
-                            Header = i.Label ?? $"Tag: {i.Tag}"
-                        })
-                        .ToList();
+                            model.Members.Add(member.UserId, $"{member.FamilyName}, {member.GivenName}");
+                        }
+                    }
                 }
             }
             catch (Exception e)
             {
                 model.Status = e.Message;
-                return View();
+                return View(model);
             }
 
-            // Get all the members of the course
-            model.Members = new Dictionary<string, string>();
-
+            // Get all the line items
             try
             {
                 var httpClient = _httpClientFactory.CreateClient();
                 httpClient.SetBearerToken(tokenResponse.AccessToken);
 
-                httpClient.DefaultRequestHeaders.Accept.Clear();
                 httpClient.DefaultRequestHeaders.Accept
-                    .Add(new MediaTypeWithQualityHeaderValue(Constants.MediaTypes.MembershipContainer));
+                    .Add(new MediaTypeWithQualityHeaderValue(Constants.MediaTypes.LineItemContainer));
 
-                using (var response = await httpClient.GetAsync(model.LtiRequest.NamesRoleService.ContextMembershipUrl))
+                using (var response = await httpClient.GetAsync(model.LtiRequest.AssignmentGradeServices?.LineItemsUrl))
                 {
                     if (!response.IsSuccessStatusCode)
                     {
@@ -116,14 +117,13 @@ public async Task<IViewComponentResult> InvokeAsync(string idToken)
                     }
 
                     var content = await response.Content.ReadAsStringAsync();
-                    var membership = JsonConvert.DeserializeObject<MembershipContainer>(content);
-                    foreach (var member in membership.Members.OrderBy(m => m.FamilyName).ThenBy(m => m.GivenName))
-                    {
-                        if (!model.Members.ContainsKey(member.UserId))
+                    model.LineItems = JsonConvert.DeserializeObject<List<LineItem>>(content)
+                        .Select(i => new MyLineItem
                         {
-                            model.Members.Add(member.UserId, $"{member.FamilyName}, {member.GivenName}");
-                        }
-                    }
+                            AgsLineItem = i,
+                            Header = i.Label ?? $"Tag: {i.Tag}"
+                        })
+                        .ToList();
                 }
             }
             catch (Exception e)