From 18490b07650d77d7fe376970b749af5a8c672fd6 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Wed, 25 Nov 2020 11:04:18 +0100
Subject: Fix migration and test

---
 shared/extra-utils/feeds/feeds.ts |  4 ++--
 shared/extra-utils/users/users.ts | 32 ++++++++++++++++++++++----------
 2 files changed, 24 insertions(+), 12 deletions(-)

(limited to 'shared')

diff --git a/shared/extra-utils/feeds/feeds.ts b/shared/extra-utils/feeds/feeds.ts
index bafbb9f94..957d4499c 100644
--- a/shared/extra-utils/feeds/feeds.ts
+++ b/shared/extra-utils/feeds/feeds.ts
@@ -13,14 +13,14 @@ function getXMLfeed (url: string, feed: FeedType, format?: string) {
           .expect('Content-Type', /xml/)
 }
 
-function getJSONfeed (url: string, feed: FeedType, query: any = {}) {
+function getJSONfeed (url: string, feed: FeedType, query: any = {}, statusCodeExpected = 200) {
   const path = '/feeds/' + feed + '.json'
 
   return request(url)
           .get(path)
           .query(query)
           .set('Accept', 'application/json')
-          .expect(200)
+          .expect(statusCodeExpected)
           .expect('Content-Type', /json/)
 }
 
diff --git a/shared/extra-utils/users/users.ts b/shared/extra-utils/users/users.ts
index 4d0986ce3..ebb8bc257 100644
--- a/shared/extra-utils/users/users.ts
+++ b/shared/extra-utils/users/users.ts
@@ -1,12 +1,12 @@
+import { omit } from 'lodash'
 import * as request from 'supertest'
-import { makePostBodyRequest, makePutBodyRequest, updateAvatarRequest } from '../requests/requests'
+import { UserUpdateMe } from '../../models/users'
 import { UserAdminFlag } from '../../models/users/user-flag.model'
 import { UserRegister } from '../../models/users/user-register.model'
 import { UserRole } from '../../models/users/user-role'
+import { makeGetRequest, makePostBodyRequest, makePutBodyRequest, updateAvatarRequest } from '../requests/requests'
 import { ServerInfo } from '../server/servers'
 import { userLogin } from './login'
-import { UserUpdateMe } from '../../models/users'
-import { omit } from 'lodash'
 
 type CreateUserArgs = {
   url: string
@@ -109,15 +109,26 @@ function getMyUserInformation (url: string, accessToken: string, specialStatus =
           .expect('Content-Type', /json/)
 }
 
-function getUserScopedTokens (url: string, accessToken: string, specialStatus = 200) {
+function getUserScopedTokens (url: string, token: string, statusCodeExpected = 200) {
   const path = '/api/v1/users/scoped-tokens'
 
-  return request(url)
-          .get(path)
-          .set('Accept', 'application/json')
-          .set('Authorization', 'Bearer ' + accessToken)
-          .expect(specialStatus)
-          .expect('Content-Type', /json/)
+  return makeGetRequest({
+    url,
+    path,
+    token,
+    statusCodeExpected
+  })
+}
+
+function renewUserScopedTokens (url: string, token: string, statusCodeExpected = 200) {
+  const path = '/api/v1/users/scoped-tokens'
+
+  return makePostBodyRequest({
+    url,
+    path,
+    token,
+    statusCodeExpected
+  })
 }
 
 function deleteMe (url: string, accessToken: string, specialStatus = 204) {
@@ -359,6 +370,7 @@ export {
   unblockUser,
   askResetPassword,
   resetPassword,
+  renewUserScopedTokens,
   updateMyAvatar,
   askSendVerifyEmail,
   generateUserAccessToken,
-- 
cgit v1.2.3