Deep link bug

README.md

@@ -1,19 +1,11 @@
-# msteams-sample-contoso-hr-talent-app
-This is a sample of the HR solution, please do not use it in a Production environment. 
-
-A Microsoft Teams app that will be used by the Human Resources department within their Microsoft Teams clients. The app will facilitate the department's hiring of new talent into the organization, provide immediate interview feedback, schedule interview loops, and improve the overall hiring process of new employees. Contoso HR Talent App will help you understand how to transform hiring and candidate management flow of new talent and make it more interactive and responsive for HR teams and interviewees.
-
-The lab file is attached, but it would require extra steps on your part to setup your own O365 Tenant and pre-create Teams, Channels, Personas. Please use it for your reference.
-
 # Microsoft Teams Talent Management Sample App in .NET/C#
 
-This app simulates connection to a recruiting and talent management system and allows users and teams to create, manage and search positions and candidates. The content is randomly generated to simulate what you can do with Teams. The full source code is provided, along with the app package and manifest that you can use to side load and test in your Teams environment.
+This app simulates connection to a recruiting and talent management system and allows users and teams to create, manage and search positions and candidates. The content is randomly generated to simulate what you can do with Teams. The full source code is provided, along with a lab guide that will walk you through the setup of this app, and how to surface it in Teams.
 
-## Prerequisites
-Please see the Teams Apps Talent Management Lab.pdf document for a detailed list of Pre-requisites.
+This is a sample of the HR solution, please do not use it in a Production environment. It is designed to demonstrate how third-party apps can be surfaced in teams using the various interfaces that exist within Teams as a Platform.
 
 ## How to use this lab
-Open the Teams Apps Talent Management Lab.pdf document, and start working through the guidance in this document. This guide will walk you through, step-by-step, with screenshots, the setup of the app (in Visual Studio, using NGROK as the tunnel) and the setup of the Teams app, which will introduce you to how the various interfaces in Teams work when surfacing a third-party app within Teams (Tabs, Bots, Messaging Extensions, Azure AD SSO, Proactive Messaging & Graph API).
+Open the [Teams Apps Talent Management Lab.pdf](/Teams%20Apps%20Talent%20Mangagement%20Lab.pdf) document, and start working through the guidance in this document. This guide will walk you through, step-by-step with screenshots, the setup of the app (in Visual Studio, using NGROK as the tunnel) and the setup of the Teams app, which will introduce you to how the various interfaces in Teams work when surfacing a third-party app within Teams (Tabs, Bots, Messaging Extensions, Azure AD SSO, Proactive Messaging & Graph API).
 
 # Contributing
 

postman/Graph API (Me-Teams).postman_collection (1).json → postman/Graph API (Me-Teams).postman_collection.json

