redirecting changes to fix no cookies error

harshasomisetty · harshasomisetty · commit 7d5fb00c054c · 2023-08-27T17:39:42.000-04:00
diff --git a/apps/backend-serverless/src/models/shopify/process-payment-request.model.ts b/apps/backend-serverless/src/models/shopify/process-payment-request.model.ts
@@ -12,7 +12,7 @@ const customerAddressSchema = object().shape({
     city: string().required(),
     postal_code: string().optional(),
     province: string().optional(),
-    country_code: string().required(),
+    country_code: string().optional(),
     phone_number: string().optional(),
     company: string().optional(),
 });
diff --git a/apps/merchant-ui/src/components/Welcome.tsx b/apps/merchant-ui/src/components/Welcome.tsx
@@ -5,6 +5,7 @@ import { SolanaPayMark } from './SolanaPayMark';
 interface Props {
     className?: string;
     isBlocked: string;
+    isLoggedIn: string;
 }
 
 export function Welcome(props: Props) {
@@ -17,6 +18,12 @@ export function Welcome(props: Props) {
             <p className="mt-3 text-neutral-600">
                 Solana Pay makes it easy for you to accept Solana and USDC payments on your Shopify site.
             </p>
+            {props.isLoggedIn === 'false' && (
+                <div className="border border-orange-500 bg-orange-50 text-orange-800 rounded-lg p-4 flex flex-row items-center space-x-2 mt-10">
+                    <WarningAlt size={20} />
+                    <p>Please log in to access features</p>
+                </div>
+            )}
             {props.isBlocked === 'true' ? (
                 <div className="border border-orange-500 bg-orange-50 text-orange-800 rounded-lg p-4 flex flex-row items-center space-x-2 mt-10">
                     <WarningAlt size={20} />
diff --git a/apps/merchant-ui/src/middleware.ts b/apps/merchant-ui/src/middleware.ts
@@ -60,15 +60,19 @@ export function middleware(request: NextRequest) {
     }
 
     const isBlocked = isBlockedGeo(request);
+    const isLoggedIn = request.cookies.has('Bearer') && request.cookies.has('nonce');
     const geo = request.geo;
 
     if (geo) {
         request.nextUrl.searchParams.set('country', geo.country ?? 'unknown');
     }
+    if (isLoggedIn) {
+        request.nextUrl.searchParams.set('isLoggedIn', 'false');
+    }
 
     request.nextUrl.searchParams.set('isBlocked', isBlocked.toString());
 
-    if (isBlocked && request.nextUrl.pathname !== '/') {
+    if ((isBlocked || !isLoggedIn) && request.nextUrl.pathname !== '/') {
         request.nextUrl.pathname = '/';
         return NextResponse.redirect(request.nextUrl);
     }
diff --git a/apps/merchant-ui/src/pages/index.tsx b/apps/merchant-ui/src/pages/index.tsx
@@ -14,10 +14,11 @@ export const getServerSideProps: GetServerSideProps = async (context: GetServerS
 
 export type BlockedProps = {
     isBlocked: string;
+    isLoggedIn: string;
     country: string;
 };
 
-export default function Home({ isBlocked, country }: BlockedProps) {
+export default function Home({ isBlocked, isLoggedIn, country }: BlockedProps) {
     return (
         <>
             <Head>
@@ -29,7 +30,11 @@ export default function Home({ isBlocked, country }: BlockedProps) {
             </Head>
             <div className={twMerge('grid', 'h-screen', 'w-screen', 'md:grid-cols-2')}>
                 <div className="flex flex-col justify-center items-center px-6 md:px-24">
-                    <Welcome className="pt-14 md:pt-0 md:mb-56 w-full max-w-md" isBlocked={isBlocked} />
+                    <Welcome
+                        className="pt-14 md:pt-0 md:mb-56 w-full max-w-md"
+                        isBlocked={isBlocked}
+                        isLoggedIn={isLoggedIn}
+                    />
                 </div>
                 <div className={twMerge('relative', 'h-full')}>
                     <WelcomeHero className={twMerge('absolute', 'inset-0', 'w-full', 'h-full', 'object-cover')} />

Original file line number	Diff line number	Diff line change
`@@ -60,15 +60,19 @@ export function middleware(request: NextRequest) {`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`const isBlocked = isBlockedGeo(request);`
	`63`	`+ const isLoggedIn = request.cookies.has('Bearer') && request.cookies.has('nonce');`
`63`	`64`	`const geo = request.geo;`
`64`	`65`
`65`	`66`	`if (geo) {`
`66`	`67`	`request.nextUrl.searchParams.set('country', geo.country ?? 'unknown');`
`67`	`68`	`}`
	`69`	`+ if (isLoggedIn) {`
	`70`	`+ request.nextUrl.searchParams.set('isLoggedIn', 'false');`
	`71`	`+ }`
`68`	`72`
`69`	`73`	`request.nextUrl.searchParams.set('isBlocked', isBlocked.toString());`
`70`	`74`
`71`		`- if (isBlocked && request.nextUrl.pathname !== '/') {`
	`75`	`+ if ((isBlocked \|\| !isLoggedIn) && request.nextUrl.pathname !== '/') {`
`72`	`76`	`request.nextUrl.pathname = '/';`
`73`	`77`	`return NextResponse.redirect(request.nextUrl);`
`74`	`78`	`}`