Skip to content

feat: Include basePath property in NEXTAUTH_URL when present in config #1336

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 2, 2022
Merged

feat: Include basePath property in NEXTAUTH_URL when present in config #1336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
917e4ce
feat: handle custom base paths when creating NEXTAUTH_URL
ericapisani May 2, 2022
112a961
style: lint
ericapisani May 2, 2022
b868d0b
Merge branch 'main' into ep/include-basePath-in-nextAuth-url
ericapisani May 2, 2022
f0f090d
Merge branch 'main' into ep/include-basePath-in-nextAuth-url
ericapisani May 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion plugin/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,8 @@ const plugin: NetlifyPlugin = {
console.log(`NextAuth package detected, setting NEXTAUTH_URL environment variable to ${process.env.URL}`)

const config = await getRequiredServerFiles(publish)
config.config.env.NEXTAUTH_URL = process.env.URL
const nextAuthUrl = `${process.env.URL}${basePath}`
config.config.env.NEXTAUTH_URL = nextAuthUrl

await updateRequiredServerFiles(publish, config)
}
Expand Down
22 changes: 21 additions & 1 deletion test/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const {
patchNextFiles,
unpatchNextFiles,
} = require('../plugin/src/helpers/files')
const { getRequiredServerFiles } = require('../plugin/src/helpers/config')
const { getRequiredServerFiles, updateRequiredServerFiles } = require('../plugin/src/helpers/config')
const { dirname } = require('path')
const { getProblematicUserRewrites } = require('../plugin/src/helpers/verification')

Expand Down Expand Up @@ -241,6 +241,26 @@ describe('onBuild()', () => {
delete process.env.URL
})

test('includes the basePath on NEXTAUTH_URL when present', async () => {
const mockSiteUrl = 'https://my-netlify-site.app'
process.env.URL = mockSiteUrl

await moveNextDist()

const initialConfig = await getRequiredServerFiles(netlifyConfig.build.publish)
initialConfig.config.basePath = "/foo"
await updateRequiredServerFiles(netlifyConfig.build.publish, initialConfig)

await plugin.onBuild(defaultArgs)

expect(onBuildHasRun(netlifyConfig)).toBe(true)
const config = await getRequiredServerFiles(netlifyConfig.build.publish)

expect(config.config.env.NEXTAUTH_URL).toEqual(`${mockSiteUrl}/foo`)

delete process.env.URL
})

test('skips setting NEXTAUTH_URL when next-auth package is not found', async () => {
isNextAuthInstalled.mockImplementation(() => {
return false
Expand Down