@@ -75,7 +75,7 @@
 							}
 						],
 						"url": {
-							"raw": "https://graph.microsoft.com/v1.0/teams/f3e9518c-c11f-451a-b890-495d2476848b/channels",
+							"raw": "https://graph.microsoft.com/v1.0/teams/TEAMID/channels",
 							"protocol": "https",
 							"host": [
 								"graph",
@@ -85,7 +85,7 @@
 							"path": [
 								"v1.0",
 								"teams",
-								"f3e9518c-c11f-451a-b890-495d2476848b",
+								"TEAMID",
 								"channels"
 							]
 						}
@@ -113,7 +113,7 @@
 							"raw": "{\r\n  \"body\": {\r\n    \"content\": \"Hello World\"\r\n  }\r\n}"
 						},
 						"url": {
-							"raw": "https://graph.microsoft.com/v1.0/teams/12288a3d-8742-4ce1-93e4-03e35e5773fb/channels/19:[email protected]/messages",
+							"raw": "https://graph.microsoft.com/v1.0/teams/TEAMID/channels/CHANNELID/messages",
 							"protocol": "https",
 							"host": [
 								"graph",
@@ -123,9 +123,9 @@
 							"path": [
 								"v1.0",
 								"teams",
-								"12288a3d-8742-4ce1-93e4-03e35e5773fb",
+								"TEAMID",
 								"channels",
-								"19:[email protected]",
+								"CHANNELID",
 								"messages"
 							]
 						}
@@ -191,7 +191,7 @@
 							}
 						},
 						"url": {
-							"raw": "https://graph.microsoft.com/v1.0/teams/12288a3d-8742-4ce1-93e4-03e35e5773fb/channels/19:[email protected]/messages/1622105461963/replies",
+							"raw": "https://graph.microsoft.com/v1.0/teams/TEAMID/channels/CHANNELID/messages/THEADID/replies",
 							"protocol": "https",
 							"host": [
 								"graph",
@@ -201,11 +201,11 @@
 							"path": [
 								"v1.0",
 								"teams",
-								"12288a3d-8742-4ce1-93e4-03e35e5773fb",
+								"TEAMID",
 								"channels",
-								"19:[email protected]",
+								"CHANNELID",
 								"messages",
-								"1622105461963",
+								"THEADID",
 								"replies"
 							]
 						}
@@ -233,7 +233,7 @@
 							}
 						},
 						"url": {
-							"raw": "https://graph.microsoft.com/v1.0/teams/12288a3d-8742-4ce1-93e4-03e35e5773fb/channels/19:[email protected]/messages/1622105461963/replies",
+							"raw": "https://graph.microsoft.com/v1.0/teams/TEAMID/channels/CHANNELID/messages/THEADID/replies",
 							"protocol": "https",
 							"host": [
 								"graph",
@@ -243,11 +243,11 @@
 							"path": [
 								"v1.0",
 								"teams",
-								"12288a3d-8742-4ce1-93e4-03e35e5773fb",
+								"TEAMID",
 								"channels",
-								"19:[email protected]",
+								"CHANNELID",
 								"messages",
-								"1622105461963",
+								"THEADID",
 								"replies"
 							]
 						}
@@ -272,7 +272,7 @@
 						],
 						"body": {
 							"mode": "raw",
-							"raw": "{\r\n  \"chatType\": \"oneOnOne\",\r\n  \"members\": [\r\n    {\r\n      \"@odata.type\": \"#microsoft.graph.aadUserConversationMember\",\r\n      \"roles\": [\"owner\"],\r\n      \"[email protected]\": \"https://graph.microsoft.com/v1.0/users('5e9e185e-1a9a-4d1e-920b-2e8d51513ac9')\"\r\n    },\r\n    {\r\n      \"@odata.type\": \"#microsoft.graph.aadUserConversationMember\",\r\n      \"roles\": [\"owner\"],\r\n      \"[email protected]\": \"https://graph.microsoft.com/v1.0/users('c7a18f5a-1deb-4c82-9c76-a5322f0ceeff')\"\r\n    }\r\n  ]\r\n}"
+							"raw": "{\r\n  \"chatType\": \"oneOnOne\",\r\n  \"members\": [\r\n    {\r\n      \"@odata.type\": \"#microsoft.graph.aadUserConversationMember\",\r\n      \"roles\": [\"owner\"],\r\n      \"[email protected]\": \"https://graph.microsoft.com/v1.0/users('USEROID')\"\r\n    },\r\n    {\r\n      \"@odata.type\": \"#microsoft.graph.aadUserConversationMember\",\r\n      \"roles\": [\"owner\"],\r\n      \"[email protected]\": \"https://graph.microsoft.com/v1.0/users('USEROID')\"\r\n    }\r\n  ]\r\n}"
 						},
 						"url": {
 							"raw": "https://graph.microsoft.com/v1.0/chats",
@@ -311,7 +311,7 @@
 							"raw": "{\r\n  \"body\": {\r\n    \"content\": \"Hello World\"\r\n  }\r\n}"
 						},
 						"url": {
-							"raw": "https://graph.microsoft.com/v1.0/chats/19:5e9e185e-1a9a-4d1e-920b-2e8d51513ac9_c7a18f5a-1deb-4c82-9c76-a5322f0ceeff@unq.gbl.spaces/messages",
+							"raw": "https://graph.microsoft.com/v1.0/chats/CHATID/messages",
 							"protocol": "https",
 							"host": [
 								"graph",
@@ -321,7 +321,7 @@
 							"path": [
 								"v1.0",
 								"chats",
-								"19:5e9e185e-1a9a-4d1e-920b-2e8d51513ac9_c7a18f5a-1deb-4c82-9c76-a5322f0ceeff@unq.gbl.spaces",
+								"CHATID",
 								"messages"
 							]
 						}

src/Bot/TeamsTalentMgmtBot.cs

@@ -47,6 +47,18 @@ public TeamsTalentMgmtBot(
         protected override Task OnTeamsSigninVerifyStateAsync(ITurnContext<IInvokeActivity> turnContext, CancellationToken cancellationToken)
             => _invokeActivityHandler.HandleSigninVerifyStateAsync(turnContext, cancellationToken);
 
+        protected override async Task<TaskModuleResponse> OnTeamsTaskModuleFetchAsync(ITurnContext<IInvokeActivity> turnContext, TaskModuleRequest taskModuleRequest, CancellationToken cancellationToken)
+        {
+            return new TaskModuleResponse
+            {
+                Task = new TaskModuleContinueResponse
+                {
+                    Type = "continue",
+                    Value = await _invokeActivityHandler.HandleTaskModuleFetchAsync(taskModuleRequest, cancellationToken)
+                }
+            };
+        }
+
         protected override Task<MessagingExtensionResponse> OnTeamsMessagingExtensionQueryAsync(ITurnContext<IInvokeActivity> turnContext, MessagingExtensionQuery query, CancellationToken cancellationToken)
             => _invokeActivityHandler.HandleMessagingExtensionQueryAsync(turnContext, query, cancellationToken);
 

src/Services/Interfaces/IInvokeActivityHandler.cs

@@ -11,6 +11,8 @@ public interface IInvokeActivityHandler
     {
         Task<InvokeResponse> HandleSigninVerifyStateAsync(ITurnContext<IInvokeActivity> turnContext, CancellationToken cancellationToken);
 
+        Task<TaskModuleTaskInfo> HandleTaskModuleFetchAsync(TaskModuleRequest taskModuleRequest, CancellationToken cancellationToken);
+
         Task<MessagingExtensionResponse> HandleMessagingExtensionQueryAsync(
             ITurnContext turnContext,
             MessagingExtensionQuery query,

src/Services/InvokeActivityHandler.cs

@@ -89,6 +89,19 @@ public async Task<InvokeResponse> HandleSigninVerifyStateAsync(ITurnContext<IInv
             return new InvokeResponse { Status = (int)HttpStatusCode.OK };
         }
 
+        public async Task<TaskModuleTaskInfo> HandleTaskModuleFetchAsync(TaskModuleRequest taskModuleRequest, CancellationToken cancellationToken)
+        {
+            var candidate = await _candidateService.GetById((int)((dynamic)taskModuleRequest.Data).CandidateId, cancellationToken);
+
+            return new TaskModuleTaskInfo
+            {
+                Url = _appSettings.BaseUrl.TrimEnd('/') + $"/StaticViews/CandidateFeedback.html?candidateId={candidate.CandidateId}",
+                Title = "Feedback for " + candidate.Name,
+                Height = "large",
+                Width = "large"
+            };
+        }
+
         public async Task<MessagingExtensionResponse> HandleMessagingExtensionQueryAsync(
             ITurnContext turnContext,
             MessagingExtensionQuery query,

src/Services/Templates/CandidatesTemplate.cs

@@ -183,18 +183,17 @@ private static Attachment BuildSingleCandidateCardAsAdaptive(CandidateTemplateMo
 
             if (candidate.Comments.Any() || candidate.Interviews.Any())
             {
-                var contentUrl = data.AppSettings.BaseUrl + $"StaticViews/CandidateFeedback.html?candidateId={candidate.CandidateId}";
-                card.Actions.Add(new AdaptiveOpenUrlAction
+                card.Actions.Add(new AdaptiveSubmitAction
                 {
                     Title = "Open candidate feedback",
-                    Url = new Uri(string.Format(
-                        CommonConstants.TaskModuleUrlFormat,
-                        data.AppSettings.TeamsAppId,
-                        Uri.EscapeDataString(contentUrl),
-                        Uri.EscapeDataString("Feedback for " + candidate.Name),
-                        data.AppSettings.MicrosoftAppId,
-                        "large",
-                        "large"))
+                    Data = new
+                    {
+                        CandidateId = candidate.CandidateId,
+                        msteams = new
+                        {
+                            type = "task/fetch"
+                        }
+                    }
                 });
             }
 

src/StaticViews/proactivemessaging.html

@@ -3,6 +3,7 @@
 <head>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.min.js" integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8=" crossorigin="anonymous"></script>
     <script src="/config.js"></script>
+    <script src="https://unpkg.com/@microsoft/mgt/dist/bundle/mgt-loader.js"></script>
     <meta charset="utf-8" />
     <title>Proactive Messaging Form</title>
     <script type="text/javascript">
@@ -37,14 +38,14 @@
             if (data.ok) {
                 console.log("HTTP Status: " + data.status);
                 console.log(data);
-                if (data.status >= 200 && data.status <300 ) {
+                if (data.status >= 200 && data.status < 300) {
                     $("#successfulRequest > span").html(data.status);
                     $("#successfulRequest").show();
                 }
-                
+
             } else {
                 console.error("HTTP-Error: " + data.status);
-                
+
                 if (data.status == '403') {
                     $("#consentRequired").show();
                 }
@@ -76,7 +77,7 @@
         //logic to capture succesful or unsuccesful consent after redirect back from Azure AD
         $(() => {
 
-            
+
             var urlParams = new URLSearchParams(window.location.search);
             var adminConsent = urlParams.get('admin_consent');
             if (adminConsent == 'True') {
@@ -94,7 +95,14 @@ <h1>
             Please submit the UPN and TenantID of the user into the form, to either Install the App, using Graph API or Send the User a proactive message, via the Bot.
         </h1>
     </div>
-    <form id="form1" >
+    <!--
+        Graph Toolkit stuff (TODO: Login and click the user)
+     <mgt-msal2-provider client-id="6a56bee2-c36e-4838-a0c2-7cf53be8bcd0"></mgt-msal2-provider>
+     <mgt-login></mgt-login>
+     <mgt-people-picker selection-mode='single'></mgt-people-picker>
+        -->
+
+    <form id="form1">
         <label>UPN</label> <br>
         <input id="upn" type="text" size="40" placeholder="[email protected]"> <br> <br>
         <label>TenantId</label> <br>