refactor: remove useBaseFetch for @modrinth/api-client (#5596)

* Reapply "fix: start swapping useBaseFetch usages to api-client"

This reverts commit f4f33db7019ea861addb2c66c204d736800b7b6c.

* fix: bugs

* fix: analytics

* fix: lint

apps/frontend/src/pages/auth/authorize.vue

@@ -86,6 +86,7 @@ import {
 	Button,
 	commonMessages,
 	defineMessages,
+	injectModrinthClient,
 	injectNotificationManager,
 	IntlFormatted,
 	normalizeChildren,
@@ -96,8 +97,8 @@ import { computed } from 'vue'
 
 import { useAuth } from '@/composables/auth.js'
 import { useScopes } from '@/composables/auth/scopes.ts'
-import { useBaseFetch } from '@/composables/fetch.js'
 
+const client = injectModrinthClient()
 const { addNotification } = injectNotificationManager()
 const { formatMessage } = useVIntl()
 
@@ -139,20 +140,16 @@ const scope = router.query?.scope || false
 const state = router.query?.state || false
 
 const getFlowIdAuthorization = async () => {
-	const query = {
+	const params = {
 		client_id: clientId,
 		redirect_uri: redirectUri,
 		scope,
 	}
 	if (state) {
-		query.state = state
+		params.state = state
 	}
 
-	const authorization = await useBaseFetch('oauth/authorize', {
-		method: 'GET',
-		internal: true,
-		query,
-	}) // This will contain the flow_id and oauth_client_id for accepting the oauth on behalf of the user
+	const authorization = await client.labrinth.oauth_internal.authorize(params)
 
 	if (typeof authorization === 'string') {
 		await navigateTo(authorization, {
@@ -175,21 +172,13 @@ const {
 
 const { data: app } = useQuery({
 	queryKey: computed(() => ['oauth/app', clientId]),
-	queryFn: () =>
-		useBaseFetch('oauth/app/' + clientId, {
-			method: 'GET',
-			internal: true,
-		}),
+	queryFn: () => client.labrinth.oauth_internal.getApp(clientId),
 	enabled: computed(() => !!clientId),
 })
 
 const { data: createdBy } = useQuery({
 	queryKey: computed(() => ['user', app.value?.created_by]),
-	queryFn: () =>
-		useBaseFetch('user/' + app.value.created_by, {
-			method: 'GET',
-			apiVersion: 3,
-		}),
+	queryFn: () => client.labrinth.users_v2.get(app.value.created_by),
 	enabled: computed(() => !!app.value?.created_by),
 })
 
@@ -199,12 +188,8 @@ const scopeDefinitions = computed(() =>
 
 const onAuthorize = async () => {
 	try {
-		const res = await useBaseFetch('oauth/accept', {
-			method: 'POST',
-			internal: true,
-			body: {
-				flow: authorizationData.value.flow_id,
-			},
+		const res = await client.labrinth.oauth_internal.accept({
+			flow: authorizationData.value.flow_id,
 		})
 
 		if (typeof res === 'string') {
@@ -215,7 +200,7 @@ const onAuthorize = async () => {
 		}
 
 		throw new Error(formatMessage(messages.noRedirectUrlError))
-	} catch {
+	} catch (err) {
 		addNotification({
 			title: formatMessage(commonMessages.errorNotificationTitle),
 			text: err.data ? err.data.description : err,
@@ -226,11 +211,8 @@ const onAuthorize = async () => {
 
 const onReject = async () => {
 	try {
-		const res = await useBaseFetch('oauth/reject', {
-			method: 'POST',
-			body: {
-				flow: authorizationData.value.flow_id,
-			},
+		const res = await client.labrinth.oauth_internal.reject({
+			flow: authorizationData.value.flow_id,
 		})
 
 		if (typeof res === 'string') {
@@ -241,7 +223,7 @@ const onReject = async () => {
 		}
 
 		throw new Error(formatMessage(messages.noRedirectUrlError))
-	} catch {
+	} catch (err) {
 		addNotification({
 			title: formatMessage(commonMessages.errorNotificationTitle),
 			text: err.data ? err.data.description : err,

apps/frontend/src/pages/auth/reset-password.vue

@@ -69,6 +69,7 @@ import { KeyIcon, MailIcon, SendIcon } from '@modrinth/assets'
 import {
 	commonMessages,
 	defineMessages,
+	injectModrinthClient,
 	injectNotificationManager,
 	StyledInput,
 	useVIntl,
@@ -77,6 +78,7 @@ import { useQuery } from '@tanstack/vue-query'
 
 import HCaptcha from '@/components/ui/HCaptcha.vue'
 
+const client = injectModrinthClient()
 const { addNotification } = injectNotificationManager()
 const { formatMessage } = useVIntl()
 
@@ -167,10 +169,10 @@ const { data: globals } = useQuery({
 	queryKey: ['auth-globals'],
 	queryFn: async () => {
 		try {
-			return await useBaseFetch('globals', { internal: true })
+			return await client.labrinth.globals_internal.get()
 		} catch (err) {
 			console.error('Error fetching globals:', err)
-			return { captcha_enabled: true }
+			return { captcha_enabled: true, tax_compliance_thresholds: {} }
 		}
 	},
 })
@@ -181,12 +183,9 @@ const token = ref('')
 async function recovery() {
 	startLoading()
 	try {
-		await useBaseFetch('auth/password/reset', {
-			method: 'POST',
-			body: {
-				username: email.value,
-				challenge: token.value,
-			},
+		await client.labrinth.auth_v2.resetPasswordBegin({
+			username: email.value,
+			challenge: token.value,
 		})
 
 		addNotification({
@@ -211,12 +210,9 @@ const confirmNewPassword = ref('')
 async function changePassword() {
 	startLoading()
 	try {
-		await useBaseFetch('auth/password', {
-			method: 'PATCH',
-			body: {
-				new_password: newPassword.value,
-				flow: route.query.flow,
-			},
+		await client.labrinth.auth_v2.changePassword({
+			new_password: newPassword.value,
+			flow: route.query.flow,
 		})
 
 		addNotification({

apps/frontend/src/pages/auth/sign-in.vue

@@ -139,6 +139,7 @@ import {
 import {
 	commonMessages,
 	defineMessages,
+	injectModrinthClient,
 	injectNotificationManager,
 	IntlFormatted,
 	StyledInput,
@@ -149,6 +150,7 @@ import { useQuery, useQueryClient } from '@tanstack/vue-query'
 import HCaptcha from '@/components/ui/HCaptcha.vue'
 import { getAuthUrl, getLauncherRedirectUrl } from '@/composables/auth.js'
 
+const client = injectModrinthClient()
 const queryClient = useQueryClient()
 const { addNotification } = injectNotificationManager()
 const { formatMessage } = useVIntl()
@@ -211,10 +213,10 @@ const { data: globals } = useQuery({
 	queryKey: ['auth-globals'],
 	queryFn: async () => {
 		try {
-			return await useBaseFetch('globals', { internal: true })
+			return await client.labrinth.globals_internal.get()
 		} catch (err) {
 			console.error('Error fetching globals:', err)
-			return { captcha_enabled: true }
+			return { captcha_enabled: true, tax_compliance_thresholds: {} }
 		}
 	},
 })
@@ -228,13 +230,10 @@ const flow = ref(route.query.flow)
 async function beginPasswordSignIn() {
 	startLoading()
 	try {
-		const res = await useBaseFetch('auth/login', {
-			method: 'POST',
-			body: {
-				username: email.value,
-				password: password.value,
-				challenge: token.value,
-			},
+		const res = await client.labrinth.auth_v2.login({
+			username: email.value,
+			password: password.value,
+			challenge: token.value,
 		})
 
 		if (res.flow) {
@@ -257,12 +256,9 @@ const twoFactorCode = ref(null)
 async function begin2FASignIn() {
 	startLoading()
 	try {
-		const res = await useBaseFetch('auth/login/2fa', {
-			method: 'POST',
-			body: {
-				flow: flow.value,
-				code: twoFactorCode.value ? twoFactorCode.value.toString() : twoFactorCode.value,
-			},
+		const res = await client.labrinth.auth_v2.login2FA({
+			flow: flow.value,
+			code: twoFactorCode.value ? twoFactorCode.value.toString() : twoFactorCode.value,
 		})
 
 		await finishSignIn(res.session)

apps/frontend/src/pages/auth/sign-up.vue

@@ -141,6 +141,7 @@ import {
 	Checkbox,
 	commonMessages,
 	defineMessages,
+	injectModrinthClient,
 	injectNotificationManager,
 	IntlFormatted,
 	StyledInput,
@@ -151,6 +152,7 @@ import { useQuery } from '@tanstack/vue-query'
 import HCaptcha from '@/components/ui/HCaptcha.vue'
 import { getAuthUrl } from '@/composables/auth.js'
 
+const client = injectModrinthClient()
 const { addNotification } = injectNotificationManager()
 const { formatMessage } = useVIntl()
 
@@ -205,10 +207,10 @@ const { data: globals } = useQuery({
 	queryKey: ['auth-globals'],
 	queryFn: async () => {
 		try {
-			return await useBaseFetch('globals', { internal: true })
+			return await client.labrinth.globals_internal.get()
 		} catch (err) {
 			console.error('Error fetching globals:', err)
-			return { captcha_enabled: true }
+			return { captcha_enabled: true, tax_compliance_thresholds: {} }
 		}
 	},
 })
@@ -235,15 +237,12 @@ async function createAccount() {
 			captcha.value?.reset()
 		}
 
-		const res = await useBaseFetch('auth/create', {
-			method: 'POST',
-			body: {
-				username: username.value,
-				password: password.value,
-				email: email.value,
-				challenge: token.value,
-				sign_up_newsletter: subscribe.value,
-			},
+		const res = await client.labrinth.auth_v2.createAccount({
+			username: username.value,
+			password: password.value,
+			email: email.value,
+			challenge: token.value,
+			sign_up_newsletter: subscribe.value,
 		})
 
 		await useAuth(res.session)