Skip to content

Commit 4d70d69

Browse files
authored
fix(setup): do not enter setup mode if HOST environment variable is set (probot#1538)
1 parent 6dec1fa commit 4d70d69

4 files changed

Lines changed: 8 additions & 2 deletions

File tree

src/apps/setup.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ export const setupAppFactory = (
2121
// If not on Glitch or Production, create a smee URL
2222
if (
2323
process.env.NODE_ENV !== "production" &&
24-
!(process.env.PROJECT_DOMAIN || process.env.WEBHOOK_PROXY_URL)
24+
!(process.env.PROJECT_DOMAIN || process.env.WEBHOOK_PROXY_URL || host)
2525
) {
2626
await setup.createWebhookChannel();
2727
}

src/manifest-creation.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,11 +82,13 @@ export class ManifestCreation {
8282
options
8383
);
8484

85-
const { id, webhook_secret, pem } = response.data;
85+
const { id, client_id, client_secret, webhook_secret, pem } = response.data;
8686
await this.updateEnv({
8787
APP_ID: id.toString(),
8888
PRIVATE_KEY: `"${pem}"`,
8989
WEBHOOK_SECRET: webhook_secret,
90+
GITHUB_CLIENT_ID: client_id,
91+
GITHUB_CLIENT_SECRET: client_secret,
9092
});
9193

9294
return response.data.html_url;

test/apps/__snapshots__/setup.test.ts.snap

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ Array [
1010
Array [
1111
Object {
1212
"APP_ID": "id",
13+
"GITHUB_CLIENT_ID": "Iv1.8a61f9b3a7aba766",
14+
"GITHUB_CLIENT_SECRET": "1726be1638095a19edd134c77bde3aa2ece1e5d8",
1315
"PRIVATE_KEY": "\\"pem\\"",
1416
"WEBHOOK_SECRET": "webhook_secret",
1517
},

test/apps/setup.test.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,8 @@ describe("Setup app", () => {
9898
id: "id",
9999
pem: "pem",
100100
webhook_secret: "webhook_secret",
101+
client_id: "Iv1.8a61f9b3a7aba766",
102+
client_secret: "1726be1638095a19edd134c77bde3aa2ece1e5d8",
101103
});
102104

103105
await request(server.expressApp)

0 commit comments

Comments
 (0)