From 2c51ffac8f14b6fa7809bd6e941812251d8159c3 Mon Sep 17 00:00:00 2001
From: Ferdinand Thiessen <opensource@fthiessen.de>
Date: Wed, 24 Jun 2026 20:58:07 +0200
Subject: [PATCH] fix(core): use proper API routes for recommended apps

- resolves https://github.com/nextcloud/server/issues/61313

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
---
 build/frontend-legacy/webpack.common.cjs      |  5 ++-
 core/src/components/setup/RecommendedApps.vue | 45 +++++++++----------
 2 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/build/frontend-legacy/webpack.common.cjs b/build/frontend-legacy/webpack.common.cjs
index f9b6f435c0313..f5331f00e2c77 100644
--- a/build/frontend-legacy/webpack.common.cjs
+++ b/build/frontend-legacy/webpack.common.cjs
@@ -17,8 +17,7 @@ const appVersion = readFileSync(path.join(__dirname, '../../version.php')).toStr
 const isDev = process.env.NODE_ENV === 'development'
 
 /**
- *
- * @param modules
+ * @param {Record<string, Record<string, string>>} modules - The modules object from webpack.modules.cjs
  */
 function formatOutputFromModules(modules) {
 	// merge all configs into one object, and use AppID to generate the fileNames
@@ -255,6 +254,8 @@ const config = {
 		alias: {
 			// make sure to use the handlebar runtime when importing
 			handlebars: 'handlebars/runtime',
+			// allow to import from root (cross reference already migrated apps)
+			'~*': path.resolve(__dirname, '../../*'),
 		},
 		extensions: ['*', '.ts', '.js', '.vue'],
 		extensionAlias: {
diff --git a/core/src/components/setup/RecommendedApps.vue b/core/src/components/setup/RecommendedApps.vue
index 1abb6ffba1664..e6cfa119c92cd 100644
--- a/core/src/components/setup/RecommendedApps.vue
+++ b/core/src/components/setup/RecommendedApps.vue
@@ -59,14 +59,13 @@
 </template>
 
 <script>
-import axios from '@nextcloud/axios'
 import { loadState } from '@nextcloud/initial-state'
 import { t } from '@nextcloud/l10n'
-import { PwdConfirmationMode } from '@nextcloud/password-confirmation'
-import { generateUrl, imagePath } from '@nextcloud/router'
+import { imagePath } from '@nextcloud/router'
 import NcButton from '@nextcloud/vue/components/NcButton'
 import NcCheckboxRadioSwitch from '@nextcloud/vue/components/NcCheckboxRadioSwitch'
 import logger from '../../logger.js'
+import * as appstoreApi from '~/apps/appstore/src/service/api.ts'
 
 const recommended = {
 	calendar: {
@@ -130,11 +129,11 @@ export default {
 
 	async mounted() {
 		try {
-			const { data } = await axios.get(generateUrl('settings/apps/list'))
-			logger.info(`${data.apps.length} apps fetched`)
+			const apps = await appstoreApi.getApps()
+			logger.info(`${apps.length} apps fetched`)
 
-			this.apps = data.apps.map((app) => Object.assign(app, { loading: false, installationError: false, isSelected: app.isCompatible }))
-			logger.debug(`${this.recommendedApps.length} recommended apps found`, { apps: this.recommendedApps })
+			this.apps = apps.map((app) => Object.assign(app, { loading: false, installationError: false, isSelected: app.isCompatible }))
+			this.$nextTick(() => logger.debug(`${this.recommendedApps.length} recommended apps found`, { apps: this.recommendedApps }))
 
 			this.showInstallButton = true
 		} catch (error) {
@@ -161,27 +160,25 @@ export default {
 			const appIds = apps.map((app) => app.id)
 			logger.debug(`installing ${apps.length} recommended apps`, { appIds })
 
-			try {
-				await axios.post(
-					generateUrl('settings/apps/enable'),
-					{ appIds, groups: [] },
-					{ confirmPassword: PwdConfirmationMode.Strict },
-				)
-				apps.forEach((app) => {
-					app.loading = false
-					app.active = true
-				})
-				logger.info('all recommended apps installed, redirecting …')
-				window.location = this.defaultPageUrl
-			} catch (error) {
-				logger.error('could not install recommended apps', { error })
-				apps.forEach((app) => {
+			const promises = Promise.allSettled(appIds.map((appId) => appstoreApi.enableApp(appId)))
+			for (const app of apps) {
+				app.loading = true
+			}
+
+			const results = await promises
+			for (let i = 0; i < results.length; i++) {
+				const result = results[i]
+				const app = apps[i]
+				if (result.status === 'rejected') {
+					logger.error(`could not install recommended app ${app.id}`, { error: result.reason })
 					app.loading = false
 					app.isSelected = false
 					app.installationError = true
-				})
-				this.installingApps = false
+				} else {
+					app.active = true
+				}
 			}
+			this.installingApps = false
 		},
 
 		customIcon(appId) {