feat: use requests with auth header for home

front/app/orgs/[orgslug]/(withmenu)/page.tsx

@@ -1,17 +1,16 @@
 export const dynamic = 'force-dynamic';
 import { Metadata, ResolvingMetadata } from 'next';
-import { Menu } from "@components/UI/Elements/Menu";
 import { getBackendUrl, getUriWithOrg } from "@services/config/config";
-import { getOrgCourses } from "@services/courses/courses";
+import { getCourse, getOrgCourses, getOrgCoursesWithAuthHeader } from "@services/courses/courses";
 import CoursesLogo from "public/svg/courses.svg";
 import CollectionsLogo from "public/svg/collections.svg";
 import Link from "next/link";
 import Image from "next/image";
-import { log } from "console";
-import AuthProvider from "@components/Security/AuthProvider";
-import { getOrgCollections } from "@services/courses/collections";
+import { getOrgCollections, getOrgCollectionsWithAuthHeader } from "@services/courses/collections";
 import { getOrganizationContextInfo } from '@services/organizations/orgs';
 
+import { cookies } from 'next/headers';
+
 type MetadataProps = {
   params: { orgslug: string };
   searchParams: { [key: string]: string | string[] | undefined };
@@ -21,6 +20,7 @@ export async function generateMetadata(
   { params }: MetadataProps,
 ): Promise<Metadata> {
 
+
   // Get Org context information 
   const org = await getOrganizationContextInfo(params.orgslug, { revalidate: 1800, tags: ['organizations'] });
   return {
@@ -31,8 +31,12 @@ export async function generateMetadata(
 
 const OrgHomePage = async (params: any) => {
   const orgslug = params.params.orgslug;
-  const courses = await getOrgCourses(orgslug, { revalidate: 360 , tags: ['courses'] });
-  const collections = await getOrgCollections();
+  const cookieStore = cookies();
+  const access_token_cookie: any = cookieStore.get('access_token_cookie');
+
+  const courses = await getOrgCoursesWithAuthHeader(orgslug, { revalidate: 360, tags: ['courses'] }, access_token_cookie.value);
+  const collections = await getOrgCollectionsWithAuthHeader(access_token_cookie.value);
+
 
   // function to remove "course_" from the course_id
   function removeCoursePrefix(course_id: string) {

front/services/auth/auth.ts

@@ -12,8 +12,7 @@ export async function loginAndGetToken(username: string, password: string): Prom
   // Request Config
 
   // get origin 
-  const origin = window.location.origin;
-  const HeadersConfig = new Headers({ "Content-Type": "application/x-www-form-urlencoded" , Origin: origin  });
+  const HeadersConfig = new Headers({ "Content-Type": "application/x-www-form-urlencoded"  });
   const urlencoded = new URLSearchParams({ username: username, password: password });
 
   const requestOptions: any = {

front/services/courses/collections.ts

@@ -1,5 +1,5 @@
 import { getAPIUrl } from "../config/config";
-import { RequestBody, errorHandling } from "@services/utils/ts/requests";
+import { RequestBody, RequestBodyWithAuthHeader, errorHandling } from "@services/utils/ts/requests";
 
 /*
  This file includes only POST, PUT, DELETE requests
@@ -19,7 +19,7 @@ export async function createCollection(collection: any) {
   return res;
 }
 
-// Get collections 
+// Get collections
 // TODO : add per org filter
 export async function getOrgCollections() {
   const result: any = await fetch(`${getAPIUrl()}collections/page/1/limit/10`, { next: { revalidate: 10 } });
@@ -27,3 +27,8 @@ export async function getOrgCollections() {
   return res;
 }
 
+export async function getOrgCollectionsWithAuthHeader(access_token: string) {
+  const result: any = await fetch(`${getAPIUrl()}collections/page/1/limit/10`, RequestBodyWithAuthHeader("GET", null, { revalidate: 10 }, access_token));
+  const res = await errorHandling(result);
+  return res;
+}

front/services/courses/courses.ts

@@ -1,5 +1,5 @@
 import { getAPIUrl } from "@services/config/config";
-import { RequestBody, RequestBodyForm, errorHandling } from "@services/utils/ts/requests";
+import { RequestBody, RequestBodyForm, RequestBodyWithAuthHeader, errorHandling } from "@services/utils/ts/requests";
 
 /*
  This file includes only POST, PUT, DELETE requests
@@ -9,10 +9,17 @@ import { RequestBody, RequestBodyForm, errorHandling } from "@services/utils/ts/
 export async function getOrgCourses(org_id: number, next: any) {
   const result: any = await fetch(`${getAPIUrl()}courses/org_slug/${org_id}/page/1/limit/10`, RequestBody("GET", null, next));
   const res = await errorHandling(result);
-  
+
   return res;
 }
 
+export async function getOrgCoursesWithAuthHeader(org_id: number, next: any, access_token: string) {
+  const result: any = await fetch(`${getAPIUrl()}courses/org_slug/${org_id}/page/1/limit/10`, RequestBodyWithAuthHeader("GET", null, next, access_token));
+  const res = await errorHandling(result);
+  return res;
+}
+
+
 export async function getCourse(course_id: string, next: any) {
   const result: any = await fetch(`${getAPIUrl()}courses/${course_id}`, RequestBody("GET", null, next));
   const res = await errorHandling(result);

front/services/utils/ts/requests.ts

@@ -18,6 +18,20 @@ export const RequestBody = (method: string, data: any, next: any) => {
   return options;
 };
 
+export const RequestBodyWithAuthHeader = (method: string, data: any, next: any, token: string) => {
+  let HeadersConfig = new Headers({ Authorization: `Bearer ${token}` });
+  let options: any = {
+    method: method,
+    headers: HeadersConfig,
+    redirect: "follow",
+    credentials: "include",
+    body: data,
+    // Next.js
+    next: next,
+  };
+  return options;
+};
+
 export const RequestBodyForm = (method: string, data: any, next: any) => {
   let HeadersConfig = new Headers({});
   let options: any = {