From 9f3e84b16cb6f83c5e69be94ade2affb1de3b4c0 Mon Sep 17 00:00:00 2001
From: Tharun Rajendran <rajendrantharun@live.com>
Date: Wed, 30 Jun 2021 17:26:09 +0530
Subject: [PATCH] Routes: Redirect signup user and verify email if settings is
 disabled (#36303)

Fixes #31635
---
 .../app/core/components/Signup/VerifyEmailPage.tsx  |  6 ------
 public/app/routes/routes.tsx                        | 13 ++++++++-----
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/public/app/core/components/Signup/VerifyEmailPage.tsx b/public/app/core/components/Signup/VerifyEmailPage.tsx
index e1c024ea16d..3583fca4924 100644
--- a/public/app/core/components/Signup/VerifyEmailPage.tsx
+++ b/public/app/core/components/Signup/VerifyEmailPage.tsx
@@ -2,14 +2,8 @@ import React, { FC } from 'react';
 
 import { LoginLayout, InnerBox } from '../Login/LoginLayout';
 import { VerifyEmail } from './VerifyEmail';
-import { getConfig } from 'app/core/config';
 
 export const VerifyEmailPage: FC = () => {
-  if (!getConfig().verifyEmailEnabled) {
-    window.location.href = getConfig().appSubUrl + '/signup';
-    return <></>;
-  }
-
   return (
     <LoginLayout>
       <InnerBox>
diff --git a/public/app/routes/routes.tsx b/public/app/routes/routes.tsx
index 9fe45402569..887716d4be0 100644
--- a/public/app/routes/routes.tsx
+++ b/public/app/routes/routes.tsx
@@ -6,7 +6,6 @@ import config from 'app/core/config';
 import { DashboardRoutes } from 'app/types';
 import { SafeDynamicImport } from '../core/components/DynamicImports/SafeDynamicImport';
 import { RouteDescriptor } from '../core/navigation/types';
-import { SignupPage } from 'app/core/components/Signup/SignupPage';
 import { Redirect } from 'react-router-dom';
 import ErrorPage from 'app/core/components/ErrorPage/ErrorPage';
 
@@ -280,14 +279,18 @@ export function getAppRoutes(): RouteDescriptor[] {
     },
     {
       path: '/verify',
-      component: SafeDynamicImport(
-        () => import(/* webpackChunkName "VerifyEmailPage"*/ 'app/core/components/Signup/VerifyEmailPage')
-      ),
+      component: !config.verifyEmailEnabled
+        ? () => <Redirect to="/signup" />
+        : SafeDynamicImport(
+            () => import(/* webpackChunkName "VerifyEmailPage"*/ 'app/core/components/Signup/VerifyEmailPage')
+          ),
       pageClass: 'login-page sidemenu-hidden',
     },
     {
       path: '/signup',
-      component: SignupPage,
+      component: config.disableUserSignUp
+        ? () => <Redirect to="/login" />
+        : SafeDynamicImport(() => import(/* webpackChunkName "SignupPage"*/ 'app/core/components/Signup/SignupPage')),
       pageClass: 'sidemenu-hidden login-page',
     },
     {