From c81ea734214e03b72f2a180b91dce43c4c5dc506 Mon Sep 17 00:00:00 2001 From: Charles Wahome Date: Thu, 28 May 2020 15:57:19 +0300 Subject: [PATCH] Fix: lowercase locales (#551) * change share query location from preview * adds a redirecturi in lowercase when signing in * localise locale section --- src/app/services/graph-client/msal-service.ts | 5 +++-- src/app/views/common/share.ts | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/app/services/graph-client/msal-service.ts b/src/app/services/graph-client/msal-service.ts index c84efa08d..9ed6330cf 100644 --- a/src/app/services/graph-client/msal-service.ts +++ b/src/app/services/graph-client/msal-service.ts @@ -20,6 +20,7 @@ export async function logIn(sessionId = ''): Promise { const loginRequest: AuthenticationParameters = { scopes: defaultUserScopes, prompt: 'select_account', + redirectUri: window.location.href.toLowerCase(), extraQueryParameters: { mkt: geLocale } }; @@ -82,8 +83,8 @@ export function logOutPopUp() { // @ts-ignore msalApplication.authorityInstance.resolveEndpointsAsync().then(authority => { const urlNavigate = authority.EndSessionEndpoint - ? authority.EndSessionEndpoint - : `${msalApplication.authority}oauth2/v2.0/logout`; + ? authority.EndSessionEndpoint + : `${msalApplication.authority}oauth2/v2.0/logout`; (msalApplication as any).openPopup(urlNavigate, 'msal', 400, 600); }); } diff --git a/src/app/views/common/share.ts b/src/app/views/common/share.ts index 11d849438..ad674e52b 100644 --- a/src/app/views/common/share.ts +++ b/src/app/views/common/share.ts @@ -18,7 +18,7 @@ export const createShareLink = (sampleQuery: IQuery, authenticated?: boolean): s const url = new URL(sampleUrl); const graphUrl = url.origin; - const appUrl = 'https://developer.microsoft.com/' + geLocale + '/graph/graph-explorer/preview'; + const appUrl = 'https://developer.microsoft.com/' + geLocale.toLowerCase() + '/graph/graph-explorer'; /** * To ensure backward compatibility the version is removed from the pathname. * V3 expects the request query param to not have the version number.