Skip to content
This repository was archived by the owner on Mar 3, 2025. It is now read-only.

Commit 8886f57

Browse files
authored
Merge pull request #12 from saitamau-maximum/feat/expand-org-members-api-per-page
fix: org内メンバーかどうかの判定方法をそれ専用のAPIで行うように変更
2 parents 0fd2db7 + 897d33e commit 8886f57

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

webapp/app/routes/cb.tsx

+7-4
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,15 @@ export const loader: LoaderFunction = async ({ context, request }) => {
6565

6666
const { data: user } = await userOctokit.request('GET /user')
6767

68-
const { data: maximumMembers } = await appOctokit.request(
69-
'GET /orgs/{org}/members',
70-
{ org: 'saitamau-maximum', per_page: 100 },
68+
const checkIsOrgUserRes = await appOctokit.request(
69+
'GET /orgs/{org}/members/{username}',
70+
{
71+
org: 'saitamau-maximum',
72+
username: user.login,
73+
},
7174
)
7275

73-
const isMember = maximumMembers.some(member => member.id === user.id)
76+
const isMember = (checkIsOrgUserRes.status as number) === 204
7477
session.set('id', String(user.id))
7578
session.set('display_name', user.login)
7679
session.set('profile_image', user.avatar_url)

0 commit comments

Comments
 (0)