fix: allow cors for patch, put and delete (#1856)

* fix: allow cors for patch, put and delete

* refactor: add options in cors

* refactor: downgrade ts jest

Author: pyphilia

package.json

@@ -64,7 +64,7 @@
     "@graasp/etherpad-api": "2.1.1",
     "@graasp/sdk": "5.12.0",
     "@graasp/translations": "1.44.0",
-    "@rapideditor/country-coder": "5.3.1",
+    "@rapideditor/country-coder": "5.4.0",
     "@sentry/node": "7.119.2",
     "@sentry/tracing": "7.120.3",
     "@sinclair/typebox": "0.34.33",
@@ -165,7 +165,7 @@
     "nodemon": "3.1.9",
     "pino-pretty": "13.0.0",
     "prettier": "3.5.3",
-    "ts-jest": "29.3.2",
+    "ts-jest": "29.2.3",
     "ts-node": "10.9.2",
     "tsx": "4.19.3",
     "typescript": "5.8.3",

src/fastify.ts

@@ -57,6 +57,7 @@ const start = async () => {
       origin: [new RegExp(CORS_ORIGIN_REGEX)],
       credentials: true, // https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Allow-Credentials
       maxAge: 7200, // https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Max-Age
+      methods: ['HEAD', 'GET', 'POST', 'PATCH', 'PUT', 'DELETE', 'OPTIONS'],
     });
   }
 

src/logger.ts

@@ -1,7 +1,7 @@
 import type { pino } from 'pino';
 import { inject, singleton } from 'tsyringe';
 
-import { FastifyBaseLogger } from 'fastify';
+import { type FastifyBaseLogger } from 'fastify';
 import type { ChildLoggerOptions } from 'fastify/types/logger';
 
 import { FASTIFY_LOGGER_DI_KEY } from './di/constants';

src/services/item/plugins/app/appData/appData.service.ts

