blsmedia/bot
2
0
Fork 0
Code Activity

fix: 🎨 Formatting

Browse Source
This commit is contained in:
Baptiste Arnaud
2022-04-30 07:10:02 -07:00
parent 3db753e886
commit fe26e89902
2 changed files with 31 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
apps/builder/pages/api/auth/[...nextauth].ts
View File

@@ -65,14 +65,16 @@ if (
process.env.NEXT_PUBLIC_GITLAB_CLIENT_ID && process.env.NEXT_PUBLIC_GITLAB_CLIENT_ID &&
process.env.GITLAB_CLIENT_SECRET process.env.GITLAB_CLIENT_SECRET
) { ) {
const BASE_URL = process.env.NEXT_PUBLIC_GITLAB_BASE_URL || 'gitlab.com' const BASE_URL = process.env.GITLAB_BASE_URL || 'https://gitlab.com'
providers.push(GitlabProvider({ providers.push(
clientId: process.env.NEXT_PUBLIC_GITLAB_CLIENT_ID, GitlabProvider({
clientSecret: process.env.GITLAB_CLIENT_SECRET, clientId: process.env.NEXT_PUBLIC_GITLAB_CLIENT_ID,
authorization: `${BASE_URL}/oauth/authorize?scope=read_api`, clientSecret: process.env.GITLAB_CLIENT_SECRET,
token: `${BASE_URL}/oauth/token`, authorization: `${BASE_URL}/oauth/authorize?scope=read_api`,
userinfo: `${BASE_URL}/api/v4/user`, token: `${BASE_URL}/oauth/token`,
})) userinfo: `${BASE_URL}/api/v4/user`,
})
)
} }
const handler = (req: NextApiRequest, res: NextApiResponse) => { const handler = (req: NextApiRequest, res: NextApiResponse) => {
@@ -121,29 +123,31 @@ const updateLastActivityDate = async (user: User) => {
}) })
} }
async function getUserGroups(account: Account): Promise<string[]> { const getUserGroups = async (account: Account): Promise<string[]> => {
switch (account.provider) { switch (account.provider) {
case 'gitlab': { case 'gitlab': {
const res = await fetch( const res = await fetch(
`${process.env.NEXT_PUBLIC_GITLAB_BASE_URL || 'gitlab.com'}/api/v4/groups`, `${process.env.GITLAB_BASE_URL || 'https://gitlab.com'}/api/v4/groups`,
{ headers: { 'Authorization': `Bearer ${account.access_token}` } }, { headers: { Authorization: `Bearer ${account.access_token}` } }
) )
const userGroups: string[] = (await res.json()) const userGroups = await res.json()
return userGroups.map((group: any) => group.full_path) return userGroups.map((group: { full_path: string }) => group.full_path)
} }
default: return [] default:
return []
} }
} }
function getRequiredGroups(provider: string): string[] { const getRequiredGroups = (provider: string): string[] => {
switch (provider) { switch (provider) {
case 'gitlab': return process.env.GITLAB_REQUIRED_GROUPS?.split(',') || [] case 'gitlab':
default: return [] return process.env.GITLAB_REQUIRED_GROUPS?.split(',') || []
default:
return []
} }
} }
function checkHasGroups(userGroups: string[], requiredGroups: string[]) { const checkHasGroups = (userGroups: string[], requiredGroups: string[]) =>
return userGroups?.some(userGroup => requiredGroups?.includes(userGroup)) userGroups?.some((userGroup) => requiredGroups?.includes(userGroup))
}
export default withSentry(handler) export default withSentry(handler)

14
apps/docs/docs/self-hosting/configuration.md
View File

@@ -87,13 +87,13 @@ Used for authenticating with GitLab.
Follow the official GitLab guide for creating OAuth2 applications [here](https://docs.gitlab.com/ee/integration/oauth_provider.html). Follow the official GitLab guide for creating OAuth2 applications [here](https://docs.gitlab.com/ee/integration/oauth_provider.html).
The Authorization callback URL should be `$NEXTAUTH_URL/api/auth/callback/gitlab` The Authorization callback URL should be `$NEXTAUTH_URL/api/auth/callback/gitlab`
| Parameter | Default | Description | | Parameter | Default | Description |
| ---------------------------- | ------- | -------------------------------------------------------------------------------------| | ---------------------------- | ------------------ | ------------------------------------------------------------------------------------ | --- |
| NEXT_PUBLIC_GITLAB_CLIENT_ID | -- | Application client ID. Also used to check if it is enabled in the front-end | | NEXT_PUBLIC_GITLAB_CLIENT_ID | -- | Application client ID. Also used to check if it is enabled in the front-end |
| GITLAB_CLIENT_SECRET | -- | Application secret | | GITLAB_CLIENT_SECRET | -- | Application secret |
| NEXT_PUBLIC_GITLAB_BASE_URL | -- | Base URL of the GitLab instance, e.g. `https://gitlab.com` | | GITLAB_BASE_URL | https://gitlab.com | Base URL of the GitLab instance | |
| NEXT_PUBLIC_GITLAB_NAME | -- | Name of the GitLab instance, used for the SSO Login Button, e.g. `GitLab` | | GITLAB_REQUIRED_GROUPS | -- | Comma-separated list of groups the user has to be a direct member of, e.g. `foo,bar` |
| GITLAB_REQUIRED_GROUPS | -- | Comma-separated list of groups the user has to be a direct member of, e.g. `foo,bar` | | NEXT_PUBLIC_GITLAB_NAME | GitLab | Name of the GitLab instance, used for the SSO Login Button |
</p></details> </p></details>