From 1d675d3c9d1e0237e67ecb7b9c5008f00a9cf152 Mon Sep 17 00:00:00 2001
From: thecodrr <thecodrr@protonmail.com>
Date: Sun, 3 Jan 2021 11:52:53 +0500
Subject: [PATCH] fix: secure protected routes

---
 apps/web/src/app.js                   |  4 ++--
 apps/web/src/navigation/rootroutes.js |  2 +-
 apps/web/src/views/email-confirmed.js | 13 ++++++++++---
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/apps/web/src/app.js b/apps/web/src/app.js
index 189c0d743..bd20fea75 100644
--- a/apps/web/src/app.js
+++ b/apps/web/src/app.js
@@ -170,8 +170,8 @@ function EditorSwitch() {
 function Root() {
   const path = getCurrentPath();
   switch (path) {
-    case "/account/confirmed":
-      return rootroutes["/account/confirmed"]();
+    case "/account/verified":
+      return rootroutes["/account/verified"]();
     case "/account/recovery":
       return rootroutes["/account/recovery"]();
     default:
diff --git a/apps/web/src/navigation/rootroutes.js b/apps/web/src/navigation/rootroutes.js
index 8e121eace..4e57136db 100644
--- a/apps/web/src/navigation/rootroutes.js
+++ b/apps/web/src/navigation/rootroutes.js
@@ -4,7 +4,7 @@ import EmailConfirmed from "../views/emailconfirmed";
 
 const rootroutes = {
   "/account/recovery": () => <AccountRecovery />,
-  "/account/confirmed": () => <EmailConfirmed />,
+  "/account/verified": () => <EmailConfirmed />,
 };
 
 export default rootroutes;
diff --git a/apps/web/src/views/email-confirmed.js b/apps/web/src/views/email-confirmed.js
index fcf404b5e..1384be597 100644
--- a/apps/web/src/views/email-confirmed.js
+++ b/apps/web/src/views/email-confirmed.js
@@ -1,9 +1,16 @@
-import React from "react";
+import React, { useEffect } from "react";
 import { Button, Flex, Text } from "rebass";
 import ThemeProvider from "../components/theme-provider";
 import * as Icon from "../components/icons";
+import { useQueryParams } from "../navigation";
+
+function EmailConfirmed() {
+  const [{ userId }] = useQueryParams();
+
+  useEffect(() => {
+    if (!userId) window.location.href = "/";
+  }, [userId]);
 
-function EmailConfirmed(props) {
   return (
     <ThemeProvider>
       <Flex
@@ -31,7 +38,7 @@ function EmailConfirmed(props) {
             variant="secondary"
             mt={1}
             onClick={() => {
-              window.location.href = "https://notesnook.com/";
+              window.location.href = "/";
             }}
           >
             Return to Notesnook