Przeglądaj źródła

fix non-autofixable biome errors (axios import)

Futa Arai 4 miesięcy temu
rodzic
commit
797fd64e20

+ 8 - 3
apps/app/src/server/service/g2g-transfer.ts

@@ -1,14 +1,19 @@
 import { ConfigSource } from '@growi/core';
 import { ConfigSource } from '@growi/core';
 import type { IUser } from '@growi/core/dist/interfaces';
 import type { IUser } from '@growi/core/dist/interfaces';
+// biome-ignore lint/style/noRestrictedImports: TODO: check effects of using custom axios
 import rawAxios, { type AxiosRequestConfig } from 'axios';
 import rawAxios, { type AxiosRequestConfig } from 'axios';
 import FormData from 'form-data';
 import FormData from 'form-data';
 import type { ReadStream } from 'fs';
 import type { ReadStream } from 'fs';
 import { createReadStream } from 'fs';
 import { createReadStream } from 'fs';
-import mongoose, { Types as MongooseTypes } from 'mongoose';
+import mongoose, {
+  type HydratedDocument,
+  Types as MongooseTypes,
+} from 'mongoose';
 import { basename } from 'path';
 import { basename } from 'path';
 import type { Readable } from 'stream';
 import type { Readable } from 'stream';
 
 
 import { G2G_PROGRESS_STATUS } from '~/interfaces/g2g-transfer';
 import { G2G_PROGRESS_STATUS } from '~/interfaces/g2g-transfer';
+import type { ITransferKey } from '~/interfaces/transfer-key';
 import { GrowiArchiveImportOption } from '~/models/admin/growi-archive-import-option';
 import { GrowiArchiveImportOption } from '~/models/admin/growi-archive-import-option';
 import { ImportMode } from '~/models/admin/import-mode';
 import { ImportMode } from '~/models/admin/import-mode';
 import TransferKeyModel from '~/server/models/transfer-key';
 import TransferKeyModel from '~/server/models/transfer-key';
@@ -422,7 +427,7 @@ export class G2GTransferPusherService implements Pusher {
     for await (const attachmentBatch of attachmentsCursor.pipe(batchStream)) {
     for await (const attachmentBatch of attachmentsCursor.pipe(batchStream)) {
       for await (const attachment of attachmentBatch) {
       for await (const attachment of attachmentBatch) {
         logger.debug(`processing attachment: ${attachment}`);
         logger.debug(`processing attachment: ${attachment}`);
-        let fileStream;
+        let fileStream: Readable;
         try {
         try {
           // get read stream of each attachment
           // get read stream of each attachment
           fileStream = await fileUploadService.findDeliveryFile(attachment);
           fileStream = await fileUploadService.findDeliveryFile(attachment);
@@ -672,7 +677,7 @@ export class G2GTransferReceiverService implements Receiver {
     );
     );
 
 
     // Save TransferKey document
     // Save TransferKey document
-    let tkd;
+    let tkd: HydratedDocument<ITransferKey>;
     try {
     try {
       tkd = await TransferKeyModel.create({
       tkd = await TransferKeyModel.create({
         _id: uuid,
         _id: uuid,

+ 3 - 3
apps/app/src/server/service/passport.ts

@@ -17,6 +17,7 @@ import { Strategy as SamlStrategy } from 'passport-saml';
 import urljoin from 'url-join';
 import urljoin from 'url-join';
 
 
 import type { IExternalAuthProviderType } from '~/interfaces/external-auth-provider';
 import type { IExternalAuthProviderType } from '~/interfaces/external-auth-provider';
+import axios from '~/utils/axios';
 import loggerFactory from '~/utils/logger';
 import loggerFactory from '~/utils/logger';
 
 
 import S2sMessage from '../models/vo/s2s-message';
 import S2sMessage from '../models/vo/s2s-message';
@@ -812,11 +813,10 @@ class PassportService implements S2sMessageHandlable {
   async isOidcHostReachable(issuerHost: string): Promise<boolean | undefined> {
   async isOidcHostReachable(issuerHost: string): Promise<boolean | undefined> {
     try {
     try {
       const metadataUrl = this.getOIDCMetadataURL(issuerHost);
       const metadataUrl = this.getOIDCMetadataURL(issuerHost);
-      const client = require('axios').default;
-      axiosRetry(client, {
+      axiosRetry(axios, {
         retries: 3,
         retries: 3,
       });
       });
-      const response = await client.get(metadataUrl);
+      const response = await axios.get(metadataUrl);
       // Check for valid OIDC Issuer configuration
       // Check for valid OIDC Issuer configuration
       if (!response.data.issuer) {
       if (!response.data.issuer) {
         logger.debug('OidcStrategy: Invalid OIDC Issuer configurations');
         logger.debug('OidcStrategy: Invalid OIDC Issuer configurations');

+ 1 - 0
apps/app/src/server/service/rest-qiita-API.js

@@ -1,4 +1,5 @@
 function getAxios(team, token) {
 function getAxios(team, token) {
+  // biome-ignore lint/style/noRestrictedImports: TODO: check effects of using custom axios
   return require('axios').create({
   return require('axios').create({
     baseURL: `https://${team}.qiita.com/api/v2`,
     baseURL: `https://${team}.qiita.com/api/v2`,
     headers: {
     headers: {