Skip to content

TD-5408 Passes email and admin ID as URL params to Tableau #3152

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 11, 2025
Merged

TD-5408 Passes email and admin ID as URL params to Tableau #3152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion ...ontrollers/TrackingSystem/Centre/SelfAssessmentReports/SelfAssessmentReportsController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,10 @@ public IActionResult DownloadSelfAssessmentReport(int selfAssessmentId)
public IActionResult TableauCompetencyDashboard()
{
var userEmail = User.GetUserPrimaryEmail();
var jwt = tableauConnectionHelper.GetTableauJwt(userEmail);
var adminId = User.GetAdminId();
var jwt = tableauConnectionHelper.GetTableauJwt();
ViewBag.Email = userEmail;
ViewBag.AdminId = adminId;
ViewBag.SiteName = tableauSiteName;
ViewBag.TableauServerUrl = tableauUrl;
ViewBag.WorkbookName = workbookName;
Expand Down
7 changes: 3 additions & 4 deletions DigitalLearningSolutions.Web/Helpers/ExternalApis/TableauConnectionHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

public interface ITableauConnectionHelperService
{
string GetTableauJwt(string email);
string GetTableauJwt();
}
public class TableauConnectionHelper : ITableauConnectionHelperService
{
Expand All @@ -24,7 +24,7 @@ public TableauConnectionHelper(IConfiguration config)
connectedAppSecretKey = config.GetTableauClientSecret();
user = config.GetTableauUser();
}
public string GetTableauJwt(string email)
public string GetTableauJwt()
{
var key = Encoding.UTF8.GetBytes(connectedAppSecretKey);
var signingCredentials = new SigningCredentials(new SymmetricSecurityKey(key), SecurityAlgorithms.HmacSha256);
Expand All @@ -41,8 +41,7 @@ public string GetTableauJwt(string email)
{ "aud", "tableau" },
{ "exp", new DateTimeOffset(DateTime.UtcNow.AddMinutes(5)).ToUnixTimeSeconds() },
{ "sub", user },
{ "scp", new[] { "tableau:views:embed" } },
{ "ExernalUserEmail", new [] { email } }
{ "scp", new[] { "tableau:views:embed" } }
};
var token = new JwtSecurityToken(header, payload);
var tokenHandler = new JwtSecurityTokenHandler();
Expand Down
4 changes: 4 additions & 0 deletions ...s.Web/Views/TrackingSystem/Centre/SelfAssessmentReports/TableauCompetencyDashboard.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
var viewName = ViewBag.ViewName;
var jwtToken = ViewBag.JwtToken;
var siteName = ViewBag.SiteName;
var aid = ViewBag.AdminId;
var email = ViewBag.Email;
var srcUrl = $"{tableauServerUrl}/t/{siteName}/views/{workbookName}/{viewName}";
ViewData["Title"] = "Supervised self assessments dashboard";
}
Expand All @@ -21,6 +23,8 @@
<tableau-viz id='tableau-viz'
src='@srcUrl' token='@jwtToken' toolbar='bottom'>
If the dashboard doesn't appear after a few seconds, <a href="#">reload the page</a>
<viz-parameter name="aid" value="@aid"></viz-parameter>
<viz-parameter name="email" value="@email"></viz-parameter>
</tableau-viz>
@section scripts {
@* We are not using Yarn/npm for the Tableau JS becaue of errors during installation relating to a missing dependency *@
Expand Down
Loading