Fixed auth issues

src/app/api-utlities/errors/authorization.error.ts

@@ -0,0 +1 @@
+export class AuthorizationError extends Error {}

src/app/api/bonus/info/route.ts

@@ -2,6 +2,7 @@ import { RequestCookie } from 'next/dist/compiled/@edge-runtime/cookies';
 import { NextRequest } from 'next/server';
 
 import oriyoClient from '@/app/api-utlities/clients/oriyo.client';
+import { AuthorizationError } from '@/app/api-utlities/errors/authorization.error';
 
 import { authorizationMiddleware } from '../../middlewares/auth.middleware';
 import { validationErrorHandler } from '../../middlewares/error-handler.middleware';
@@ -16,6 +17,10 @@ const routeHandler = async (req: NextRequest, requestCookie: RequestCookie) => {
     },
   });
 
+  if (oriyoResponse.status === 401) {
+    throw new AuthorizationError();
+  }
+
   return new Response(JSON.stringify(oriyoResponse.data), {
     headers: { 'Content-Type': 'application/json' },
   });

src/app/api/bonus/transactions/route.ts

@@ -3,6 +3,7 @@ import { NextRequest } from 'next/server';
 import { z } from 'zod';
 
 import oriyoClient from '@/app/api-utlities/clients/oriyo.client';
+import { AuthorizationError } from '@/app/api-utlities/errors/authorization.error';
 import { getParams } from '@/app/api-utlities/utilities/get-params';
 
 import { authorizationMiddleware } from '../../middlewares/auth.middleware';
@@ -34,6 +35,25 @@ const routeHandler = async (req: NextRequest, requestCookie: RequestCookie) => {
     },
   });
 
+  if (oriyoResponse.status === 404)
+    return new Response(
+      JSON.stringify({
+        transactions: [],
+        card_id,
+        current_page: validatedRequest.page,
+        limit: validatedRequest.limit,
+        total_records: 0,
+        total_pages: 0,
+      }),
+      {
+        headers: { 'Content-Type': 'application/json' },
+      },
+    );
+
+  if (oriyoResponse.status === 401) {
+    throw new AuthorizationError();
+  }
+
   if (oriyoResponse.data.error) throw oriyoResponse.data;
 
   return new Response(JSON.stringify(oriyoResponse.data), {

src/app/api/corporate/transactions/route.ts

@@ -3,6 +3,7 @@ import { NextRequest } from 'next/server';
 import { z } from 'zod';
 
 import oriyoClient from '@/app/api-utlities/clients/oriyo.client';
+import { AuthorizationError } from '@/app/api-utlities/errors/authorization.error';
 import { getParams } from '@/app/api-utlities/utilities/get-params';
 
 import { authorizationMiddleware } from '../../middlewares/auth.middleware';
@@ -34,6 +35,24 @@ const routeHandler = async (req: NextRequest, requestCookie: RequestCookie) => {
     },
   });
 
