From ab32401d5f85bce4a56d77b795982ba149c96dec Mon Sep 17 00:00:00 2001
From: Vishwajeet <chauhan.vishwajeet24@gmail.com>
Date: Thu, 20 Oct 2022 12:53:16 +0530
Subject: [PATCH 1/4] HLM-728 Global interceptor and toast

---
 tenant-portal/package-lock.json | 34 +++++++++++++++++++++++++++++++++
 tenant-portal/package.json      |  1 +
 tenant-portal/src/App.js        | 18 +++++++++++++++++
 3 files changed, 53 insertions(+)

diff --git a/tenant-portal/package-lock.json b/tenant-portal/package-lock.json
index 957adf4be..1a9db9111 100644
--- a/tenant-portal/package-lock.json
+++ b/tenant-portal/package-lock.json
@@ -19,6 +19,7 @@
         "react-dom": "^18.2.0",
         "react-router-dom": "^6.3.0",
         "react-scripts": "4.0.1",
+        "react-toastify": "^8.0.0",
         "web-vitals": "^2.1.4"
       }
     },
@@ -6148,6 +6149,14 @@
         "node": ">=6"
       }
     },
+    "node_modules/clsx": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.2.1.tgz",
+      "integrity": "sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/co": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
@@ -16750,6 +16759,18 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/react-toastify": {
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/react-toastify/-/react-toastify-8.2.0.tgz",
+      "integrity": "sha512-Pg2Ju7NngAamarFvLwqrFomJ57u/Ay6i6zfLurt/qPynWkAkOthu6vxfqYpJCyNhHRhR4hu7+bySSeWWJu6PAg==",
+      "dependencies": {
+        "clsx": "^1.1.1"
+      },
+      "peerDependencies": {
+        "react": ">=16",
+        "react-dom": ">=16"
+      }
+    },
     "node_modules/react-transition-group": {
       "version": "4.4.5",
       "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.5.tgz",
@@ -26438,6 +26459,11 @@
         "shallow-clone": "^3.0.0"
       }
     },
+    "clsx": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.2.1.tgz",
+      "integrity": "sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg=="
+    },
     "co": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
@@ -34533,6 +34559,14 @@
         }
       }
     },
+    "react-toastify": {
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/react-toastify/-/react-toastify-8.2.0.tgz",
+      "integrity": "sha512-Pg2Ju7NngAamarFvLwqrFomJ57u/Ay6i6zfLurt/qPynWkAkOthu6vxfqYpJCyNhHRhR4hu7+bySSeWWJu6PAg==",
+      "requires": {
+        "clsx": "^1.1.1"
+      }
+    },
     "react-transition-group": {
       "version": "4.4.5",
       "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.5.tgz",
diff --git a/tenant-portal/package.json b/tenant-portal/package.json
index 78a028ca6..e39f8d466 100644
--- a/tenant-portal/package.json
+++ b/tenant-portal/package.json
@@ -16,6 +16,7 @@
     "react-dom": "^18.2.0",
     "react-router-dom": "^6.3.0",
     "react-scripts": "4.0.1",
+    "react-toastify": "^8.0.0",
     "web-vitals": "^2.1.4"
   },
   "scripts": {
diff --git a/tenant-portal/src/App.js b/tenant-portal/src/App.js
index bb564fc82..56da4fc25 100644
--- a/tenant-portal/src/App.js
+++ b/tenant-portal/src/App.js
@@ -7,6 +7,23 @@ import { PrivateRoute } from "./utils/PrivateRoute";
 import CreateSchema from "./components/CreateSchema/CreateSchema";
 import config from "./config.json"
 import Footer from "./components/Footer/Footer";
+import { ToastContainer, toast } from 'react-toastify';
+import 'react-toastify/dist/ReactToastify.css';
+import axios from 'axios';
+
+axios.interceptors.response.use(
+  response => response,
+  error => {
+    if (error.response.status === 401) {
+      toast.error("Incorrect User name/Password");
+    }
+    else if (error.response.status === 403) {
+      toast.error("Error 403");
+    }
+    else if(error.response){
+      toast.error("Some error occured.");
+    }
+  });
 
 function App() {
   const { initialized, keycloak } = useKeycloak();
@@ -32,6 +49,7 @@ function App() {
         </Routes>
       </Router>
       <Footer/>
+      <ToastContainer/>
     </div>
   );
 }

From 5688d4d2575e3b14bd03849cdfdc925c2225b713 Mon Sep 17 00:00:00 2001
From: Vishwajeet <chauhan.vishwajeet24@gmail.com>
Date: Wed, 26 Oct 2022 22:52:40 +0530
Subject: [PATCH 2/4] HLM-728 Global interceptor and toast

---
 tenant-portal/package-lock.json              | 34 --------------------
 tenant-portal/package.json                   |  1 -
 tenant-portal/src/App.js                     | 13 ++++----
 tenant-portal/src/components/Toast/Toast.css | 19 +++++++++++
 tenant-portal/src/components/Toast/Toast.js  | 24 ++++++++++++++
 tenant-portal/src/index.js                   |  2 +-
 tenant-portal/src/utils/keycloak.js          |  2 +-
 7 files changed, 52 insertions(+), 43 deletions(-)
 create mode 100644 tenant-portal/src/components/Toast/Toast.css
 create mode 100644 tenant-portal/src/components/Toast/Toast.js

diff --git a/tenant-portal/package-lock.json b/tenant-portal/package-lock.json
index 1a9db9111..957adf4be 100644
--- a/tenant-portal/package-lock.json
+++ b/tenant-portal/package-lock.json
@@ -19,7 +19,6 @@
         "react-dom": "^18.2.0",
         "react-router-dom": "^6.3.0",
         "react-scripts": "4.0.1",
-        "react-toastify": "^8.0.0",
         "web-vitals": "^2.1.4"
       }
     },
