feat: use session access_tokens

apps/web/components/Dashboard/Course/EditCourseAccess/EditCourseAccess.tsx

@@ -5,7 +5,7 @@ import Modal from '@components/StyledElements/Modal/Modal'
 import { getAPIUrl } from '@services/config/config'
 import { unLinkResourcesToUserGroup } from '@services/usergroups/usergroups'
 import { swrFetcher } from '@services/utils/ts/requests'
-import { Globe, SquareUserRound, Users, UsersRound, X } from 'lucide-react'
+import { Globe, SquareUserRound, Users, X } from 'lucide-react'
 import { useLHSession } from '@components/Contexts/LHSessionContext'
 import React from 'react'
 import toast from 'react-hot-toast'
@@ -122,9 +122,11 @@ function EditCourseAccess(props: EditCourseAccessProps) {
 function UserGroupsSection({ usergroups }: { usergroups: any[] }) {
     const course = useCourse() as any
     const [userGroupModal, setUserGroupModal] = React.useState(false)
+    const session = useLHSession() as any;
+    const access_token = session?.data?.tokens?.access_token;
 
     const removeUserGroupLink = async (usergroup_id: number) => {
-        const res = await unLinkResourcesToUserGroup(usergroup_id, course.courseStructure.course_uuid)
+        const res = await unLinkResourcesToUserGroup(usergroup_id, course.courseStructure.course_uuid,access_token)
         if (res.status === 200) {
             toast.success('Successfully unliked from usergroup')
             mutate(`${getAPIUrl()}usergroups/resource/${course.courseStructure.course_uuid}`)

apps/web/components/Dashboard/Course/EditCourseGeneral/EditCourseGeneral.tsx

@@ -6,7 +6,6 @@ import FormLayout, {
 } from '@components/StyledElements/Form/Form'
 import { useFormik } from 'formik'
 import { AlertTriangle } from 'lucide-react'
-import * as Switch from '@radix-ui/react-switch'
 import * as Form from '@radix-ui/react-form'
 import React from 'react'
 import { useCourse, useCourseDispatch } from '../../../Contexts/CourseContext'

apps/web/components/Dashboard/Course/EditCourseGeneral/ThumbnailUpdate.tsx

@@ -10,7 +10,7 @@ import { mutate } from 'swr'
 
 function ThumbnailUpdate() {
   const course = useCourse() as any
-  const session = useLHSession()
+  const session = useLHSession() as any;
   const org = useOrg() as any
   const [localThumbnail, setLocalThumbnail] = React.useState(null) as any
   const [isLoading, setIsLoading] = React.useState(false) as any

apps/web/components/Dashboard/Org/OrgEditGeneral/OrgEditGeneral.tsx

@@ -9,6 +9,7 @@ import { UploadCloud } from 'lucide-react'
 import { revalidateTags } from '@services/utils/ts/requests'
 import { useRouter } from 'next/navigation'
 import { useOrg } from '@components/Contexts/OrgContext'
+import { useLHSession } from '@components/Contexts/LHSessionContext'
 
 interface OrganizationValues {
   name: string
@@ -20,7 +21,9 @@ interface OrganizationValues {
 
 function OrgEditGeneral(props: any) {
   const [selectedFile, setSelectedFile] = useState<File | null>(null)
-  const router = useRouter()
+  const router = useRouter();
+  const session = useLHSession() as any;
+  const access_token = session?.data?.tokens?.access_token;
   const org = useOrg() as any
   // ...
 
@@ -34,7 +37,7 @@ function OrgEditGeneral(props: any) {
   const uploadLogo = async () => {
     if (selectedFile) {
       let org_id = org.id
-      await uploadOrganizationLogo(org_id, selectedFile)
+      await uploadOrganizationLogo(org_id, selectedFile, access_token)
       setSelectedFile(null) // Reset the selected file
       await revalidateTags(['organizations'], org.slug)
       router.refresh()
@@ -51,14 +54,14 @@ function OrgEditGeneral(props: any) {
 
   const updateOrg = async (values: OrganizationValues) => {
     let org_id = org.id
-    await updateOrganization(org_id, values)
+    await updateOrganization(org_id, values, access_token)
 
     // Mutate the org
     await revalidateTags(['organizations'], org.slug)
     router.refresh()
   }
 
-  useEffect(() => {}, [org])
+  useEffect(() => { }, [org])
 
   return (
     <div className="ml-10 mr-10 mx-auto bg-white rounded-xl shadow-sm px-6 py-5">

apps/web/components/Dashboard/UserAccount/UserEditGeneral/UserEditGeneral.tsx

@@ -14,7 +14,8 @@ import UserAvatar from '@components/Objects/UserAvatar'
 import { updateUserAvatar } from '@services/users/users'
 
 function UserEditGeneral() {
-  const session = useLHSession() as any
+  const session = useLHSession() as any;
+  const access_token = session.data.tokens.access_token;
   const [localAvatar, setLocalAvatar] = React.useState(null) as any
   const [isLoading, setIsLoading] = React.useState(false) as any
   const [error, setError] = React.useState() as any
@@ -24,7 +25,7 @@ function UserEditGeneral() {
     const file = event.target.files[0]
     setLocalAvatar(file)
     setIsLoading(true)
-    const res = await updateUserAvatar(session.data.user_uuid, file)
+    const res = await updateUserAvatar(session.data.user_uuid, file, access_token)
     // wait for 1 second to show loading animation
     await new Promise((r) => setTimeout(r, 1500))
     if (res.success === false) {
@@ -36,7 +37,7 @@ function UserEditGeneral() {
     }
   }
 
-  useEffect(() => {}, [session, session.data])
+  useEffect(() => { }, [session, session.data])
 
   return (
     <div className="ml-10 mr-10 mx-auto bg-white rounded-xl shadow-sm px-6 py-5">
@@ -53,7 +54,7 @@ function UserEditGeneral() {
           onSubmit={(values, { setSubmitting }) => {
             setTimeout(() => {
               setSubmitting(false)
-              updateProfile(values, session.data.user.id)
+              updateProfile(values, session.data.user.id, access_token)
             }, 400)
           }}
         >

apps/web/components/Dashboard/UserAccount/UserEditPassword/UserEditPassword.tsx

@@ -5,13 +5,14 @@ import React, { useEffect } from 'react'
 
 function UserEditPassword() {
   const session = useLHSession() as any
+  const access_token = session.data.tokens.access_token;
 
   const updatePasswordUI = async (values: any) => {
     let user_id = session.data.user.id
-    await updatePassword(user_id, values)
+    await updatePassword(user_id, values, access_token)
   }
 
-  useEffect(() => {}, [session])
+  useEffect(() => { }, [session])
 
   return (
     <div className="ml-10 mr-10 mx-auto bg-white rounded-xl shadow-sm px-6 py-5">

apps/web/components/Dashboard/Users/OrgAccess/OrgAccess.tsx

@@ -3,27 +3,28 @@ import PageLoading from '@components/Objects/Loaders/PageLoading'
 import ConfirmationModal from '@components/StyledElements/ConfirmationModal/ConfirmationModal'
 import { getAPIUrl, getUriWithOrg } from '@services/config/config'
 import { swrFetcher } from '@services/utils/ts/requests'
-import { Globe, Shield, Ticket, User, UserSquare, Users, X } from 'lucide-react'
+import { Globe, Ticket, UserSquare, Users, X } from 'lucide-react'
 import Link from 'next/link'
 import React, { useEffect } from 'react'
 import useSWR, { mutate } from 'swr'
 import dayjs from 'dayjs'
 import {
   changeSignupMechanism,
-  createInviteCode,
   deleteInviteCode,
 } from '@services/organizations/invites'
-import Toast from '@components/StyledElements/Toast/Toast'
 import toast from 'react-hot-toast'
 import { useRouter } from 'next/navigation'
 import Modal from '@components/StyledElements/Modal/Modal'
 import OrgInviteCodeGenerate from '@components/Objects/Modals/Dash/OrgAccess/OrgInviteCodeGenerate'
+import { useLHSession } from '@components/Contexts/LHSessionContext'
 
 function OrgAccess() {
   const org = useOrg() as any
+  const session = useLHSession() as any
+  const access_token = session.data.tokens.access_token;
   const { data: invites } = useSWR(
     org ? `${getAPIUrl()}orgs/${org?.id}/invites` : null,
-    swrFetcher
+    (url) => swrFetcher(url, access_token)
   )
   const [isLoading, setIsLoading] = React.useState(false)
   const [joinMethod, setJoinMethod] = React.useState('closed')
@@ -40,10 +41,8 @@ function OrgAccess() {
     }
   }
 
-  
-
   async function deleteInvite(invite: any) {
-    let res = await deleteInviteCode(org.id, invite.invite_code_uuid)
+    let res = await deleteInviteCode(org.id, invite.invite_code_uuid, access_token)
     if (res.status == 200) {
       mutate(`${getAPIUrl()}orgs/${org.id}/invites`)
     } else {
@@ -52,7 +51,7 @@ function OrgAccess() {
   }
 
   async function changeJoinMethod(method: 'open' | 'inviteOnly') {
-    let res = await changeSignupMechanism(org.id, method)
+    let res = await changeSignupMechanism(org.id, method, access_token)
     if (res.status == 200) {
       router.refresh()
       mutate(`${getAPIUrl()}orgs/slug/${org?.slug}`)

apps/web/components/Dashboard/Users/OrgUserGroups/OrgUserGroups.tsx

@@ -1,4 +1,5 @@
 'use client'
+import { useLHSession } from '@components/Contexts/LHSessionContext'
 import { useOrg } from '@components/Contexts/OrgContext'
 import AddUserGroup from '@components/Objects/Modals/Dash/OrgUserGroups/AddUserGroup'
 import ManageUsers from '@components/Objects/Modals/Dash/OrgUserGroups/ManageUsers'
@@ -14,17 +15,19 @@ import useSWR, { mutate } from 'swr'
 
 function OrgUserGroups() {
     const org = useOrg() as any
+    const session = useLHSession() as any
+    const access_token = session.data.tokens.access_token;
     const [userGroupManagementModal, setUserGroupManagementModal] = React.useState(false)
     const [createUserGroupModal, setCreateUserGroupModal] = React.useState(false)
     const [selectedUserGroup, setSelectedUserGroup] = React.useState(null) as any
 
     const { data: usergroups } = useSWR(
         org ? `${getAPIUrl()}usergroups/org/${org.id}` : null,
-        swrFetcher
+        (url) => swrFetcher(url, access_token)
     )
 
     const deleteUserGroupUI = async (usergroup_id: any) => {
-        const res = await deleteUserGroup(usergroup_id)
+        const res = await deleteUserGroup(usergroup_id, access_token)
         if (res.status == 200) {
             mutate(`${getAPIUrl()}usergroups/org/${org.id}`)
         }

apps/web/components/Dashboard/Users/OrgUsers/OrgUsers.tsx

@@ -1,3 +1,4 @@
+import { useLHSession } from '@components/Contexts/LHSessionContext'
 import { useOrg } from '@components/Contexts/OrgContext'
 import PageLoading from '@components/Objects/Loaders/PageLoading'
 import RolesUpdate from '@components/Objects/Modals/Dash/OrgUsers/RolesUpdate'
@@ -14,9 +15,11 @@ import useSWR, { mutate } from 'swr'
 
 function OrgUsers() {
   const org = useOrg() as any
+  const session = useLHSession() as any
+  const access_token = session.data.tokens.access_token;
   const { data: orgUsers } = useSWR(
     org ? `${getAPIUrl()}orgs/${org?.id}/users` : null,
-    swrFetcher
+    (url) => swrFetcher(url, access_token)
   )
   const [rolesModal, setRolesModal] = React.useState(false)
   const [selectedUser, setSelectedUser] = React.useState(null) as any
@@ -28,7 +31,7 @@ function OrgUsers() {
   }
 
   const handleRemoveUser = async (user_id: any) => {
-    const res = await removeUserFromOrg(org.id, user_id)
+    const res = await removeUserFromOrg(org.id, user_id,access_token)
     if (res.status === 200) {
       await mutate(`${getAPIUrl()}orgs/${org.id}/users`)
     } else {
@@ -39,7 +42,6 @@ function OrgUsers() {
   useEffect(() => {
     if (orgUsers) {
       setIsLoading(false)
-      console.log(orgUsers)
     }
   }, [org, orgUsers])
 

apps/web/components/Dashboard/Users/OrgUsersAdd/OrgUsersAdd.tsx

@@ -1,3 +1,4 @@
+import { useLHSession } from '@components/Contexts/LHSessionContext'
 import { useOrg } from '@components/Contexts/OrgContext'
 import PageLoading from '@components/Objects/Loaders/PageLoading'
 import Toast from '@components/StyledElements/Toast/Toast'
@@ -5,20 +6,22 @@ import ToolTip from '@components/StyledElements/Tooltip/Tooltip'
 import { getAPIUrl } from '@services/config/config'
 import { inviteBatchUsers } from '@services/organizations/invites'
 import { swrFetcher } from '@services/utils/ts/requests'
-import { Info, Shield, UserPlus } from 'lucide-react'
+import { Info, UserPlus } from 'lucide-react'
 import React, { useEffect } from 'react'
 import toast from 'react-hot-toast'
 import useSWR, { mutate } from 'swr'
 
 function OrgUsersAdd() {
     const org = useOrg() as any
+    const session = useLHSession() as any
+    const access_token = session.data.tokens.access_token;
     const [isLoading, setIsLoading] = React.useState(false)
     const [invitedUsers, setInvitedUsers] = React.useState('');
     const [selectedInviteCode, setSelectedInviteCode] = React.useState('');
 
     async function sendInvites() {
         setIsLoading(true)
-        let res = await inviteBatchUsers(org.id, invitedUsers, selectedInviteCode)
+        let res = await inviteBatchUsers(org.id, invitedUsers, selectedInviteCode,access_token)
         if (res.status == 200) {
             mutate(`${getAPIUrl()}orgs/${org?.id}/invites/users`)
             setIsLoading(false)
@@ -31,18 +34,17 @@ function OrgUsersAdd() {
 
     const { data: invites } = useSWR(
         org ? `${getAPIUrl()}orgs/${org?.id}/invites` : null,
-        swrFetcher
+        (url) => swrFetcher(url, access_token)
     )
     const { data: invited_users } = useSWR(
         org ? `${getAPIUrl()}orgs/${org?.id}/invites/users` : null,
-        swrFetcher
+        (url) => swrFetcher(url, access_token)
     )
 
     useEffect(() => {
         if (invites) {
             setSelectedInviteCode(invites?.[0]?.invite_code_uuid)
         }
-        console.log('dev,',selectedInviteCode)
     }
         , [invites, invited_users])