split url into webUrl and localUrl (like mastodon)

4 files changed, 10 insertions, 10 deletions

diff --git a/packages/backend/test/e2e/2fa.ts b/packages/backend/test/e2e/2fa.ts
index 48e1bababb..f1f6cd1eb7 100644
--- a/packages/backend/test/e2e/2fa.ts
+++ b/packages/backend/test/e2e/2fa.ts
@@ -53,7 +53,7 @@ describe('2要素認証', () => {
 
 	const rpIdHash = (): Buffer => {
 		return crypto.createHash('sha256')
-			.update(Buffer.from(config.host, 'utf-8'))
+			.update(Buffer.from(config.webHost, 'utf-8'))
 			.digest();
 	};
 
@@ -103,7 +103,7 @@ describe('2要素認証', () => {
 					clientDataJSON: Buffer.from(JSON.stringify({
 						type: 'webauthn.create',
 						challenge: param.creationOptions.challenge,
-						origin: config.scheme + '://' + config.host,
+						origin: config.scheme + '://' + config.webHost,
 						androidPackageName: 'org.mozilla.firefox',
 					}), 'utf-8').toString('base64url'),
 					attestationObject: cbor.encode({
@@ -147,7 +147,7 @@ describe('2要素認証', () => {
 		const clientDataJSONBuffer = Buffer.from(JSON.stringify({
 			type: 'webauthn.get',
 			challenge: param.requestOptions.challenge,
-			origin: config.scheme + '://' + config.host,
+			origin: config.scheme + '://' + config.webHost,
 			androidPackageName: 'org.mozilla.firefox',
 		}), 'utf-8');
 		const hashedclientDataJSON = crypto.createHash('sha256')
@@ -189,7 +189,7 @@ describe('2要素認証', () => {
 		assert.notEqual(registerResponse.body.url, undefined);
 		assert.notEqual(registerResponse.body.secret, undefined);
 		assert.strictEqual(registerResponse.body.label, username);
-		assert.strictEqual(registerResponse.body.issuer, config.host);
+		assert.strictEqual(registerResponse.body.issuer, config.webHost);
 
 		const doneResponse = await api('i/2fa/done', {
 			token: otpToken(registerResponse.body.secret),
diff --git a/packages/backend/test/e2e/move.ts b/packages/backend/test/e2e/move.ts
index fd798bdb25..b873570a9b 100644
--- a/packages/backend/test/e2e/move.ts
+++ b/packages/backend/test/e2e/move.ts
@@ -34,7 +34,7 @@ describe('Account Move', () => {
 		jq = await jobQueue();
 
 		const config = loadConfig();
-		url = new URL(config.url);
+		url = new URL(config.webUrl);
 		const connection = await initTestDb(false);
 		root = await signup({ username: 'root' });
 		alice = await signup({ username: 'alice' });
diff --git a/packages/backend/test/unit/server/FileServerService.ts b/packages/backend/test/unit/server/FileServerService.ts
index c88175c5c7..e4bde36d17 100644
--- a/packages/backend/test/unit/server/FileServerService.ts
+++ b/packages/backend/test/unit/server/FileServerService.ts
@@ -109,7 +109,7 @@ describe('FileServerService', () => {
 		size?: number;
 	}) {
 		const accessKey = params.accessKey;
-		const url = params.uri ?? `${config.url}/files/${accessKey}`;
+		const url = params.uri ?? `${config.webUrl}/files/${accessKey}`;
 		await driveFilesRepository.insert({
 			id: idService.gen(),
 			userId: null,
@@ -582,7 +582,7 @@ describe('FileServerService', () => {
 			});
 
 			expect(res.statusCode).toBe(301);
-			expect(res.headers.location).toBe(`${config.url}/files/testkey`);
+			expect(res.headers.location).toBe(`${config.webUrl}/files/testkey`);
 			expect(res.headers['content-security-policy']).toBe('default-src \'none\'; img-src \'self\'; media-src \'self\'; style-src \'unsafe-inline\'');
 		});
 	});
@@ -755,7 +755,7 @@ describe('FileServerService', () => {
 
 			const res = await fastify.inject({
 				method: 'GET',
-				url: `/proxy/any?url=${encodeURIComponent(`${config.url}/files/${accessKey}`)}&origin=1`,
+				url: `/proxy/any?url=${encodeURIComponent(`${config.webUrl}/files/${accessKey}`)}&origin=1`,
 				headers: {
 					'user-agent': 'Mozilla/5.0',
 				},
diff --git a/packages/backend/test/utils.ts b/packages/backend/test/utils.ts
index f91fb7f9b1..2ac69256e0 100644
--- a/packages/backend/test/utils.ts
+++ b/packages/backend/test/utils.ts
@@ -39,8 +39,8 @@ export type SystemWebhookPayload = {
 
 const config = loadConfig();
 export const port = config.port;
-export const origin = config.url;
-export const host = new URL(config.url).host;
+export const origin = config.webUrl;
+export const host = new URL(config.webUrl).host;
 
 export const WEBHOOK_HOST = 'http://localhost:15080';
 export const WEBHOOK_PORT = 15080;