Remove usage of nextcloud-server

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>

3 files changed, 13 insertions, 12 deletions

diff --git a/src/components/ContactDetails/ContactDetailsAvatar.vue b/src/components/ContactDetails/ContactDetailsAvatar.vue
index cbccfdc9..fb510678 100644
--- a/src/components/ContactDetails/ContactDetailsAvatar.vue
+++ b/src/components/ContactDetails/ContactDetailsAvatar.vue
@@ -76,8 +76,8 @@
 import debounce from 'debounce'
 import { ActionLink, ActionButton } from 'nextcloud-vue'
 
-import { pickFileOrDirectory } from 'nextcloud-server/dist/files'
-import { generateRemoteUrl } from 'nextcloud-server/dist/router'
+import { getFilePickerBuilder } from 'nextcloud-dialogs'
+import { generateRemoteUrl } from 'nextcloud-router'
 
 const axios = () => import('axios')
 
@@ -200,18 +200,18 @@ export default {
 		},
 		async selectFilePicker() {
 			if (!this.loading) {
-				const file = await pickFileOrDirectory(
-					t('contacts', 'Pick an avatar'),
-					false,
-					[
+				const picker = getFilePickerBuilder(t('contacts', 'Pick an avatar'))
+					.setMimeTypeFilter([
 						'image/png',
 						'image/jpeg',
 						'image/gif',
 						'image/x-xbitmap',
 						'image/bmp',
-						'image/svg+xml'
-					]
-				)
+						'image/svg+xml',
+					])
+					.build()
+
+				const file = await picker.pick()
 				if (file) {
 					this.loading = true
 					try {
diff --git a/src/main.js b/src/main.js
index daa7bdfc..021ef966 100644
--- a/src/main.js
+++ b/src/main.js
@@ -28,7 +28,8 @@ import App from './App'
 import router from './router'
 import store from './store'
 import { sync } from 'vuex-router-sync'
-import { generateFilePath } from 'nextcloud-server/dist/router'
+import { generateFilePath } from 'nextcloud-router'
+import { getRequestToken } from 'nextcloud-auth'
 
 /** GLOBAL COMPONENTS AND DIRECTIVE */
 import { Actions, DatetimePicker, Multiselect, PopoverMenu, Modal } from 'nextcloud-vue'
@@ -38,7 +39,7 @@ import VueClipboard from 'vue-clipboard2'
 
 // CSP config for webpack dynamic chunk loading
 // eslint-disable-next-line
-__webpack_nonce__ = btoa(OC.requestToken)
+__webpack_nonce__ = btoa(getRequestToken())
 
 // Correct the root of the app for chunk loading
 // OC.linkTo matches the apps folders
diff --git a/src/router/index.js b/src/router/index.js
index b8a92b0a..8f195f5f 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -22,7 +22,7 @@
 
 import Vue from 'vue'
 import Router from 'vue-router'
-import { generateUrl } from 'nextcloud-server/dist/router'
+import { generateUrl } from 'nextcloud-router'
 import Contacts from 'Views/Contacts'
 
 Vue.use(Router)