From a54df0c3cd37f79655a70d16a66a8a631d6e5304 Mon Sep 17 00:00:00 2001 From: Pranit Bauva Date: Fri, 4 Sep 2020 17:28:22 +0530 Subject: [PATCH] Login: Honour `root_url` for Forget Password related links (#27368) Closes #27226 --- .../core/components/ForgottenPassword/ForgottenPassword.tsx | 4 +++- public/app/core/components/Login/LoginPage.tsx | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/public/app/core/components/ForgottenPassword/ForgottenPassword.tsx b/public/app/core/components/ForgottenPassword/ForgottenPassword.tsx index 39069dd376d..51dce749063 100644 --- a/public/app/core/components/ForgottenPassword/ForgottenPassword.tsx +++ b/public/app/core/components/ForgottenPassword/ForgottenPassword.tsx @@ -4,6 +4,8 @@ import { getBackendSrv } from '@grafana/runtime'; import { css } from 'emotion'; import { GrafanaTheme } from '@grafana/data'; +import config from 'app/core/config'; + interface EmailDTO { userOrEmail: string; } @@ -53,7 +55,7 @@ export const ForgottenPassword: FC = () => { - + Back to login diff --git a/public/app/core/components/Login/LoginPage.tsx b/public/app/core/components/Login/LoginPage.tsx index f485ce79ee5..7ae220a4d46 100644 --- a/public/app/core/components/Login/LoginPage.tsx +++ b/public/app/core/components/Login/LoginPage.tsx @@ -12,6 +12,8 @@ import { Branding } from 'app/core/components/Branding/Branding'; import { HorizontalGroup, LinkButton } from '@grafana/ui'; import { LoginLayout, InnerBox } from './LoginLayout'; +import config from 'app/core/config'; + const forgottenPasswordStyles = css` padding: 0; margin-top: 4px; @@ -51,7 +53,7 @@ export const LoginPage: FC = () => { Forgot your password?