Skip to content

support: Reapply biome configuration for app apiv3 routes (app-settings, page) #10555

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yuki-takei merged 4 commits into from
Dec 4, 2025
Merged

support: Reapply biome configuration for app apiv3 routes (app-settings, page) #10555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fe1dfce
Reapply "Merge pull request #10532 from growilabs/support/156162-1740…
arafubeatbox Nov 30, 2025
84687fe
fix all page not found
arafubeatbox Nov 30, 2025
75db1a2
refactor page get route
arafubeatbox Dec 1, 2025
225dd23
run biome autofix
arafubeatbox Dec 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions apps/app/.eslintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@ module.exports = {
'src/server/routes/apiv3/user/**',
'src/server/routes/apiv3/personal-setting/**',
'src/server/routes/apiv3/security-settings/**',
'src/server/routes/apiv3/app-settings/**',
'src/server/routes/apiv3/page/**',
'src/server/routes/apiv3/*.ts',
],
settings: {
Expand Down
109 changes: 72 additions & 37 deletions apps/app/src/server/routes/apiv3/app-settings/file-upload-setting.integ.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,25 +17,34 @@ const mockActivityId = '507f1f77bcf86cd799439011';
mockRequire.stopAll();

mockRequire('~/server/middlewares/access-token-parser', {
accessTokenParser: () => (_req: Request, _res: ApiV3Response, next: () => void) => next(),
accessTokenParser:
() => (_req: Request, _res: ApiV3Response, next: () => void) =>
next(),
});

mockRequire('../../../middlewares/login-required', () => (_req: Request, _res: ApiV3Response, next: () => void) => next());
mockRequire('../../../middlewares/admin-required', () => (_req: Request, _res: ApiV3Response, next: () => void) => next());
mockRequire(
'../../../middlewares/login-required',
() => (_req: Request, _res: ApiV3Response, next: () => void) => next(),
);
mockRequire(
'../../../middlewares/admin-required',
() => (_req: Request, _res: ApiV3Response, next: () => void) => next(),
);

mockRequire('../../../middlewares/add-activity', {
generateAddActivityMiddleware: () => (_req: Request, res: ApiV3Response, next: () => void) => {
res.locals = res.locals || {};
res.locals.activity = { _id: mockActivityId };
next();
},
generateAddActivityMiddleware:
() => (_req: Request, res: ApiV3Response, next: () => void) => {
res.locals = res.locals || {};
res.locals.activity = { _id: mockActivityId };
next();
},
});

describe('file-upload-setting route', () => {
let app: express.Application;
let crowiMock: Crowi;

beforeEach(async() => {
beforeEach(async () => {
// Initialize configManager for each test
const s2sMessagingServiceMock = mock<S2sMessagingService>();
configManager.setS2sMessagingService(s2sMessagingServiceMock);
Expand All @@ -59,14 +68,16 @@ describe('file-upload-setting route', () => {
// Mock apiv3 response methods
app.use((_req, res, next) => {
const apiRes = res as ApiV3Response;
apiRes.apiv3 = data => res.json(data);
apiRes.apiv3Err = (error, statusCode = 500) => res.status(statusCode).json({ error });
apiRes.apiv3 = (data) => res.json(data);
apiRes.apiv3Err = (error, statusCode = 500) =>
res.status(statusCode).json({ error });
next();
});

// Import and mount the actual router using dynamic import
const fileUploadSettingModule = await import('./file-upload-setting');
const fileUploadSettingRouterFactory = (fileUploadSettingModule as any).default || fileUploadSettingModule;
const fileUploadSettingRouterFactory =
(fileUploadSettingModule as any).default || fileUploadSettingModule;
const fileUploadSettingRouter = fileUploadSettingRouterFactory(crowiMock);
app.use('/', fileUploadSettingRouter);
});
Expand All @@ -75,7 +86,7 @@ describe('file-upload-setting route', () => {
mockRequire.stopAll();
});

it('should update file upload type to local', async() => {
it('should update file upload type to local', async () => {
const response = await request(app)
.put('/')
.send({
Expand All @@ -89,7 +100,7 @@ describe('file-upload-setting route', () => {
});

describe('AWS settings', () => {
const setupAwsSecret = async(secret: string) => {
const setupAwsSecret = async (secret: string) => {
await configManager.updateConfigs({
'app:fileUploadType': 'aws',
'aws:s3SecretAccessKey': toNonBlankString(secret),
Expand All @@ -99,11 +110,13 @@ describe('file-upload-setting route', () => {
await configManager.loadConfigs();
};

it('should preserve existing s3SecretAccessKey when not included in request', async() => {
it('should preserve existing s3SecretAccessKey when not included in request', async () => {
const existingSecret = 'existing-secret-key-12345';
await setupAwsSecret(existingSecret);

expect(configManager.getConfig('aws:s3SecretAccessKey')).toBe(existingSecret);
expect(configManager.getConfig('aws:s3SecretAccessKey')).toBe(
existingSecret,
);

const response = await request(app)
.put('/')
Expand All @@ -117,15 +130,19 @@ describe('file-upload-setting route', () => {

await configManager.loadConfigs();

expect(configManager.getConfig('aws:s3SecretAccessKey')).toBe(existingSecret);
expect(configManager.getConfig('aws:s3SecretAccessKey')).toBe(
existingSecret,
);
expect(response.body.responseParams.fileUploadType).toBe('aws');
});

it('should update s3SecretAccessKey when new value is provided in request', async() => {
it('should update s3SecretAccessKey when new value is provided in request', async () => {
const existingSecret = 'existing-secret-key-12345';
await setupAwsSecret(existingSecret);

expect(configManager.getConfig('aws:s3SecretAccessKey')).toBe(existingSecret);
expect(configManager.getConfig('aws:s3SecretAccessKey')).toBe(
existingSecret,
);

const newSecret = 'new-secret-key-67890';
const response = await request(app)
Expand All @@ -145,11 +162,13 @@ describe('file-upload-setting route', () => {
expect(response.body.responseParams.fileUploadType).toBe('aws');
});

it('should remove s3SecretAccessKey when empty string is provided in request', async() => {
it('should remove s3SecretAccessKey when empty string is provided in request', async () => {
const existingSecret = 'existing-secret-key-12345';
await setupAwsSecret(existingSecret);

expect(configManager.getConfig('aws:s3SecretAccessKey')).toBe(existingSecret);
expect(configManager.getConfig('aws:s3SecretAccessKey')).toBe(
existingSecret,
);

const response = await request(app)
.put('/')
Expand All @@ -170,7 +189,7 @@ describe('file-upload-setting route', () => {
});

describe('GCS settings', () => {
const setupGcsSecret = async(apiKeyPath: string) => {
const setupGcsSecret = async (apiKeyPath: string) => {
await configManager.updateConfigs({
'app:fileUploadType': 'gcs',
'gcs:apiKeyJsonPath': toNonBlankString(apiKeyPath),
Expand All @@ -179,11 +198,13 @@ describe('file-upload-setting route', () => {
await configManager.loadConfigs();
};

it('should preserve existing gcsApiKeyJsonPath when not included in request', async() => {
it('should preserve existing gcsApiKeyJsonPath when not included in request', async () => {
const existingApiKeyPath = '/path/to/existing-api-key.json';
await setupGcsSecret(existingApiKeyPath);

expect(configManager.getConfig('gcs:apiKeyJsonPath')).toBe(existingApiKeyPath);
expect(configManager.getConfig('gcs:apiKeyJsonPath')).toBe(
existingApiKeyPath,
);

const response = await request(app)
.put('/')
Expand All @@ -196,15 +217,19 @@ describe('file-upload-setting route', () => {

await configManager.loadConfigs();

expect(configManager.getConfig('gcs:apiKeyJsonPath')).toBe(existingApiKeyPath);
expect(configManager.getConfig('gcs:apiKeyJsonPath')).toBe(
existingApiKeyPath,
);
expect(response.body.responseParams.fileUploadType).toBe('gcs');
});

it('should update gcsApiKeyJsonPath when new value is provided in request', async() => {
it('should update gcsApiKeyJsonPath when new value is provided in request', async () => {
const existingApiKeyPath = '/path/to/existing-api-key.json';
await setupGcsSecret(existingApiKeyPath);

expect(configManager.getConfig('gcs:apiKeyJsonPath')).toBe(existingApiKeyPath);
expect(configManager.getConfig('gcs:apiKeyJsonPath')).toBe(
existingApiKeyPath,
);

const newApiKeyPath = '/path/to/new-api-key.json';
const response = await request(app)
Expand All @@ -223,11 +248,13 @@ describe('file-upload-setting route', () => {
expect(response.body.responseParams.fileUploadType).toBe('gcs');
});

it('should remove gcsApiKeyJsonPath when empty string is provided in request', async() => {
it('should remove gcsApiKeyJsonPath when empty string is provided in request', async () => {
const existingApiKeyPath = '/path/to/existing-api-key.json';
await setupGcsSecret(existingApiKeyPath);

expect(configManager.getConfig('gcs:apiKeyJsonPath')).toBe(existingApiKeyPath);
expect(configManager.getConfig('gcs:apiKeyJsonPath')).toBe(
existingApiKeyPath,
);

const response = await request(app)
.put('/')
Expand All @@ -247,7 +274,7 @@ describe('file-upload-setting route', () => {
});

describe('Azure settings', () => {
const setupAzureSecret = async(secret: string) => {
const setupAzureSecret = async (secret: string) => {
await configManager.updateConfigs({
'app:fileUploadType': 'azure',
'azure:clientSecret': toNonBlankString(secret),
Expand All @@ -259,11 +286,13 @@ describe('file-upload-setting route', () => {
await configManager.loadConfigs();
};

it('should preserve existing azureClientSecret when not included in request', async() => {
it('should preserve existing azureClientSecret when not included in request', async () => {
const existingSecret = 'existing-azure-secret-12345';
await setupAzureSecret(existingSecret);

expect(configManager.getConfig('azure:clientSecret')).toBe(existingSecret);
expect(configManager.getConfig('azure:clientSecret')).toBe(
existingSecret,
);

const response = await request(app)
.put('/')
Expand All @@ -279,15 +308,19 @@ describe('file-upload-setting route', () => {

await configManager.loadConfigs();

expect(configManager.getConfig('azure:clientSecret')).toBe(existingSecret);
expect(configManager.getConfig('azure:clientSecret')).toBe(
existingSecret,
);
expect(response.body.responseParams.fileUploadType).toBe('azure');
});

it('should update azureClientSecret when new value is provided in request', async() => {
it('should update azureClientSecret when new value is provided in request', async () => {
const existingSecret = 'existing-azure-secret-12345';
await setupAzureSecret(existingSecret);

expect(configManager.getConfig('azure:clientSecret')).toBe(existingSecret);
expect(configManager.getConfig('azure:clientSecret')).toBe(
existingSecret,
);

const newSecret = 'new-azure-secret-67890';
const response = await request(app)
Expand All @@ -309,11 +342,13 @@ describe('file-upload-setting route', () => {
expect(response.body.responseParams.fileUploadType).toBe('azure');
});

it('should remove azureClientSecret when empty string is provided in request', async() => {
it('should remove azureClientSecret when empty string is provided in request', async () => {
const existingSecret = 'existing-azure-secret-12345';
await setupAzureSecret(existingSecret);

expect(configManager.getConfig('azure:clientSecret')).toBe(existingSecret);
expect(configManager.getConfig('azure:clientSecret')).toBe(
existingSecret,
);

const response = await request(app)
.put('/')
Expand Down
Loading
Loading