Use @nextcloud/axios to keep the CSRF token in sync

Signed-off-by: Christoph Wurst <[email protected]>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>

apps/accessibility/src/App.vue

@@ -17,7 +17,7 @@
 
 <script>
 import preview from './components/itemPreview';
-import axios from 'nextcloud-axios';
+import axios from '@nextcloud/axios';
 
 export default {
 	name: 'Accessibility',

apps/oauth2/src/App.vue

@@ -54,7 +54,7 @@
 </template>
 
 <script>
-import Axios from 'nextcloud-axios'
+import Axios from '@nextcloud/axios'
 import OAuthItem from './components/OAuthItem';
 
 export default {

apps/twofactor_backupcodes/src/service/BackupCodesService.js

@@ -1,4 +1,4 @@
-import Axios from 'nextcloud-axios'
+import Axios from '@nextcloud/axios'
 
 export function generateCodes () {
 	const url = OC.generateUrl('/apps/twofactor_backupcodes/settings/create');

core/src/components/login/ResetPassword.vue

@@ -75,7 +75,7 @@
 </template>
 
 <script>
-	import Axios from 'nextcloud-axios'
+	import Axios from '@nextcloud/axios'
 
 	import {generateUrl} from '../../OC/routing'
 

core/src/components/login/UpdatePassword.vue

@@ -61,7 +61,7 @@
 </template>
 
 <script>
-	import Axios from 'nextcloud-axios'
+	import Axios from '@nextcloud/axios'
 
 	export default {
 		name: 'UpdatePassword',

core/src/maintenance.js

@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import Axios from 'nextcloud-axios'
+import Axios from '@nextcloud/axios'
 
 import OC from './OC/index'
 

package.json

@@ -23,6 +23,7 @@
   "dependencies": {
     "@babel/polyfill": "^7.4.4",
     "@chenfengyuan/vue-qrcode": "^1.0.1",
+    "@nextcloud/axios": "^0.4.2",
     "@nextcloud/event-bus": "^0.2.1",
     "Select2": "git+https://github.com/select2/select2.git#3.4.8",
     "autosize": "^4.0.2",
@@ -42,7 +43,6 @@
     "lodash": "^4.17.15",
     "marked": "^0.7.0",
     "moment": "^2.24.0",
-    "nextcloud-axios": "^0.2.1",
     "nextcloud-password-confirmation": "^0.4.2",
     "nextcloud-vue": "^0.12.2",
     "nextcloud-vue-collections": "^0.5.6",

settings/src/components/AdminTwoFactor.vue

@@ -68,8 +68,7 @@
 </template>
 
 <script>
-	import Axios from 'nextcloud-axios'
-	import { mapState } from 'vuex'
+	import Axios from '@nextcloud/axios'
 	import {Multiselect} from 'nextcloud-vue'
 	import _ from 'lodash'
 

settings/src/components/AuthTokenSection.vue

@@ -33,7 +33,7 @@
 </template>
 
 <script>
-	import Axios from 'nextcloud-axios';
+	import Axios from '@nextcloud/axios';
 	import confirmPassword from 'nextcloud-password-confirmation';
 
 	import AuthTokenList from './AuthTokenList';

settings/src/store/api.js

@@ -20,8 +20,8 @@
  *
  */
 
-import axios from 'nextcloud-axios'
-import confirmPassword from 'nextcloud-password-confirmation' 
+import axios from '@nextcloud/axios'
+import confirmPassword from 'nextcloud-password-confirmation'
 
 const sanitize = function(url) {
 	return url.replace(/\/$/, ''); // Remove last url slash
@@ -47,17 +47,17 @@ export default {
 	 *
 	 * Since Promise.then().catch().then() will always execute the last then
 	 * this.$store.dispatch('action').then will always be executed
-	 * 
+	 *
 	 * If you want requireAdmin failure to also catch the API request failure
 	 * you will need to throw a new error in the api.get.catch()
-	 * 
+	 *
 	 * e.g
 	 *	api.requireAdmin().then((response) => {
 	 *		api.get('url')
 	 *			.then((response) => {API success})
 	 *			.catch((error) => {throw error;});
 	 *	}).catch((error) => {requireAdmin OR API failure});
-	 * 
+	 *
 	 * @returns {Promise}
 	 */
 	requireAdmin() {
@@ -78,4 +78,4 @@ export default {
 	delete(url, data) {
 		return axios.delete(sanitize(url), { data: data });
 	}
-};
+};