@@ -2,7 +2,7 @@ import { inject, singleton } from 'tsyringe';
 
 import {
   AppDataVisibility,
-  FileItemType,
+  type FileItemType,
   PermissionLevel,
   PermissionLevelCompare,
   PermissionLevelOptions,
@@ -56,7 +56,7 @@ const itemVisibilityAppDataAbility = (
 
 @singleton()
 export class AppDataService {
-  private fileItemType: FileItemType;
+  private readonly fileItemType: FileItemType;
   private readonly itemRepository: ItemRepository;
   private readonly appDataRepository: AppDataRepository;
   private readonly authorizationService: AuthorizationService;

src/services/item/plugins/etherpad/etherpad.service.ts

@@ -25,7 +25,7 @@ import { ItemService } from '../../item.service';
 import { MAX_SESSIONS_IN_COOKIE, PLUGIN_NAME } from './constants';
 import { EtherpadServerError, ItemMissingExtraError } from './errors';
 import { EtherpadServiceConfig } from './serviceConfig';
-import { PadNameFactory } from './types';
+import { type PadNameFactory } from './types';
 
 export class RandomPadNameFactory implements PadNameFactory {
   public getName() {

src/services/item/plugins/geolocation/itemGeolocation.repository.ts

@@ -1,6 +1,6 @@
 // this is an esm module, since we are using commonjs it can have unexpected behavior
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-expect-error
+// @ts-expect-error esm module
 import { iso1A2Code } from '@rapideditor/country-coder';
 import { SQL, and, between, desc, eq, or } from 'drizzle-orm';
 import fetch from 'node-fetch';

src/services/member/plugins/storage/memberStorage.service.ts

@@ -1,6 +1,6 @@
 import { inject, singleton } from 'tsyringe';
 
-import { FileItemType, MemberStorage, Pagination } from '@graasp/sdk';
+import type { FileItemType, MemberStorage, Pagination } from '@graasp/sdk';
 
 import { FILE_ITEM_TYPE_DI_KEY } from '../../../../di/constants';
 import { type DBConnection } from '../../../../drizzle/db';

yarn.lock

@@ -3242,12 +3242,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rapideditor/country-coder@npm:5.3.1":
-  version: 5.3.1
-  resolution: "@rapideditor/country-coder@npm:5.3.1"
+"@rapideditor/country-coder@npm:5.4.0":
+  version: 5.4.0
+  resolution: "@rapideditor/country-coder@npm:5.4.0"
   dependencies:
     which-polygon: "npm:^2.2.1"
-  checksum: 10/1e530171fda91aadc023c7d3f12901e268a235275fea82c4d2b9dd1a6421108869ac4ab37e2f0229ac01ae8e01e41cbd1ac1957f4566519fb357c7b705ab2083
+  checksum: 10/95ac11adf3447c2416641a657b4c70149bba8b25cb19238ab0355e2d025c93e4b2517052da0ea7c02820a0129a3501bd5586f2e058829558e69a4388e7e20a30
   languageName: node
   linkType: hard
 
@@ -5503,7 +5503,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"bs-logger@npm:^0.2.6":
+"bs-logger@npm:0.x":
   version: 0.2.6
   resolution: "bs-logger@npm:0.2.6"
   dependencies:
@@ -8351,7 +8351,7 @@ __metadata:
     "@graasp/translations": "npm:1.44.0"
     "@jest/globals": "npm:29.7.0"
     "@quobix/vacuum": "npm:0.16.5"
-    "@rapideditor/country-coder": "npm:5.3.1"
+    "@rapideditor/country-coder": "npm:5.4.0"
     "@sentry/node": "npm:7.119.2"
     "@sentry/tracing": "npm:7.120.3"
     "@sinclair/typebox": "npm:0.34.33"
@@ -8440,7 +8440,7 @@ __metadata:
     sharp: "npm:0.33.5"
     striptags: "npm:3.2.0"
     tmp-promise: "npm:3.0.3"
-    ts-jest: "npm:29.3.2"
+    ts-jest: "npm:29.2.3"
     ts-node: "npm:10.9.2"
     tsx: "npm:4.19.3"
     tsyringe: "npm:4.9.1"
@@ -10304,7 +10304,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lodash.memoize@npm:^4.1.2":
+"lodash.memoize@npm:4.x":
   version: 4.1.2
   resolution: "lodash.memoize@npm:4.1.2"
   checksum: 10/192b2168f310c86f303580b53acf81ab029761b9bd9caa9506a019ffea5f3363ea98d7e39e7e11e6b9917066c9d36a09a11f6fe16f812326390d8f3a54a1a6da
@@ -10438,7 +10438,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"make-error@npm:^1.1.1, make-error@npm:^1.3.6":
+"make-error@npm:1.x, make-error@npm:^1.1.1":
   version: 1.3.6
   resolution: "make-error@npm:1.3.6"
   checksum: 10/b86e5e0e25f7f777b77fabd8e2cbf15737972869d852a22b7e73c17623928fccb826d8e46b9951501d3f20e51ad74ba8c59ed584f610526a48f8ccf88aaec402
@@ -13549,20 +13549,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ts-jest@npm:29.3.2":
-  version: 29.3.2
-  resolution: "ts-jest@npm:29.3.2"
+"ts-jest@npm:29.2.3":
+  version: 29.2.3
+  resolution: "ts-jest@npm:29.2.3"
   dependencies:
-    bs-logger: "npm:^0.2.6"
+    bs-logger: "npm:0.x"
     ejs: "npm:^3.1.10"
-    fast-json-stable-stringify: "npm:^2.1.0"
+    fast-json-stable-stringify: "npm:2.x"
     jest-util: "npm:^29.0.0"
     json5: "npm:^2.2.3"
-    lodash.memoize: "npm:^4.1.2"
-    make-error: "npm:^1.3.6"
-    semver: "npm:^7.7.1"
-    type-fest: "npm:^4.39.1"
-    yargs-parser: "npm:^21.1.1"
+    lodash.memoize: "npm:4.x"
+    make-error: "npm:1.x"
+    semver: "npm:^7.5.3"
+    yargs-parser: "npm:^21.0.1"
   peerDependencies:
     "@babel/core": ">=7.0.0-beta.0 <8"
     "@jest/transform": ^29.0.0
@@ -13583,7 +13582,7 @@ __metadata:
       optional: true
   bin:
     ts-jest: cli.js
-  checksum: 10/62fb226a4df408174a3f28919c89440b2f5df4dec404bb49696591e61d75536b1c3be8ae726d187958a467654d82294d81d2dd70d9ec370542a30907183aaf61
+  checksum: 10/d3c3388cea8ea4a7f52c7c97e34a1abf1d83152fa0625ddea7b82c0e3599a786185b95d3e12a09eb27521adedc90780a3dc9df29156ca83f1094e163113ede62
   languageName: node
   linkType: hard
 
@@ -13779,13 +13778,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"type-fest@npm:^4.39.1":
-  version: 4.40.1
-  resolution: "type-fest@npm:4.40.1"
-  checksum: 10/907767cd7889c8f17d94f4a811ec27c33339a9134f6842a1a56b4d6ee87cb1d6b01332f366a3f03adc10923fd6d511d73b73076f7ab5256bf5c0b43a03ab6e8b
-  languageName: node
-  linkType: hard
-
 "typed-array-buffer@npm:^1.0.3":
   version: 1.0.3
   resolution: "typed-array-buffer@npm:1.0.3"
@@ -14417,7 +14409,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"yargs-parser@npm:^21.1.1":
+"yargs-parser@npm:^21.0.1, yargs-parser@npm:^21.1.1":
   version: 21.1.1
   resolution: "yargs-parser@npm:21.1.1"
   checksum: 10/9dc2c217ea3bf8d858041252d43e074f7166b53f3d010a8c711275e09cd3d62a002969a39858b92bbda2a6a63a585c7127014534a560b9c69ed2d923d113406e