fi:x login redirect (chaynHQ#831)

Author: annarhughes

components/forms/LoginForm.tsx

@@ -71,18 +71,6 @@ const LoginForm = () => {
           logEvent(GET_USER_SUCCESS, eventUserData); // deprecated event
           logEvent(GET_LOGIN_USER_SUCCESS, eventUserData);
 
-          // Checking if the query type is a string to keep typescript happy
-          // because a query value can be an array
-          const returnUrl =
-            typeof router.query.return_url === 'string' ? router.query.return_url : null;
-
-          if (userResponse.data.partnerAdmin?.id) {
-            await router.push('/partner-admin/create-access-code');
-          } else if (returnUrl) {
-            router.push(returnUrl);
-          } else {
-            await router.push('/courses');
-          }
           dispatch(setUserLoading(false));
           setLoading(false);
         }

components/layout/Footer.tsx

@@ -104,7 +104,7 @@ const Footer = () => {
 
   useEffect(() => {
     setEventUserData(getEventUserData(userCreatedAt, partnerAccesses, partnerAdmin));
-    let partnersList: PartnerContent[] = [getPartnerContent('public')];
+    let partnersList: PartnerContent[] = [getPartnerContent('public') as PartnerContent];
 
     if (partnerAdmin && partnerAdmin.partner) {
       addUniquePartner(partnersList, partnerAdmin.partner.name);

components/storyblok/StoryblokWelcomePage.tsx

@@ -16,7 +16,7 @@ import {
   generatePartnerPromoGetStartedEvent,
   generatePartnerPromoGoToCoursesEvent,
 } from '../../constants/events';
-import { getPartnerContent } from '../../constants/partners';
+import { PartnerContent, getPartnerContent } from '../../constants/partners';
 import { useTypedSelector } from '../../hooks/store';
 import illustrationBloomHeadYellow from '../../public/illustration_bloom_head_yellow.svg';
 import welcomeToBloom from '../../public/welcome_to_bloom.svg';
@@ -58,7 +58,7 @@ export interface StoryblokWelcomePageProps {
 const StoryblokWelcomePage = (props: StoryblokWelcomePageProps) => {
   const { _uid, _editable, storySlug, title, introduction, header_image, page_sections } = props;
 
-  const partnerContent = getPartnerContent(storySlug);
+  const partnerContent = getPartnerContent(storySlug) as PartnerContent;
 
   const headerProps = {
     partnerLogoSrc: partnerContent.partnershipLogo || welcomeToBloom,

constants/partners.ts

@@ -89,11 +89,10 @@ export const fruitzContent: PartnerContent = {
 
 export const getPartnerContent = (partnerName: string) => {
   const partner = partnerName.toLowerCase();
+  if (partner === 'public') return bumbleContent;
   if (partner === 'bumble') return bumbleContent;
   if (partner === 'badoo') return badooContent;
   if (partner === 'fruitz') return fruitzContent;
-
-  return publicContent;
 };
 
 export const getAllPartnersContent = () => {

pages/auth/login.tsx

@@ -78,12 +78,17 @@ const Login: NextPage = () => {
 
   useEffect(() => {
     // Redirect if the user is on the login page but is already logged in and their data has been retrieved from the backend
-    if (userToken && userId) {
-      if (partnerAdmin) {
-        router.push('/partner-admin/create-access-code');
-      } else {
-        router.push('/courses');
-      }
+    if (!userId) return;
+    // Checking if the query type is a string to keep typescript happy
+    // because a query value can be an array
+    const returnUrl = typeof router.query.return_url === 'string' ? router.query.return_url : null;
+
+    if (!!partnerAdmin?.id) {
+      router.push('/partner-admin/create-access-code');
+    } else if (!!returnUrl) {
+      router.push(returnUrl);
+    } else {
+      router.push('/courses');
     }
   });
 

pages/partnership/[partnerName].tsx

@@ -27,7 +27,7 @@ const Partnership: NextPage<Props> = ({ story }) => {
   }
 
   const partnerName = story.slug;
-  const partnerContent: PartnerContent = getPartnerContent(partnerName);
+  const partnerContent = getPartnerContent(partnerName) as PartnerContent;
 
   return (
     <Box>