Merge 31ae610bb1 into 3a9173015c

core/src/OCP/appconfig.js

@@ -1,102 +0,0 @@
-/**
- * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
- * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
- * SPDX-License-Identifier: AGPL-3.0-or-later
- */
-
-import { generateOcsUrl } from '@nextcloud/router'
-import $ from 'jquery'
-import _ from 'underscore'
-import OC from '../OC/index.js'
-
-/**
- * @param {string} method 'post' or 'delete'
- * @param {string} endpoint endpoint
- * @param {object} [options] destructuring object
- * @param {object} [options.data] option data
- * @param {Function} [options.success] success callback
- * @param {Function} [options.error] error callback
- */
-function call(method, endpoint, options) {
-	if ((method === 'post' || method === 'delete') && OC.PasswordConfirmation.requiresPasswordConfirmation()) {
-		OC.PasswordConfirmation.requirePasswordConfirmation(_.bind(call, this, method, endpoint, options))
-		return
-	}
-
-	options = options || {}
-	$.ajax({
-		type: method.toUpperCase(),
-		url: generateOcsUrl('apps/provisioning_api/api/v1/config/apps') + endpoint,
-		data: options.data || {},
-		success: options.success,
-		error: options.error,
-	})
-}
-
-/**
- * @param {object} [options] destructuring object
- * @param {Function} [options.success] success callback
- * @since 11.0.0
- */
-export function getApps(options) {
-	call('get', '', options)
-}
-
-/**
- * @param {string} app app id
- * @param {object} [options] destructuring object
- * @param {Function} [options.success] success callback
- * @param {Function} [options.error] error callback
- * @since 11.0.0
- */
-export function getKeys(app, options) {
-	call('get', '/' + app, options)
-}
-
-/**
- * @param {string} app app id
- * @param {string} key key
- * @param {string | Function} defaultValue default value
- * @param {object} [options] destructuring object
- * @param {Function} [options.success] success callback
- * @param {Function} [options.error] error callback
- * @since 11.0.0
- */
-export function getValue(app, key, defaultValue, options) {
-	options = options || {}
-	options.data = {
-		defaultValue,
-	}
-
-	call('get', '/' + app + '/' + key, options)
-}
-
-/**
- * @param {string} app app id
- * @param {string} key key
- * @param {string} value value
- * @param {object} [options] destructuring object
- * @param {Function} [options.success] success callback
- * @param {Function} [options.error] error callback
- * @since 11.0.0
- */
-export function setValue(app, key, value, options) {
-	options = options || {}
-	options.data = {
-		value,
-	}
-
-	call('post', '/' + app + '/' + key, options)
-}
-
-/**
- * @param {string} app app id
- * @param {string} key key
- * @param {object} [options] destructuring object
- * @param {Function} [options.success] success callback
- * @param {Function} [options.error] error callback
- * @since 11.0.0
- */
-export function deleteKey(app, key, options) {
-	call('delete', '/' + app + '/' + key, options)
-}

core/src/OCP/appconfig.ts

@@ -0,0 +1,102 @@
+/**
+ * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+import axios from '@nextcloud/axios'
+import { confirmPassword, isPasswordConfirmationRequired, PwdConfirmationMode } from '@nextcloud/password-confirmation'
+import { generateOcsUrl } from '@nextcloud/router'
+
+/**
+ * @param method - 'post' or 'delete'
+ * @param endpoint - endpoint endpoint
+ * @param options - destructuring object
+ * @param options.data - option data
+ * @param options.success - success callback
+ * @param options.error - error callback
+ */
+async function call(method: string, endpoint: string, options: { data?: unknown, success?: (data: unknown) => void, error?: (e: unknown) => void } = {}) {
+	if ((method === 'post' || method === 'delete') && isPasswordConfirmationRequired(PwdConfirmationMode.Lax)) {
+		await confirmPassword()
+	}
+
+	try {
+		const { data } = await axios.request({
+			method: method.toLowerCase(),
+			url: generateOcsUrl('apps/provisioning_api/api/v1/config/apps') + endpoint,
+			data: options.data || {},
+		})
+		options.success?.(data.ocs.data)
+	} catch (error) {
+		options.error?.(error)
+	}
+}
+
+/**
+ * @param [options] destructuring object
+ * @param [options.success] success callback
+ * @since 11.0.0
+ */
+export function getApps(options) {
+	call('get', '', options)
+}
+
+/**
+ * @param app app id
+ * @param [options] destructuring object
+ * @param [options.success] success callback
+ * @param [options.error] error callback
+ * @since 11.0.0
+ */
+export function getKeys(app, options) {
+	call('get', '/' + app, options)
+}
+
+/**
+ * @param app app id
+ * @param key key
+ * @param defaultValue default value
+ * @param [options] destructuring object
+ * @param [options.success] success callback
+ * @param [options.error] error callback
+ * @since 11.0.0
+ */
+export function getValue(app, key, defaultValue, options) {
+	options = options || {}
+	options.data = {
+		defaultValue,
+	}
+
+	call('get', '/' + app + '/' + key, options)
+}
+
+/**
+ * @param app app id
+ * @param key key
+ * @param value value
+ * @param [options] destructuring object
+ * @param [options.success] success callback
+ * @param [options.error] error callback
+ * @since 11.0.0
+ */
+export function setValue(app, key, value, options) {
+	options = options || {}
+	options.data = {
+		value,
+	}
+
+	call('post', '/' + app + '/' + key, options)
+}
+
+/**
+ * @param app app id
+ * @param key key
+ * @param [options] destructuring object
+ * @param [options.success] success callback
+ * @param [options.error] error callback
+ * @since 11.0.0
+ */
+export function deleteKey(app, key, options) {
+	call('delete', '/' + app + '/' + key, options)
+}

core/src/OCP/index.js

@@ -5,7 +5,7 @@
 
 import { loadState } from '@nextcloud/initial-state'
 import Accessibility from './accessibility.js'
-import * as AppConfig from './appconfig.js'
+import * as AppConfig from './appconfig.ts'
 import Collaboration from './collaboration.js'
 import * as Comments from './comments.js'
 import Loader from './loader.js'