split url into webUrl and localUrl (like mastodon)stable

4 files changed, 15 insertions, 15 deletions

diff --git a/packages/backend/test/e2e/2fa.ts b/packages/backend/test/e2e/2fa.ts
index 289359a2ce..756a720652 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({
@@ -149,7 +149,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')
@@ -191,7 +191,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/activitypub.ts b/packages/backend/test/unit/activitypub.ts
index ff93e1be07..8575159606 100644
--- a/packages/backend/test/unit/activitypub.ts
+++ b/packages/backend/test/unit/activitypub.ts
@@ -713,13 +713,13 @@ describe('ActivityPub', () => {
 			it('should include id', async () => {
 				const collection = await rendererService.renderRepliesCollection(note.id);
 
-				expect(collection.id).toBe(`${config.url}/notes/${note.id}/replies`);
+				expect(collection.id).toBe(`${config.webUrl}/notes/${note.id}/replies`);
 			});
 
 			it('should include first', async () => {
 				const collection = await rendererService.renderRepliesCollection(note.id);
 
-				expect(collection.first).toBe(`${config.url}/notes/${note.id}/replies?page=true`);
+				expect(collection.first).toBe(`${config.webUrl}/notes/${note.id}/replies?page=true`);
 			});
 
 			it('should include totalItems', async () => {
@@ -740,19 +740,19 @@ describe('ActivityPub', () => {
 				it('should include id', async () => {
 					const collection = await rendererService.renderRepliesCollectionPage(note.id, 'abc123');
 
-					expect(collection.id).toBe(`${config.url}/notes/${note.id}/replies?page=true&until_id=abc123`);
+					expect(collection.id).toBe(`${config.webUrl}/notes/${note.id}/replies?page=true&until_id=abc123`);
 				});
 
 				it('should include partOf', async () => {
 					const collection = await rendererService.renderRepliesCollectionPage(note.id, 'abc123');
 
-					expect(collection.partOf).toBe(`${config.url}/notes/${note.id}/replies`);
+					expect(collection.partOf).toBe(`${config.webUrl}/notes/${note.id}/replies`);
 				});
 
 				it('should include first', async () => {
 					const collection = await rendererService.renderRepliesCollectionPage(note.id, 'abc123');
 
-					expect(collection.first).toBe(`${config.url}/notes/${note.id}/replies?page=true`);
+					expect(collection.first).toBe(`${config.webUrl}/notes/${note.id}/replies?page=true`);
 				});
 
 				it('should include totalItems', async () => {
@@ -778,19 +778,19 @@ describe('ActivityPub', () => {
 				it('should include id', async () => {
 					const collection = await rendererService.renderRepliesCollectionPage(note.id, undefined);
 
-					expect(collection.id).toBe(`${config.url}/notes/${note.id}/replies?page=true`);
+					expect(collection.id).toBe(`${config.webUrl}/notes/${note.id}/replies?page=true`);
 				});
 
 				it('should include partOf', async () => {
 					const collection = await rendererService.renderRepliesCollectionPage(note.id, undefined);
 
-					expect(collection.partOf).toBe(`${config.url}/notes/${note.id}/replies`);
+					expect(collection.partOf).toBe(`${config.webUrl}/notes/${note.id}/replies`);
 				});
 
 				it('should include first', async () => {
 					const collection = await rendererService.renderRepliesCollectionPage(note.id, undefined);
 
-					expect(collection.first).toBe(`${config.url}/notes/${note.id}/replies?page=true`);
+					expect(collection.first).toBe(`${config.webUrl}/notes/${note.id}/replies?page=true`);
 				});
 
 				it('should include totalItems', async () => {
diff --git a/packages/backend/test/utils.ts b/packages/backend/test/utils.ts
index 52cfb8ac93..742f9fe97c 100644
--- a/packages/backend/test/utils.ts
+++ b/packages/backend/test/utils.ts
@@ -40,8 +40,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;