Merge pull request #43758 from nextcloud/fix/OCSResponse

chore(files_sharing): use `OCSResponse` from `@nextcloud/typings`

apps/files_external/src/services/externalStorage.ts

@@ -21,8 +21,8 @@
  */
 // eslint-disable-next-line n/no-extraneous-import
 import type { AxiosResponse } from 'axios'
-import type { OCSResponse } from '../../../files_sharing/src/services/SharingService'
 import type { ContentsWithRoot } from '@nextcloud/files'
+import type { OCSResponse } from '@nextcloud/typings/ocs'
 
 import { Folder, Permission } from '@nextcloud/files'
 import { generateOcsUrl, generateRemoteUrl, generateUrl } from '@nextcloud/router'
@@ -83,7 +83,7 @@ const entryToFolder = (ocsEntry: MountEntry): Folder => {
 }
 
 export const getContents = async (): Promise<ContentsWithRoot> => {
-	const response = await axios.get(generateOcsUrl('apps/files_external/api/v1/mounts')) as AxiosResponse<OCSResponse<MountEntry>>
+	const response = await axios.get(generateOcsUrl('apps/files_external/api/v1/mounts')) as AxiosResponse<OCSResponse<MountEntry[]>>
 	const contents = response.data.ocs.data.map(entryToFolder)
 
 	return {

apps/files_sharing/src/services/SharingService.spec.ts

@@ -19,12 +19,13 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  */
+import type { OCSResponse } from '@nextcloud/typings/ocs'
 import { expect } from '@jest/globals'
-import axios from '@nextcloud/axios'
 import { Type } from '@nextcloud/sharing'
 import * as auth from '@nextcloud/auth'
+import axios from '@nextcloud/axios'
 
-import { getContents, type OCSResponse } from './SharingService'
+import { getContents } from './SharingService'
 import { File, Folder } from '@nextcloud/files'
 import logger from './logger'
 

apps/files_sharing/src/services/SharingService.ts

@@ -21,6 +21,7 @@
  */
 /* eslint-disable camelcase, n/no-extraneous-import */
 import type { AxiosPromise } from 'axios'
+import type { OCSResponse } from '@nextcloud/typings/ocs'
 
 import { Folder, File, type ContentsWithRoot } from '@nextcloud/files'
 import { generateOcsUrl, generateRemoteUrl } from '@nextcloud/router'
@@ -31,17 +32,6 @@ import logger from './logger'
 
 export const rootPath = `/files/${getCurrentUser()?.uid}`
 
-export type OCSResponse<T> = {
-	ocs: {
-		meta: {
-			status: string
-			statuscode: number
-			message: string
-		},
-		data: T[]
-	}
-}
-
 const headers = {
 	'Content-Type': 'application/json',
 }

apps/files_sharing/src/views/shares.spec.ts

@@ -20,12 +20,12 @@
  *
  */
 /* eslint-disable n/no-extraneous-import */
+import type { OCSResponse } from '@nextcloud/typings/ocs'
 import { expect } from '@jest/globals'
 import { Folder, Navigation, View, getNavigation } from '@nextcloud/files'
 import axios from '@nextcloud/axios'
 
 import '../main'
-import { type OCSResponse } from '../services/SharingService'
 import registerSharingViews from './shares'
 
 declare global {