@@ -6149,14 +6148,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/clsx": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.2.1.tgz",
-      "integrity": "sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/co": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
@@ -16759,18 +16750,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/react-toastify": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/react-toastify/-/react-toastify-8.2.0.tgz",
-      "integrity": "sha512-Pg2Ju7NngAamarFvLwqrFomJ57u/Ay6i6zfLurt/qPynWkAkOthu6vxfqYpJCyNhHRhR4hu7+bySSeWWJu6PAg==",
-      "dependencies": {
-        "clsx": "^1.1.1"
-      },
-      "peerDependencies": {
-        "react": ">=16",
-        "react-dom": ">=16"
-      }
-    },
     "node_modules/react-transition-group": {
       "version": "4.4.5",
       "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.5.tgz",
@@ -26459,11 +26438,6 @@
         "shallow-clone": "^3.0.0"
       }
     },
-    "clsx": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.2.1.tgz",
-      "integrity": "sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg=="
-    },
     "co": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
@@ -34559,14 +34533,6 @@
         }
       }
     },
-    "react-toastify": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/react-toastify/-/react-toastify-8.2.0.tgz",
-      "integrity": "sha512-Pg2Ju7NngAamarFvLwqrFomJ57u/Ay6i6zfLurt/qPynWkAkOthu6vxfqYpJCyNhHRhR4hu7+bySSeWWJu6PAg==",
-      "requires": {
-        "clsx": "^1.1.1"
-      }
-    },
     "react-transition-group": {
       "version": "4.4.5",
       "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.5.tgz",
diff --git a/tenant-portal/package.json b/tenant-portal/package.json
index e39f8d466..78a028ca6 100644
--- a/tenant-portal/package.json
+++ b/tenant-portal/package.json
@@ -16,7 +16,6 @@
     "react-dom": "^18.2.0",
     "react-router-dom": "^6.3.0",
     "react-scripts": "4.0.1",
-    "react-toastify": "^8.0.0",
     "web-vitals": "^2.1.4"
   },
   "scripts": {
diff --git a/tenant-portal/src/App.js b/tenant-portal/src/App.js
index 56da4fc25..edb6ad421 100644
--- a/tenant-portal/src/App.js
+++ b/tenant-portal/src/App.js
@@ -7,21 +7,22 @@ import { PrivateRoute } from "./utils/PrivateRoute";
 import CreateSchema from "./components/CreateSchema/CreateSchema";
 import config from "./config.json"
 import Footer from "./components/Footer/Footer";
-import { ToastContainer, toast } from 'react-toastify';
-import 'react-toastify/dist/ReactToastify.css';
+import ToastComponent from './components/Toast/Toast';
 import axios from 'axios';
 
 axios.interceptors.response.use(
   response => response,
   error => {
     if (error.response.status === 401) {
-      toast.error("Incorrect User name/Password");
+      <ToastComponent header="Authentication error" toastBody="Incorrect User name/Password" />  
+     
     }
     else if (error.response.status === 403) {
-      toast.error("Error 403");
+      <ToastComponent header="Unauthorized access" toastBody="You are not authorized to view this resource" />
+      
     }
     else if(error.response){
-      toast.error("Some error occured.");
+      <ToastComponent header="Error" toastBody={error.response.data} /> 
     }
   });
 
@@ -49,7 +50,7 @@ function App() {
         </Routes>
       </Router>
       <Footer/>
-      <ToastContainer/>
+      <ToastComponent/>
     </div>
   );
 }
