From bf3e46a784339d68d6baea24076d2899964f2dab Mon Sep 17 00:00:00 2001 From: Chase Tucker Date: Wed, 2 Apr 2025 11:07:09 -0700 Subject: [PATCH] fix redirect links --- .../Controllers/ChangeControlController.cs | 4 ++-- Fab2ApprovalSystem/Controllers/MRBController.cs | 4 ++-- Fab2ApprovalSystem/Views/Home/_HomeLayout.cshtml | 12 ++++++------ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Fab2ApprovalSystem/Controllers/ChangeControlController.cs b/Fab2ApprovalSystem/Controllers/ChangeControlController.cs index ddd8aea..c6efb7a 100644 --- a/Fab2ApprovalSystem/Controllers/ChangeControlController.cs +++ b/Fab2ApprovalSystem/Controllers/ChangeControlController.cs @@ -52,7 +52,7 @@ public class ChangeControlController : Controller { string encodedJwt = System.Net.WebUtility.UrlEncode(jwt); string refreshToken = Session["RefreshToken"].ToString(); string encodedRefreshToken = System.Net.WebUtility.UrlEncode(refreshToken); - string mrbUrl = $"{GlobalVars.AppSettings.WasmClientUrl}/redirect?jwt={encodedJwt}&refreshToken={encodedRefreshToken}&redirectPath=/pcrb/{issueID}"; + string mrbUrl = $"{GlobalVars.AppSettings.WasmClientUrl}/redirect?jwt={encodedJwt}&refreshToken={encodedRefreshToken}&redirectPath=pcrb/{issueID}"; return Redirect(mrbUrl); } @@ -62,7 +62,7 @@ public class ChangeControlController : Controller { string encodedJwt = System.Net.WebUtility.UrlEncode(jwt); string refreshToken = Session["RefreshToken"].ToString(); string encodedRefreshToken = System.Net.WebUtility.UrlEncode(refreshToken); - string mrbUrl = $"{GlobalVars.AppSettings.WasmClientUrl}/redirect?jwt={encodedJwt}&refreshToken={encodedRefreshToken}&redirectPath=/pcrb/{issueID}"; + string mrbUrl = $"{GlobalVars.AppSettings.WasmClientUrl}/redirect?jwt={encodedJwt}&refreshToken={encodedRefreshToken}&redirectPath=pcrb/{issueID}"; return Redirect(mrbUrl); } diff --git a/Fab2ApprovalSystem/Controllers/MRBController.cs b/Fab2ApprovalSystem/Controllers/MRBController.cs index 4c28292..d954e41 100644 --- a/Fab2ApprovalSystem/Controllers/MRBController.cs +++ b/Fab2ApprovalSystem/Controllers/MRBController.cs @@ -79,7 +79,7 @@ public class MRBController : Controller { string encodedJwt = System.Net.WebUtility.UrlEncode(jwt); string refreshToken = Session["RefreshToken"].ToString(); string encodedRefreshToken = System.Net.WebUtility.UrlEncode(refreshToken); - string mrbUrl = $"{GlobalVars.AppSettings.WasmClientUrl}/redirect?jwt={encodedJwt}&refreshToken={encodedRefreshToken}&redirectPath=/mrb/{issueID}"; + string mrbUrl = $"{GlobalVars.AppSettings.WasmClientUrl}/redirect?jwt={encodedJwt}&refreshToken={encodedRefreshToken}&redirectPath=mrb/{issueID}"; return Redirect(mrbUrl); } @@ -102,7 +102,7 @@ public class MRBController : Controller { string encodedJwt = System.Net.WebUtility.UrlEncode(jwt); string refreshToken = Session["RefreshToken"].ToString(); string encodedRefreshToken = System.Net.WebUtility.UrlEncode(refreshToken); - string mrbUrl = $"{GlobalVars.AppSettings.WasmClientUrl}/redirect?jwt={encodedJwt}&refreshToken={encodedRefreshToken}&redirectPath=/mrb/{issueID}"; + string mrbUrl = $"{GlobalVars.AppSettings.WasmClientUrl}/redirect?jwt={encodedJwt}&refreshToken={encodedRefreshToken}&redirectPath=mrb/{issueID}"; return Redirect(mrbUrl); } diff --git a/Fab2ApprovalSystem/Views/Home/_HomeLayout.cshtml b/Fab2ApprovalSystem/Views/Home/_HomeLayout.cshtml index cee1856..0d54966 100644 --- a/Fab2ApprovalSystem/Views/Home/_HomeLayout.cshtml +++ b/Fab2ApprovalSystem/Views/Home/_HomeLayout.cshtml @@ -90,16 +90,16 @@ string encodedRefreshToken = System.Net.WebUtility.UrlEncode(refreshToken); string wasmClientUrl = Environment.GetEnvironmentVariable("FabApprovalWasmClientUrl") ?? "https://localhost:7255"; - string mrbUrl = wasmClientUrl + "/redirect?jwt=" + encodedJwt + "&refreshToken=" + encodedRefreshToken + "&redirectPath=/mrb/new"; + string mrbUrl = wasmClientUrl + "/redirect?jwt=" + encodedJwt + "&refreshToken=" + encodedRefreshToken + "&redirectPath=mrb/new";
  • Create MRB
    • - string pcrbUrl = wasmClientUrl + "/redirect?jwt=" + encodedJwt + "&refreshToken=" + encodedRefreshToken + "&redirectPath=/pcrb/new"; + string pcrbUrl = wasmClientUrl + "/redirect?jwt=" + encodedJwt + "&refreshToken=" + encodedRefreshToken + "&redirectPath=pcrb/new";
  • Create PCRB
    • } else { string wasmClientUrl = Environment.GetEnvironmentVariable("FabApprovalWasmClientUrl") ?? "https://localhost:7255"; - string mrbUrl = wasmClientUrl + "/redirect?redirectPath=/mrb/new"; + string mrbUrl = wasmClientUrl + "/redirect?redirectPath=mrb/new";
  • Create MRB
    • - string pcrbUrl = wasmClientUrl + "/redirect?redirectPath=/pcrb/new"; + string pcrbUrl = wasmClientUrl + "/redirect?redirectPath=pcrb/new";
  • Create PCRB
    • } @*
  • Create Special Work Request
    • *@ @@ -150,9 +150,9 @@ string encodedRefreshToken = System.Net.WebUtility.UrlEncode(refreshToken); string wasmClientUrl = Environment.GetEnvironmentVariable("FabApprovalWasmClientUrl") ?? "https://localhost:7255"; - string mrbUrl = wasmClientUrl + "/redirect?jwt=" + encodedJwt + "&refreshToken=" + encodedRefreshToken + "&redirectPath=/mrb/all"; + string mrbUrl = wasmClientUrl + "/redirect?jwt=" + encodedJwt + "&refreshToken=" + encodedRefreshToken + "&redirectPath=mrb/all"; menu.Add().Text("MRB").Url(mrbUrl); - string pcrbUrl = wasmClientUrl + "/redirect?jwt=" + encodedJwt + "&refreshToken=" + encodedRefreshToken + "&redirectPath=/pcrb/all"; + string pcrbUrl = wasmClientUrl + "/redirect?jwt=" + encodedJwt + "&refreshToken=" + encodedRefreshToken + "&redirectPath=pcrb/all"; menu.Add().Text("PCRB").Url(pcrbUrl); //menu.Add().Text("Special Work Requests").Action("SpecialWorkRequestList", "Home"); //menu.Add().Text("PCRB").Action("ChangeControlList", "Home");