Skip to content

Commit 797fd64

Browse files
committed
fix non-autofixable biome errors (axios import)
1 parent 68756c3 commit 797fd64

File tree

3 files changed

+12
-6
lines changed

3 files changed

+12
-6
lines changed

apps/app/src/server/service/g2g-transfer.ts

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,19 @@
11
import { ConfigSource } from '@growi/core';
22
import type { IUser } from '@growi/core/dist/interfaces';
3+
// biome-ignore lint/style/noRestrictedImports: TODO: check effects of using custom axios
34
import rawAxios, { type AxiosRequestConfig } from 'axios';
45
import FormData from 'form-data';
56
import type { ReadStream } from 'fs';
67
import { createReadStream } from 'fs';
7-
import mongoose, { Types as MongooseTypes } from 'mongoose';
8+
import mongoose, {
9+
type HydratedDocument,
10+
Types as MongooseTypes,
11+
} from 'mongoose';
812
import { basename } from 'path';
913
import type { Readable } from 'stream';
1014

1115
import { G2G_PROGRESS_STATUS } from '~/interfaces/g2g-transfer';
16+
import type { ITransferKey } from '~/interfaces/transfer-key';
1217
import { GrowiArchiveImportOption } from '~/models/admin/growi-archive-import-option';
1318
import { ImportMode } from '~/models/admin/import-mode';
1419
import TransferKeyModel from '~/server/models/transfer-key';
@@ -422,7 +427,7 @@ export class G2GTransferPusherService implements Pusher {
422427
for await (const attachmentBatch of attachmentsCursor.pipe(batchStream)) {
423428
for await (const attachment of attachmentBatch) {
424429
logger.debug(`processing attachment: ${attachment}`);
425-
let fileStream;
430+
let fileStream: Readable;
426431
try {
427432
// get read stream of each attachment
428433
fileStream = await fileUploadService.findDeliveryFile(attachment);
@@ -672,7 +677,7 @@ export class G2GTransferReceiverService implements Receiver {
672677
);
673678

674679
// Save TransferKey document
675-
let tkd;
680+
let tkd: HydratedDocument<ITransferKey>;
676681
try {
677682
tkd = await TransferKeyModel.create({
678683
_id: uuid,

apps/app/src/server/service/passport.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import { Strategy as SamlStrategy } from 'passport-saml';
1717
import urljoin from 'url-join';
1818

1919
import type { IExternalAuthProviderType } from '~/interfaces/external-auth-provider';
20+
import axios from '~/utils/axios';
2021
import loggerFactory from '~/utils/logger';
2122

2223
import S2sMessage from '../models/vo/s2s-message';
@@ -812,11 +813,10 @@ class PassportService implements S2sMessageHandlable {
812813
async isOidcHostReachable(issuerHost: string): Promise<boolean | undefined> {
813814
try {
814815
const metadataUrl = this.getOIDCMetadataURL(issuerHost);
815-
const client = require('axios').default;
816-
axiosRetry(client, {
816+
axiosRetry(axios, {
817817
retries: 3,
818818
});
819-
const response = await client.get(metadataUrl);
819+
const response = await axios.get(metadataUrl);
820820
// Check for valid OIDC Issuer configuration
821821
if (!response.data.issuer) {
822822
logger.debug('OidcStrategy: Invalid OIDC Issuer configurations');

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
function getAxios(team, token) {
2+
// biome-ignore lint/style/noRestrictedImports: TODO: check effects of using custom axios
23
return require('axios').create({
34
baseURL: `https://${team}.qiita.com/api/v2`,
45
headers: {

0 commit comments

Comments
 (0)