Skip to content

Commit 7f69753

Browse files
committed
JDCMT-217 - fix error while loading task module for disconnected user
1 parent 61a85ce commit 7f69753

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/MicrosoftTeamsIntegration.Jira/Services/MessagingExtensionService.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -616,14 +616,14 @@ private FetchTaskResponseEnvelope BuildTaskModuleResponse(ITurnContext turnConte
616616

617617
if (fetchTaskCommand.CommandName.Equals(DialogMatchesAndCommands.CreateNewIssueDialogCommand, StringComparison.OrdinalIgnoreCase))
618618
{
619-
url = $"{_appSettings.BaseUrl}/#/issues/create;jiraUrl={Uri.EscapeDataString(jiraId)};application={application};returnIssueOnSubmit=false;source=bot;replyToActivityId={turnContext.Activity.ReplyToId}";
619+
url = $"{_appSettings.BaseUrl}/#/issues/create;jiraUrl={jiraId};application={application};returnIssueOnSubmit=false;source=bot;replyToActivityId={turnContext.Activity.ReplyToId}";
620620
taskModuleTitle = "Create an issue";
621621
}
622622

623623
if (fetchTaskCommand.CommandName.Equals(DialogMatchesAndCommands.CommentIssueTaskModuleCommand, StringComparison.OrdinalIgnoreCase))
624624
{
625-
string jiraUrl = user?.JiraInstanceUrl;
626-
url = $"{_appSettings.BaseUrl}/#/issues/commentIssue;jiraUrl={Uri.EscapeDataString(jiraUrl)};jiraId={Uri.EscapeDataString(jiraId)};issueId={fetchTaskCommand.IssueId};issueKey={fetchTaskCommand.IssueKey};application={application};returnIssueOnSubmit=false;source=bot";
625+
string jiraUrl = !string.IsNullOrEmpty(user?.JiraInstanceUrl) ? Uri.EscapeDataString(user.JiraInstanceUrl) : null;
626+
url = $"{_appSettings.BaseUrl}/#/issues/commentIssue;jiraUrl={jiraUrl};jiraId={jiraId};issueId={fetchTaskCommand.IssueId};issueKey={fetchTaskCommand.IssueKey};application={application};returnIssueOnSubmit=false;source=bot";
627627
taskModuleTitle = "Comment issue";
628628
taskModuleHeight = 250;
629629
}

src/MicrosoftTeamsIntegration.Jira/TypeConverters/JiraIssueToAdaptiveCardTypeConverter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ public AdaptiveCard Convert(BotAndMessagingExtensionJiraIssue model, AdaptiveCar
272272

273273
var commentIssueTaskModuleAction = new JiraBotTeamsDataWrapper
274274
{
275-
FetchTaskData = new FetchTaskBotCommand(DialogMatchesAndCommands.CommentIssueTaskModuleCommand, model.JiraIssue.Id, model.JiraIssue.Key),
275+
FetchTaskData = new FetchTaskBotCommand(DialogMatchesAndCommands.CommentIssueTaskModuleCommand, model.JiraIssue?.Id, model.JiraIssue?.Key),
276276
TeamsData = new TeamsData
277277
{
278278
Type = "task/fetch"

0 commit comments

Comments
 (0)