Merge remote-tracking branch 'origin/main' into dependabot/npm_and_yarn/eslint-plugin-prettier-5.5.4

Author: svcAPLBot

src/components/AccountPopover.tsx

@@ -4,6 +4,7 @@ import React, { useState } from 'react'
 import { useDeleteCloudttyMutation } from 'redux/otomiApi'
 import { clearLocalStorage } from 'hooks/useLocalStorage'
 import { useHistory } from 'react-router-dom'
+import { useSession } from 'providers/Session'
 import MenuPopover from './MenuPopover'
 import { IconButtonAnimate } from './animate'
 import SettingMode from './SettingMode'
@@ -14,6 +15,7 @@ type Props = {
 
 export default function AccountPopover({ email }: Props) {
   const history = useHistory()
+  const { oboTeamId } = useSession()
   const [open, setOpen] = useState<HTMLElement | null>(null)
   const [deleteCloudtty] = useDeleteCloudttyMutation()
 
@@ -26,7 +28,7 @@ export default function AccountPopover({ email }: Props) {
   }
 
   const handleLogout = () => {
-    deleteCloudtty().finally(() => {
+    deleteCloudtty({ teamId: oboTeamId }).finally(() => {
       clearLocalStorage('oboTeamId')
       history.push('/logout')
     })

src/layouts/Shell.tsx

@@ -189,7 +189,7 @@ function Shell({ collapseClick }: Props): React.ReactElement {
     onSetIFrameUrl('')
     onToggleShell()
     onCloseShell()
-    deleteCloudtty()
+    deleteCloudtty({ teamId })
   }
 
   return (

src/redux/otomiApi.ts

@@ -286,13 +286,13 @@ const injectedRtkApi = api.injectEndpoints({
       query: (queryArg) => ({ url: `/v2/cloudtty`, params: { teamId: queryArg.teamId } }),
     }),
     deleteAplCloudtty: build.mutation<DeleteAplCloudttyApiResponse, DeleteAplCloudttyApiArg>({
-      query: () => ({ url: `/v2/cloudtty`, method: 'DELETE' }),
+      query: (queryArg) => ({ url: `/v2/cloudtty`, method: 'DELETE', params: { teamId: queryArg.teamId } }),
     }),
     connectCloudtty: build.query<ConnectCloudttyApiResponse, ConnectCloudttyApiArg>({
       query: (queryArg) => ({ url: `/v1/cloudtty`, params: { teamId: queryArg.teamId } }),
     }),
     deleteCloudtty: build.mutation<DeleteCloudttyApiResponse, DeleteCloudttyApiArg>({
-      query: () => ({ url: `/v1/cloudtty`, method: 'DELETE' }),
+      query: (queryArg) => ({ url: `/v1/cloudtty`, method: 'DELETE', params: { teamId: queryArg.teamId } }),
     }),
     getAllUsers: build.query<GetAllUsersApiResponse, GetAllUsersApiArg>({
       query: () => ({ url: `/v1/users` }),
@@ -4274,7 +4274,10 @@ export type ConnectAplCloudttyApiArg = {
   teamId?: string
 }
 export type DeleteAplCloudttyApiResponse = unknown
-export type DeleteAplCloudttyApiArg = void
+export type DeleteAplCloudttyApiArg = {
+  /** Id of the team */
+  teamId?: string
+}
 export type ConnectCloudttyApiResponse = /** status 200 Successfully stored cloudtty configuration */ {
   iFrameUrl?: string
 }
@@ -4283,7 +4286,10 @@ export type ConnectCloudttyApiArg = {
   teamId?: string
 }
 export type DeleteCloudttyApiResponse = unknown
-export type DeleteCloudttyApiArg = void
+export type DeleteCloudttyApiArg = {
+  /** Id of the team */
+  teamId?: string
+}
 export type GetAllUsersApiResponse = /** status 200 Successfully obtained all users configuration */ {
   id?: string
   email: string