Skip to content

Commit c08c5ac

Browse files
authored
fix(GHES): respect GITHUB_API_URL when creating installation access token (actions#38)
Follow up to actions#36. I just wanted to do some refactoring but turns out I missed to pass the custom `request` instance to `createAppAuth`. It will fallback to the default `request` which does not respect `GITHUB_API_URL`
1 parent c72844c commit c08c5ac

File tree

5 files changed

+16
-14
lines changed

5 files changed

+16
-14
lines changed

lib/main.js

+4-7
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
11
// @ts-check
22

3-
import core from "@actions/core";
4-
import { createAppAuth } from "@octokit/auth-app";
5-
import { request } from "@octokit/request";
6-
73
/**
84
* @param {string} appId
95
* @param {string} privateKey
106
* @param {string} repository
11-
* @param {core} core
12-
* @param {createAppAuth} createAppAuth
13-
* @param {request} request
7+
* @param {import("@actions/core")} core
8+
* @param {import("@octokit/auth-app").createAppAuth} createAppAuth
9+
* @param {import("@octokit/request").request} request
1410
*/
1511
export async function main(
1612
appId,
@@ -26,6 +22,7 @@ export async function main(
2622
const auth = createAppAuth({
2723
appId,
2824
privateKey,
25+
request,
2926
});
3027

3128
const appAuthentication = await auth({

lib/post.js

+2-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
// @ts-check
22

3-
import core from "@actions/core";
4-
import { request } from "@octokit/request";
5-
63
/**
7-
* @param {core} core
8-
* @param {request} request
4+
* @param {import("@actions/core")} core
5+
* @param {import("@octokit/request").request} request
96
*/
107
export async function post(core, request) {
118
const token = core.getState("token");

lib/request.js

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
import { request } from "@octokit/request";
2+
3+
export default request.defaults({
4+
baseUrl: process.env["GITHUB_API_URL"],
5+
headers: {
6+
"user-agent": "actions/create-github-app-token",
7+
},
8+
});

main.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
import core from "@actions/core";
44
import { createAppAuth } from "@octokit/auth-app";
5-
import { request } from "@octokit/request";
65

76
import { main } from "./lib/main.js";
7+
import request from "./lib/request.js";
88

99
if (!process.env.GITHUB_REPOSITORY) {
1010
throw new Error("GITHUB_REPOSITORY missing, must be set to '<owner>/<repo>'");

post.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// @ts-check
22

33
import core from "@actions/core";
4-
import { request } from "@octokit/request";
54

65
import { post } from "./lib/post.js";
6+
import request from "./lib/request.js";
77

88
post(
99
core,

0 commit comments

Comments
 (0)