feat: use session access_tokens

apps/web/components/Objects/Modals/Dash/EditCourseAccess/LinkToUserGroup.tsx

@@ -1,10 +1,11 @@
 'use client';
 import { useCourse } from '@components/Contexts/CourseContext';
+import { useLHSession } from '@components/Contexts/LHSessionContext';
 import { useOrg } from '@components/Contexts/OrgContext';
 import { getAPIUrl } from '@services/config/config';
 import { linkResourcesToUserGroup } from '@services/usergroups/usergroups';
 import { swrFetcher } from '@services/utils/ts/requests';
-import { AlertTriangle, Info } from 'lucide-react';
+import { Info } from 'lucide-react';
 import React, { useEffect } from 'react'
 import toast from 'react-hot-toast';
 import useSWR, { mutate } from 'swr'
@@ -17,6 +18,8 @@ type LinkToUserGroupProps = {
 function LinkToUserGroup(props: LinkToUserGroupProps) {
     const course = useCourse() as any
     const org = useOrg() as any
+    const session = useLHSession() as any
+    const access_token = session.data.tokens.access_token;
     const courseStructure = course.courseStructure
 
     const { data: usergroups } = useSWR(
@@ -27,8 +30,7 @@ function LinkToUserGroup(props: LinkToUserGroupProps) {
 
 
     const handleLink = async () => {
-        console.log('selectedUserGroup', selectedUserGroup)
-        const res = await linkResourcesToUserGroup(selectedUserGroup, courseStructure.course_uuid)
+        const res = await linkResourcesToUserGroup(selectedUserGroup, courseStructure.course_uuid, access_token)
         if (res.status === 200) {
             props.setUserGroupModal(false)
             toast.success('Successfully linked to usergroup')
@@ -37,7 +39,6 @@ function LinkToUserGroup(props: LinkToUserGroupProps) {
         else {
             toast.error('Error ' + res.status + ': ' + res.data.detail)
         }
-
     }
 
     useEffect(() => {
@@ -54,25 +55,25 @@ function LinkToUserGroup(props: LinkToUserGroupProps) {
                 <h1 className=' font-medium'>Users that are not part of the UserGroup will no longer have access to this course</h1>
             </div>
             <div className='p-4 flex-row flex justify-between items-center'>
-            
-            <div className='py-1'>
-                <span className='px-3 text-gray-400 font-bold rounded-full py-1 bg-gray-100 mx-3'>UserGroup Name </span>
-                <select
-                    onChange={(e) => setSelectedUserGroup(e.target.value)}
-                    defaultValue={selectedUserGroup}
-                >
-                    {usergroups && usergroups.map((group: any) => (
-                        <option key={group.id} value={group.id}>{group.name}</option>
-                    ))}
 
-                </select>
-            </div>
-            <div className='py-3'>
-                <button onClick={() => { handleLink() }} className='bg-green-700 text-white font-bold px-4 py-2 rounded-md shadow'>Link</button>
+                <div className='py-1'>
+                    <span className='px-3 text-gray-400 font-bold rounded-full py-1 bg-gray-100 mx-3'>UserGroup Name </span>
+                    <select
+                        onChange={(e) => setSelectedUserGroup(e.target.value)}
+                        defaultValue={selectedUserGroup}
+                    >
+                        {usergroups && usergroups.map((group: any) => (
+                            <option key={group.id} value={group.id}>{group.name}</option>
+                        ))}
+
+                    </select>
+                </div>
+                <div className='py-3'>
+                    <button onClick={() => { handleLink() }} className='bg-green-700 text-white font-bold px-4 py-2 rounded-md shadow'>Link</button>
+                </div>
             </div>
         </div>
-        </div>
-        
+
     )
 }
 

apps/web/components/Objects/Modals/Dash/OrgAccess/OrgInviteCodeGenerate.tsx

@@ -2,7 +2,7 @@ import { useOrg } from '@components/Contexts/OrgContext'
 import { getAPIUrl } from '@services/config/config'
 import { createInviteCode, createInviteCodeWithUserGroup } from '@services/organizations/invites'
 import { swrFetcher } from '@services/utils/ts/requests'
-import { Shield, Ticket } from 'lucide-react'
+import { Ticket } from 'lucide-react'
 import { useLHSession } from '@components/Contexts/LHSessionContext'
 import React, { useEffect } from 'react'
 import toast from 'react-hot-toast'
@@ -14,7 +14,8 @@ type OrgInviteCodeGenerateProps = {
 
 function OrgInviteCodeGenerate(props: OrgInviteCodeGenerateProps) {
     const org = useOrg() as any
-    const session = useLHSession()
+    const session = useLHSession() as any
+    const access_token = session.data.tokens.access_token;
     const [usergroup_id, setUsergroup_id] = React.useState(0);
     const { data: usergroups } = useSWR(
         org ? `${getAPIUrl()}usergroups/org/${org.id}` : null,

apps/web/components/Objects/Modals/Dash/OrgUserGroups/AddUserGroup.tsx

@@ -14,13 +14,16 @@ import { BarLoader } from 'react-spinners'
 import { createUserGroup } from '@services/usergroups/usergroups'
 import { mutate } from 'swr'
 import { getAPIUrl } from '@services/config/config'
+import { useLHSession } from '@components/Contexts/LHSessionContext'
 
 type AddUserGroupProps = {
     setCreateUserGroupModal: any
 }
 
 function AddUserGroup(props: AddUserGroupProps) {
-    const org = useOrg() as any
+    const org = useOrg() as any;
+    const session = useLHSession() as any
+    const access_token = session.data.tokens.access_token;
     const [userGroupName, setUserGroupName] = React.useState('')
     const [userGroupDescription, setUserGroupDescription] = React.useState('')
     const [isSubmitting, setIsSubmitting] = React.useState(false)
@@ -42,7 +45,7 @@ function AddUserGroup(props: AddUserGroupProps) {
             description: userGroupDescription,
             org_id: org.id
         }
-        const res = await createUserGroup(obj)
+        const res = await createUserGroup(obj, access_token)
         if (res.status == 200) {
             setIsSubmitting(false)
             mutate(`${getAPIUrl()}usergroups/org/${org.id}`)

apps/web/components/Objects/Modals/Dash/OrgUserGroups/ManageUsers.tsx

@@ -1,3 +1,4 @@
+import { useLHSession } from '@components/Contexts/LHSessionContext'
 import { useOrg } from '@components/Contexts/OrgContext'
 import { getAPIUrl } from '@services/config/config'
 import { linkUserToUserGroup, unLinkUserToUserGroup } from '@services/usergroups/usergroups'
@@ -14,6 +15,8 @@ type ManageUsersProps = {
 
 function ManageUsers(props: ManageUsersProps) {
   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
@@ -31,7 +34,7 @@ function ManageUsers(props: ManageUsersProps) {
   }
 
   const handleLinkUser = async (user_id: any) => {
-    const res = await linkUserToUserGroup(props.usergroup_id, user_id)
+    const res = await linkUserToUserGroup(props.usergroup_id, user_id,access_token)
     if (res.status === 200) {
       toast.success('User linked successfully')
       mutate(`${getAPIUrl()}usergroups/${props.usergroup_id}/users`)
@@ -41,7 +44,7 @@ function ManageUsers(props: ManageUsersProps) {
   }
 
   const handleUnlinkUser = async (user_id: any) => {
-    const res = await unLinkUserToUserGroup(props.usergroup_id, user_id)
+    const res = await unLinkUserToUserGroup(props.usergroup_id, user_id,access_token)
     if (res.status === 200) {
       toast.success('User unlinked successfully')
       mutate(`${getAPIUrl()}usergroups/${props.usergroup_id}/users`)

apps/web/components/Objects/Modals/Dash/OrgUsers/RolesUpdate.tsx

@@ -1,4 +1,5 @@
 'use client'
+import { useLHSession } from '@components/Contexts/LHSessionContext'
 import { useOrg } from '@components/Contexts/OrgContext'
 import FormLayout, {
   ButtonBlack,
@@ -22,6 +23,8 @@ interface Props {
 
 function RolesUpdate(props: Props) {
   const org = useOrg() as any
+  const session = useLHSession() as any
+    const access_token = session.data.tokens.access_token;
   const [isSubmitting, setIsSubmitting] = React.useState(false)
   const [assignedRole, setAssignedRole] = React.useState(
     props.alreadyAssignedRole
@@ -36,7 +39,7 @@ function RolesUpdate(props: Props) {
   const handleSubmit = async (e: any) => {
     e.preventDefault()
     setIsSubmitting(true)
-    const res = await updateUserRole(org.id, props.user.user.id, assignedRole)
+    const res = await updateUserRole(org.id, props.user.user.id, assignedRole,access_token)
 
     if (res.status === 200) {
       await mutate(`${getAPIUrl()}orgs/${org.id}/users`)