BC-8941 Replace request-promise (part 2)

package.json

@@ -257,8 +257,6 @@
 		"prom-client": "^15.1.3",
 		"qs": "^6.14.0",
 		"reflect-metadata": "^0.2.2",
-		"request-promise-core": "^1.1.4",
-		"request-promise-native": "^1.0.9",
 		"response-time": "^2.3.3",
 		"rimraf": "^6.0.1",
 		"rss-parser": "^3.13.0",

src/services/edusharing/services/MerlinTokenGenerator.js

@@ -1,5 +1,5 @@
 const { Configuration } = require('@hpi-schul-cloud/commons');
-const request = require('request-promise-native');
+const axios = require('axios');
 const { getCounty } = require('../helpers');
 
 class MerlinTokenGenerator {
@@ -8,7 +8,9 @@ class MerlinTokenGenerator {
 	}
 
 	async post(options) {
-		return request.post(options);
+		const res = await axios(options);
+
+		return res.data;
 	}
 
 	async getMerlinCredentials(county = null) {
@@ -58,7 +60,7 @@ class MerlinTokenGenerator {
 			headers: {
 				'Content-Type': 'application/x-www-form-urlencoded',
 			},
-			form: {
+			data: {
 				username: credentials.username,
 				password: credentials.password,
 			},

src/services/etherpad/utils/EtherpadClient.js

@@ -1,5 +1,4 @@
-const rp = require('request-promise-native');
-const rpErrors = require('request-promise-core/errors');
+const axios = require('axios');
 
 const { Configuration } = require('@hpi-schul-cloud/commons');
 const { BadRequest, Conflict } = require('../../../errors');
@@ -40,93 +39,58 @@ class EtherpadClient {
 		};
 	}
 
-	createSettings(
-		{
-			method = 'POST',
-			endpoint,
-			formDef = {
-				apikey: Configuration.get('ETHERPAD__API_KEY'),
-			},
-			body,
-		},
-		params = {}
-	) {
-		const form = { ...formDef, ...params };
+	createOptions(endpoint, params = {}) {
+		const apikey = Configuration.get('ETHERPAD__API_KEY');
+		const data = { apikey, ...params };
 		return {
-			method,
-			uri: `${this.uri()}/${endpoint}`,
-			form,
-			body,
-			json: false,
+			method: 'POST',
+			url: `${this.uri()}/${endpoint}`,
+			data,
 		};
 	}
 
 	handleEtherpadResponse(res) {
-		const responseJSON = JSON.parse(res);
+		const responseJSON = res.data;
 		switch (responseJSON.code) {
 			case 0:
 				return responseJSON;
 			case 1:
-				throw new Conflict(responseJSON.message, rpErrors.RequestError(responseJSON.message, res));
+				throw new Conflict(res);
 			default:
-				throw new BadRequest(responseJSON.message, rpErrors.RequestError(responseJSON.message, res));
+				throw new BadRequest(res);
 		}
 	}
 
 	createOrGetAuthor(params) {
-		return rp(
-			this.createSettings(
-				{
-					endpoint: 'createAuthorIfNotExistsFor',
-				},
-				params
-			)
-		)
+		const options = this.createOptions('createAuthorIfNotExistsFor', params);
+		return axios(options)
 			.then((res) => this.handleEtherpadResponse(res))
 			.catch((err) => {
 				throw new BadRequest(this.err.createOrGetAuthor, err);
 			});
 	}
 
 	createOrGetGroup(params) {
-		return rp(
-			this.createSettings(
-				{
-					endpoint: 'createGroupIfNotExistsFor',
-				},
-				params
-			)
-		)
+		const options = this.createOptions('createGroupIfNotExistsFor', params);
+		return axios(options)
 			.then((res) => this.handleEtherpadResponse(res))
 			.catch((err) => {
 				throw new BadRequest(this.err.createOrGetGroup, err);
 			});
 	}
 
 	getActiveSessions(params) {
-		return rp(
-			this.createSettings(
-				{
-					endpoint: 'listSessionsOfAuthor',
-				},
-				params
-			)
-		)
+		const options = this.createOptions('listSessionsOfAuthor', params);
+		return axios(options)
 			.then((res) => this.handleEtherpadResponse(res))
 			.catch((err) => {
 				throw new BadRequest(this.err.getActiveSessions, err);
 			});
 	}
 
 	createSession(params) {
-		return rp(
-			this.createSettings(
-				{
-					endpoint: 'createSession',
-				},
-				params
-			)
-		)
+		const options = this.createOptions('createSession', params);
+		return axios(options)
 			.then((res) => this.handleEtherpadResponse(res))
 			.catch((err) => {
 				throw new BadRequest(this.err.createSession, err);
@@ -140,14 +104,8 @@ class EtherpadClient {
 				sourceID: params.oldPadId,
 				destinationID: newPadId,
 			};
-			return rp(
-				this.createSettings(
-					{
-						endpoint: 'copyPad',
-					},
-					copyParams
-				)
-			)
+			const options = this.createOptions('copyPad', copyParams);
+			return axios(options)
 				.then((res) => {
 					const response = this.handleEtherpadResponse(res);
 					response.data = {
@@ -159,14 +117,8 @@ class EtherpadClient {
 					throw new BadRequest(this.err.copyOldPadToGroupPad, err);
 				});
 		}
-		return rp(
-			this.createSettings(
-				{
-					endpoint: 'createGroupPad',
-				},
-				params
-			)
-		)
+		const options = this.createOptions('createGroupPad', params);
+		return axios(options)
 			.then((res) => this.handleEtherpadResponse(res))
 			.catch((err) => {
 				// pad is already there, just return the constructed pad path

src/services/fileStorage/proxy-service.js

@@ -1,6 +1,6 @@
 const fs = require('fs');
 const url = require('url');
-const rp = require('request-promise-native');
+const axios = require('axios');
 const { Configuration } = require('@hpi-schul-cloud/commons');
 const { filesRepo } = require('../../components/fileStorage/repo');
 
@@ -29,10 +29,7 @@ const { sortRoles } = require('../role/utils/rolesHelper');
 const { userModel } = require('../user/model');
 const logger = require('../../logger');
 const { equal: equalIds } = require('../../helper/compare').ObjectId;
-const {
-	FILE_SECURITY_CHECK_MAX_FILE_SIZE,
-	SECURITY_CHECK_SERVICE_PATH,
-} = require('../../../config/globals');
+const { FILE_SECURITY_CHECK_MAX_FILE_SIZE, SECURITY_CHECK_SERVICE_PATH } = require('../../../config/globals');
 const AWSS3Strategy = require('./strategies/awsS3');
 
 const sanitizeObj = (obj) => {
@@ -110,20 +107,20 @@ const prepareSecurityCheck = async (file, userId, strategy) => {
 			.then((signedUrl) => {
 				const params = {
 					url: Configuration.get('FILE_SECURITY_CHECK_SERVICE_URI'),
+					method: 'POST',
 					auth: {
 						user: Configuration.get('FILE_SECURITY_SERVICE_USERNAME'),
 						pass: Configuration.get('FILE_SECURITY_SERVICE_PASSWORD'),
 					},
-					body: {
+					data: {
 						download_uri: signedUrl,
 						callback_uri: url.resolve(
 							Configuration.get('API_HOST'),
 							`${SECURITY_CHECK_SERVICE_PATH}${file.securityCheck.requestToken}`
 						),
 					},
-					json: true,
 				};
-				const send = rp.post(params);
+				const send = axios(params);
 				return send;
 			});
 	}
@@ -775,10 +772,10 @@ const newFileService = {
 				if (Configuration.get('REQUEST_OPTION__KEEP_ALIVE')) {
 					headers.Connection = 'Keep-Alive';
 				}
-				return rp({
+				return axios({
 					method: 'PUT',
-					uri: signedUrl.url,
-					body: buffer,
+					url: signedUrl.url,
+					data: buffer,
 					headers,
 				});
 			})

src/services/oauth2/hydra.js

@@ -1,23 +1,24 @@
-const request = require('request-promise-native');
+const axios = require('axios');
 
 const mockTlsTermination = {
 	'X-Forwarded-Proto': 'https',
 };
 
 module.exports = (hydraUrl) => {
 	return {
-		introspectOAuth2Token: (token, scope) => {
+		introspectOAuth2Token: async (token, scope) => {
 			const options = {
-				uri: `${hydraUrl}/oauth2/introspect`,
+				url: `${hydraUrl}/oauth2/introspect`,
 				method: 'POST',
-				body: `token=${token}&scope=${scope}`,
+				data: `token=${token}&scope=${scope}`,
 				headers: {
 					...mockTlsTermination,
 					'Content-Type': 'application/x-www-form-urlencoded',
 				},
-				json: true,
 			};
-			return request(options);
+			const res = await axios(options);
+
+			return res.data;
 		},
 	};
 };

src/services/rocketChat/services/rocketChatChannel.js

@@ -1,4 +1,3 @@
-const request = require('request-promise-native');
 const { BadRequest } = require('../../../errors');
 const { makeStringRCConform } = require('../helpers');
 const { TEAM_FEATURES } = require('../../teams/model');

src/services/sync/strategies/TSP/TSP.js

@@ -1,4 +1,4 @@
-const rp = require('request-promise-native');
+const axios = require('axios');
 const url = require('url');
 const moment = require('moment');
 const { JWE, JWK, JWS } = require('jose');
@@ -219,15 +219,16 @@ class TspApi {
 	 */
 	async request(path, lastChange = new Date(0)) {
 		const lastChangeDate = moment(lastChange).format('YYYY-MM-DD HH:mm:ss.SSS');
-
-		const requestUrl = url.resolve(BASE_URL, path);
-		const response = await rp(requestUrl, {
+		const options = {
+			url: url.resolve(BASE_URL, path),
 			headers: this.getHeaders(),
-			qs: {
+			params: {
 				dtLetzteAenderung: lastChangeDate,
 			},
-		});
-		return JSON.parse(response);
+		};
+		const response = await axios(options);
+
+		return response.data;
 	}
 }
 

src/services/wopi/index.js

@@ -2,7 +2,7 @@
 /**
  * Provides a basic wopi - endpoint, https://wopirest.readthedocs.io/en/latest/index.html
  */
-const rp = require('request-promise-native');
+const axios = require('axios');
 const { static: staticContent } = require('@feathersjs/express');
 const path = require('path');
 
@@ -140,12 +140,14 @@ class WopiFilesContentsService {
 					})
 					.then((signedUrl) => {
 						const opt = {
-							uri: signedUrl.url,
-							encoding: null,
+							url: signedUrl.url,
+							responseType: 'arraybuffer',
 						};
-						return rp(opt).catch((err) => {
-							logger.warning(new Error(err));
-						});
+						return axios(opt)
+							.then((res) => res.data)
+							.catch((err) => {
+								logger.warning(new Error(err));
+							});
 					})
 					.catch((err) => {
 						logger.warning(new Error(err));
@@ -188,12 +190,11 @@ class WopiFilesContentsService {
 					// put binary content directly to file in storage
 					const options = {
 						method: 'PUT',
-						uri: signedUrl.url,
-						contentType: file.type,
-						body: data,
+						url: signedUrl.url,
+						data,
 					};
 
-					return rp(options)
+					return axios(options)
 						.then(() =>
 							FileModel.findOneAndUpdate(
 								{ _id: file._id },