Get server props error handling, add logs (omnistrate-oss#201)

Co-authored-by: Prathipati Nithish <[email protected]>
FalkorDB · Jun 14, 2024 · 6a265fa · 6a265fa
1 parent ea8bbb7
commit 6a265fa
Show file tree

Hide file tree

Showing 14 changed files with 107 additions and 47 deletions.
diff --git a/pages/billing.js b/pages/billing.js
@@ -5,12 +5,18 @@ import DashboardLayout from "src/components/DashboardLayout/DashboardLayout";
 import NoLogoImage from "public/assets/images/logos/no-logo.png";
 
 export const getServerSideProps = async () => {
-  const response = await getProviderOrgDetails();
+  let orgName = "";
+  let orgLogoURL = "";
+  try {
+    const response = await getProviderOrgDetails();
+    orgName = response.data.orgName;
+    orgLogoURL = response.data.orgLogoURL;
+  } catch (err) {}
 
   return {
     props: {
-      orgName: response.data.orgName,
-      orgLogoURL: response.data.orgLogoURL,
+      orgName: orgName,
+      orgLogoURL: orgLogoURL,
     },
   };
 };

diff --git a/pages/change-password.js b/pages/change-password.js
@@ -2,12 +2,18 @@ import ChangePasswordPage from "src/features/ChangePassword/ChangePasswordPage";
 import { getProviderOrgDetails } from "src/server/api/customer-user";
 
 export const getServerSideProps = async () => {
-  const response = await getProviderOrgDetails();
+  let orgName = "";
+  let orgLogoURL = "";
+  try {
+    const response = await getProviderOrgDetails();
+    orgName = response.data.orgName;
+    orgLogoURL = response.data.orgLogoURL;
+  } catch (err) {}
 
   return {
     props: {
-      orgName: response.data.orgName,
-      orgLogoURL: response.data.orgLogoURL,
+      orgName: orgName,
+      orgLogoURL: orgLogoURL,
     },
   };
 };

diff --git a/pages/privacy-policy.js b/pages/privacy-policy.js
@@ -10,13 +10,18 @@ import { getProviderOrgDetails } from "src/server/api/customer-user";
 import DOMPurify from "isomorphic-dompurify";
 
 export const getServerSideProps = async () => {
-  const response = await getProviderOrgDetails();
+  let orgName = "";
+  let orgLogoURL = "";
+  try {
+    const response = await getProviderOrgDetails();
+    orgName = response.data.orgName;
+    orgLogoURL = response.data.orgLogoURL;
+  } catch (err) {}
 
   return {
     props: {
-      orgSupportEmail: response.data.orgSupportEmail || response.data.email,
-      orgName: response.data.orgName,
-      orgPrivacyPolicy: response.data.orgPrivacyPolicy,
+      orgName: orgName,
+      orgLogoURL: orgLogoURL,
     },
   };
 };

diff --git a/pages/reset-password.js b/pages/reset-password.js
@@ -2,12 +2,18 @@ import ResetPasswordPage from "src/features/ResetPassword/ResetPasswordPage";
 import { getProviderOrgDetails } from "src/server/api/customer-user";
 
 export const getServerSideProps = async () => {
-  const response = await getProviderOrgDetails();
+  let orgName = "";
+  let orgLogoURL = "";
+  try {
+    const response = await getProviderOrgDetails();
+    orgName = response.data.orgName;
+    orgLogoURL = response.data.orgLogoURL;
+  } catch (err) {}
 
   return {
     props: {
-      orgName: response.data.orgName,
-      orgLogoURL: response.data.orgLogoURL,
+      orgName: orgName,
+      orgLogoURL: orgLogoURL,
     },
   };
 };

diff --git a/pages/service-plans.js b/pages/service-plans.js
@@ -3,12 +3,18 @@ import MarketplaceProductTier from "src/features/Marketplace/MarketplaceProductT
 import { getProviderOrgDetails } from "src/server/api/customer-user";
 
 export const getServerSideProps = async () => {
-  const response = await getProviderOrgDetails();
+  let orgName = "";
+  let orgLogoURL = "";
+  try {
+    const response = await getProviderOrgDetails();
+    orgName = response.data.orgName;
+    orgLogoURL = response.data.orgLogoURL;
+  } catch (err) {}
 
   return {
     props: {
-      orgName: response.data.orgName,
-      orgLogoURL: response.data.orgLogoURL,
+      orgName: orgName,
+      orgLogoURL: orgLogoURL,
     },
   };
 };

diff --git a/pages/settings.js b/pages/settings.js
@@ -3,12 +3,18 @@ import SettingsMarketplace from "src/features/ProfileSettings/SettingsMarketplac
 import { getProviderOrgDetails } from "src/server/api/customer-user";
 
 export const getServerSideProps = async () => {
-  const response = await getProviderOrgDetails();
+  let orgName = "";
+  let orgLogoURL = "";
+  try {
+    const response = await getProviderOrgDetails();
+    orgName = response.data.orgName;
+    orgLogoURL = response.data.orgLogoURL;
+  } catch (err) {}
 
   return {
     props: {
-      orgName: response.data.orgName,
-      orgLogoURL: response.data.orgLogoURL,
+      orgName: orgName,
+      orgLogoURL: orgLogoURL,
     },
   };
 };

diff --git a/pages/signin.js b/pages/signin.js
@@ -2,12 +2,18 @@ import SigninPage from "src/features/Signin/SigninPage";
 import { getProviderOrgDetails } from "src/server/api/customer-user";
 
 export const getServerSideProps = async () => {
-  const response = await getProviderOrgDetails();
+  let orgName = "";
+  let orgLogoURL = "";
+  try {
+    const response = await getProviderOrgDetails();
+    orgName = response.data.orgName;
+    orgLogoURL = response.data.orgLogoURL;
+  } catch (err) {}
 
   return {
     props: {
-      orgName: response.data.orgName,
-      orgLogoURL: response.data.orgLogoURL,
+      orgName: orgName,
+      orgLogoURL: orgLogoURL,
     },
   };
 };

diff --git a/pages/signup.js b/pages/signup.js
@@ -2,12 +2,18 @@ import SignupPage from "src/features/Signup/SignupPage";
 import { getProviderOrgDetails } from "src/server/api/customer-user";
 
 export const getServerSideProps = async () => {
-  const response = await getProviderOrgDetails();
+  let orgName = "";
+  let orgLogoURL = "";
+  try {
+    const response = await getProviderOrgDetails();
+    orgName = response.data.orgName;
+    orgLogoURL = response.data.orgLogoURL;
+  } catch (err) {}
 
   return {
     props: {
-      orgName: response.data.orgName,
-      orgLogoURL: response.data.orgLogoURL,
+      orgName: orgName,
+      orgLogoURL: orgLogoURL,
     },
   };
 };

diff --git a/pages/subscriptions.js b/pages/subscriptions.js
@@ -2,12 +2,18 @@ import MySubscriptions from "src/features/Marketplace/MySubscriptions";
 import { getProviderOrgDetails } from "src/server/api/customer-user";
 
 export const getServerSideProps = async () => {
-  const response = await getProviderOrgDetails();
+  let orgName = "";
+  let orgLogoURL = "";
+  try {
+    const response = await getProviderOrgDetails();
+    orgName = response.data.orgName;
+    orgLogoURL = response.data.orgLogoURL;
+  } catch (err) {}
 
   return {
     props: {
-      orgName: response.data.orgName,
-      orgLogoURL: response.data.orgLogoURL,
+      orgName: orgName,
+      orgLogoURL: orgLogoURL,
     },
   };
 };

diff --git a/pages/terms-of-use.js b/pages/terms-of-use.js
@@ -8,13 +8,18 @@ import { getProviderOrgDetails } from "src/server/api/customer-user";
 import DOMPurify from "isomorphic-dompurify";
 
 export const getServerSideProps = async () => {
-  const response = await getProviderOrgDetails();
+  let orgName = "";
+  let orgLogoURL = "";
+  try {
+    const response = await getProviderOrgDetails();
+    orgName = response.data.orgName;
+    orgLogoURL = response.data.orgLogoURL;
+  } catch (err) {}
 
   return {
     props: {
-      orgSupportEmail: response.data.orgSupportEmail || response.data.email,
-      orgName: response.data.orgName,
-      orgTermsOfUse: response.data.orgTermsOfUse,
+      orgName: orgName,
+      orgLogoURL: orgLogoURL,
     },
   };
 };

diff --git a/pages/validate-token.js b/pages/validate-token.js
@@ -2,12 +2,18 @@ import ValidateTokenPage from "src/features/ValidateToken/ValidateTokenPage";
 import { getProviderOrgDetails } from "src/server/api/customer-user";
 
 export const getServerSideProps = async () => {
-  const response = await getProviderOrgDetails();
+  let orgName = "";
+  let orgLogoURL = "";
+  try {
+    const response = await getProviderOrgDetails();
+    orgName = response.data.orgName;
+    orgLogoURL = response.data.orgLogoURL;
+  } catch (err) {}
 
   return {
     props: {
-      orgName: response.data.orgName,
-      orgLogoURL: response.data.orgLogoURL,
+      orgName: orgName,
+      orgLogoURL: orgLogoURL,
     },
   };
 };

diff --git a/src/components/NonDashboardComponents/Layout/MainImageLayout.jsx b/src/components/NonDashboardComponents/Layout/MainImageLayout.jsx
@@ -6,7 +6,7 @@ import MainImg from "public/assets/images/non-dashboard/signin-main.svg";
 import Footer from "../Footer";
 import Logo from "../Logo";
 import CurvedArrow from "../Icons/CurvedArrow";
-import NoLogoImage from "public/assets/images/logos/no-logo.png";
+//import NoLogoImage from "public/assets/images/logos/no-logo.png";
 
 const manrope = Manrope({ subsets: ["latin"] });
 
@@ -67,11 +67,7 @@ const MainImageLayout = ({
                   style={{ position: "absolute", top: 0, left: "-60px" }}
                 />
               )}
-              {orgLogoURL ? (
-                <Logo src={orgLogoURL} alt={orgName} />
-              ) : (
-                <Image src={NoLogoImage} />
-              )}
+              {orgLogoURL ? <Logo src={orgLogoURL} alt={orgName} /> : ""}
             </Box>
             {children}
           </Stack>

diff --git a/src/server/api/customer-user.js b/src/server/api/customer-user.js
@@ -8,7 +8,7 @@ const withProviderTokenExpirationHanding = require("../utils/withProviderTokenEx
 //If the server still returns a 401(invalid JWT token), throw a provider auth error which can be used to send appropriate response to the client
 function customerUserSignUp(payload) {
   return axios.post("/customer-user-signup", payload).catch((error) => {
-    console.log("Sign up error");
+    console.log("Sign up error", error);
     if (error.response && error.response.status === 401) {
       throw new ProviderAuthError();
     } else {
@@ -19,7 +19,7 @@ function customerUserSignUp(payload) {
 
 function customerUserSignIn(payload) {
   return axios.post("/customer-user-signin", payload).catch((error) => {
-    console.log("Sign in error", error.response.data);
+    console.log("Sign in error", error);
     if (error.response && error.response.status === 401) {
       throw new ProviderAuthError();
     } else {
@@ -30,8 +30,8 @@ function customerUserSignIn(payload) {
 
 function customerUserResetPassword(payload) {
   return axios.post("/customer-reset-password", payload).catch((error) => {
+    console.log("Reset password error", error);
     if (error.response && error.response.status === 401) {
-      console.log("Reset password error");
       throw new ProviderAuthError();
     } else {
       throw error;
@@ -41,7 +41,7 @@ function customerUserResetPassword(payload) {
 
 function getProviderOrgDetails() {
   return axios.get("/user").catch((error) => {
-    console.log("getProviderOrgDetails error");
+    console.log("getProviderOrgDetails error", error);
     if (error.response && error.response.status === 401) {
       throw new ProviderAuthError();
     } else {

diff --git a/src/server/utils/fetchProviderAuthToken.js b/src/server/utils/fetchProviderAuthToken.js
@@ -16,8 +16,8 @@ function fetchProviderAuthToken() {
     signInPayload["hashedPassword"] = process.env.PROVIDER_HASHED_PASS;
   }
 
-  return axios.post("/signin", signInPayload).catch(() => {
-    console.error("Provider sign in failure");
+  return axios.post("/signin", signInPayload).catch((error) => {
+    console.error("Provider sign in failure", error);
     throw new ProviderAuthError();
   });
 }