diff --git a/tenant-portal/src/components/Toast/Toast.css b/tenant-portal/src/components/Toast/Toast.css
new file mode 100644
index 000000000..96e66cd9f
--- /dev/null
+++ b/tenant-portal/src/components/Toast/Toast.css
@@ -0,0 +1,19 @@
+.toast-container{
+    z-index: 10;
+    opacity: 1;
+    background-color: #4E4E4E;
+    margin-right: 3.5rem;
+    width: 100%;
+    position: absolute;
+     bottom: 0;
+     right: 0;
+     color: #FFFFFF;
+     box-shadow: 0px 6px 20px #C1CFD933;
+     border-radius: 5px;
+}
+
+.toast-header{
+    background-color: #4E4E4E;
+    color: #FFFFFF;
+    border: 1px solid #717171;
+}
diff --git a/tenant-portal/src/components/Toast/Toast.js b/tenant-portal/src/components/Toast/Toast.js
new file mode 100644
index 000000000..cf1563b1f
--- /dev/null
+++ b/tenant-portal/src/components/Toast/Toast.js
@@ -0,0 +1,24 @@
+import React,{ useState } from 'react';
+import { Toast } from 'react-bootstrap';
+import './Toast.css';
+
+function ToastComponent({
+    header,
+    toastBody
+}) {
+    const [showToast, setShowToast] = useState(true);
+    const toggleShow = () => setShowToast(!showToast);
+
+    return (
+        <Toast className="toast-container" show={showToast} onClose={toggleShow} >
+        <Toast.Header className="toast-header">
+            <strong className="mr-auto">{header} </strong>
+        </Toast.Header>
+        <Toast.Body className="toast-body">
+            {toastBody}
+        </Toast.Body>
+        </Toast>
+    );
+}
+
+export default ToastComponent;
\ No newline at end of file
diff --git a/tenant-portal/src/index.js b/tenant-portal/src/index.js
index 458a2649e..865cdbb13 100644
--- a/tenant-portal/src/index.js
+++ b/tenant-portal/src/index.js
@@ -17,7 +17,7 @@ root.render(
               <App />
           </Suspense>
       </ReactKeycloakProvider>
-  </React.StrictMode>
+   </React.StrictMode>
 );
 
 // If you want to start measuring performance in your app, pass a function
diff --git a/tenant-portal/src/utils/keycloak.js b/tenant-portal/src/utils/keycloak.js
index 86dd48fdf..dedbc437c 100644
--- a/tenant-portal/src/utils/keycloak.js
+++ b/tenant-portal/src/utils/keycloak.js
@@ -1,5 +1,5 @@
 import Keycloak from 'keycloak-js';
 
-const keycloak = new Keycloak('/tenant-portal/keycloak.json');
+const keycloak = new Keycloak('/keycloak.json');
 
 export default keycloak

From fa2c4ff6047289650a0c4a0c52c3953a35086395 Mon Sep 17 00:00:00 2001
From: vishwajeet-eGov <95073959+vishwajeet-eGov@users.noreply.github.com>
Date: Thu, 27 Oct 2022 12:11:49 +0530
Subject: [PATCH 3/4] Update App.js

Redirect to login on 401
---
 tenant-portal/src/App.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tenant-portal/src/App.js b/tenant-portal/src/App.js
index 6aa08d350..5bbaf282d 100644
--- a/tenant-portal/src/App.js
+++ b/tenant-portal/src/App.js
@@ -1,5 +1,5 @@
 import "./App.css";
-import { BrowserRouter as Router, Route, Routes } from "react-router-dom";
+import { BrowserRouter as Router, Route, Routes , Navigate } from "react-router-dom";
 import { useKeycloak } from "@react-keycloak/web";
 import Login from "./components/Login";
 import Home from "./components/Home/Home";
@@ -15,7 +15,7 @@ axios.interceptors.response.use(
   response => response,
   error => {
     if (error.response.status === 401) {
-      <ToastComponent header="Authentication error" toastBody="Incorrect User name/Password" />  
+      <Navigate to= {config.urlPath + "/login"} />  
      
     }
     else if (error.response.status === 403) {

From f21aba4e6720cbfb190cb8da28ea892404cf2e25 Mon Sep 17 00:00:00 2001
From: vishwajeet-eGov <95073959+vishwajeet-eGov@users.noreply.github.com>
Date: Sun, 30 Oct 2022 20:56:54 +0530
Subject: [PATCH 4/4] Update App.js

---
 tenant-portal/src/App.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tenant-portal/src/App.js b/tenant-portal/src/App.js
index 5bbaf282d..24f76f07c 100644
--- a/tenant-portal/src/App.js
+++ b/tenant-portal/src/App.js
@@ -11,11 +11,12 @@ import Footer from "./components/Footer/Footer";
 import ToastComponent from './components/Toast/Toast';
 import axios from 'axios';
 
+const {keycloak} = useKeycloak();
 axios.interceptors.response.use(
   response => response,
   error => {
     if (error.response.status === 401) {
-      <Navigate to= {config.urlPath + "/login"} />  
+      keycloak.logout() 
      
     }
     else if (error.response.status === 403) {