+  if (oriyoResponse.status === 404)
+    return new Response(
+      JSON.stringify({
+        transactions: [],
+        current_page: validatedRequest.page,
+        limit: validatedRequest.limit,
+        total_records: 0,
+        total_pages: 0,
+      }),
+      {
+        headers: { 'Content-Type': 'application/json' },
+      },
+    );
+
+  if (oriyoResponse.status === 401) {
+    throw new AuthorizationError();
+  }
+
   if (oriyoResponse.data.error) throw oriyoResponse.data;
 
   return new Response(JSON.stringify(oriyoResponse.data), {

src/app/api/middlewares/auth.middleware.ts

@@ -1,6 +1,7 @@
-import { has } from 'lodash';
 import { NextRequest, NextResponse } from 'next/server';
 
+import { AuthorizationError } from '@/app/api-utlities/errors/authorization.error';
+
 export const authorizationMiddleware =
   (handler: Function, authorizationTokenKey: string) =>
   async (req: NextRequest, ...args: any[]) => {
@@ -16,7 +17,7 @@ export const authorizationMiddleware =
     try {
       return await handler(req, requestedToken, ...args);
     } catch (error) {
-      if (has(error, 'code') && error.code === 401) {
+      if (error instanceof AuthorizationError) {
         const response = NextResponse.json(
           { message: 'Authorization session was timed out' },
           { status: 401 },

src/entities/transactions/model/types.ts

@@ -1,6 +1,5 @@
 export interface TransactionResponse {
   transactions: Transaction[];
-  card_id: string;
   current_page: number;
   limit: number;
   total_records: number;

src/pages-templates/(dashboard)/corporate-dashboard/index.tsx

@@ -25,7 +25,7 @@ import { TransactionsTable } from '@/widgets/transactions-table';
 export function CorporateDashboard() {
   const { t } = useTextController();
 
-  const { data, isLoading } = useFetchMyCorporateInfoQuery({});
+  const { data } = useFetchMyCorporateInfoQuery({});
 
   const [request, setTransactionFetchRequest] = useState<TransactionRequest>({
     limit: 10,
@@ -159,12 +159,18 @@ export function CorporateDashboard() {
             </Card>
           </div>
 
-          {transactionsResponse && (
-            <TransactionsTable
-              data={transactionsResponse}
-              onChange={setTransactionFetchRequest}
-            />
-          )}
+          <TransactionsTable
+            data={
+              transactionsResponse || {
+                limit: 10,
+                current_page: 1,
+                total_pages: 0,
+                total_records: 0,
+                transactions: [],
+              }
+            }
+            onChange={setTransactionFetchRequest}
+          />
         </div>
       </main>
     </div>

src/pages-templates/(dashboard)/customer-dashboard/index.tsx

@@ -148,12 +148,18 @@ export function CustomerDashboard() {
             </Card>
           </div>
 
-          {transactionsResponse && (
-            <TransactionsTable
-              data={transactionsResponse}
-              onChange={setTransactionFetchRequest}
-            />
-          )}
+          <TransactionsTable
+            data={
+              transactionsResponse || {
+                limit: 10,
+                current_page: 1,
+                total_pages: 0,
+                total_records: 0,
+                transactions: [],
+              }
+            }
+            onChange={setTransactionFetchRequest}
+          />
         </div>
       </main>
     </div>

src/widgets/transactions-table.tsx

@@ -2,7 +2,7 @@
 
 import { format } from 'date-fns';
 import { ru } from 'date-fns/locale';
-import { CalendarIcon } from 'lucide-react';
+import { CalendarIcon, X } from 'lucide-react';
 import { useEffect, useState } from 'react';
 
 import {
@@ -46,8 +46,10 @@ export const TransactionsTable = ({
   data,
   onChange,
 }: TransactionsTableProps) => {
-  const [startDate, setStartDate] = useState<Date | undefined>(undefined);
-  const [endDate, setEndDate] = useState<Date | undefined>(undefined);
+  const [startDate, setStartDate] = useState<Date | undefined>(
+    new Date(new Date().setMonth(new Date().getMonth() - 1)),
+  );
+  const [endDate, setEndDate] = useState<Date | undefined>(new Date());
   const [currentPage, setCurrentPage] = useState(1);
   const [itemsPerPage, setItemsPerPage] = useState(10);
 
@@ -128,6 +130,9 @@ export const TransactionsTable = ({
                     initialFocus
                   />
                 </PopoverContent>
+                <Button variant='ghost' onClick={() => setStartDate(undefined)}>
+                  <X className='mr-2 h-4 w-4' />
+                </Button>
               </Popover>
             </div>
 
@@ -155,16 +160,12 @@ export const TransactionsTable = ({
                     initialFocus
                   />
                 </PopoverContent>
+                <Button variant='ghost' onClick={() => setEndDate(undefined)}>
+                  <X className='mr-2 h-4 w-4' />
+                </Button>
               </Popover>
             </div>
           </div>
-
-          <Button
-            className='mt-auto bg-red-600 hover:bg-red-700'
-            onClick={filterTransactions}
-          >
-            {t('corporate.transactions.applyButton')}
-          </Button>
         </div>
       </div>