Skip to content

Fix wrong auth for fetching resources for create offline project #770

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
Valyukhov merged 1 commit into from
Apr 9, 2025
Merged

Fix wrong auth for fetching resources for create offline project #770

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 17 additions & 4 deletions components/Project/Download.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,15 +208,24 @@ function Download({
: t('books:' + bookCode),
},
]
const reformatLink = (link) => {
if (link.includes('commit')) {
const newLink = link.replace(/commit\/[a-f0-9]+/, 'branch/master')
return newLink
}

return link
}
const createChapters = async (bookLink, typeProject) => {
if (!bookLink) return null
const reformatedBookLink = reformatLink(bookLink)
let chapterVerse = {}
if (typeProject === 'obs') {
chapterVerse = obsStoryVerses
} else {
const { data: jsonChapterVerse, error: errorJsonChapterVerse } =
await getCountChaptersAndVerses({
link: bookLink,
link: reformatedBookLink,
})
chapterVerse = jsonChapterVerse
if (errorJsonChapterVerse) {
Expand Down Expand Up @@ -266,9 +275,13 @@ function Download({
}
const { owner, repo, commit, manifest } = resources[resource]
const bookPath = manifest.projects.find((el) => el.identifier === bookCode)?.path
// const url = ` ${
// process.env.NEXT_PUBLIC_NODE_HOST ?? 'https://git.door43.org'
// }/${owner}/${repo}/raw/commit/${commit}/${bookPath.replace(/^\.\//, '')}`
// urls[resource] = url
const url = ` ${
process.env.NEXT_PUBLIC_NODE_HOST ?? 'https://git.door43.org'
}/${owner}/${repo}/raw/commit/${commit}/${bookPath.replace(/^\.\//, '')}`
}/${owner}/${repo}/raw/branch/master/${bookPath.replace(/^\.\//, '')}`
urls[resource] = url
}
}
Expand Down Expand Up @@ -358,7 +371,7 @@ function Download({
acc[chapter] = 0
return acc
}, {})
const methods = await gitDoorAxios.get('/api/methods')
const methods = await axios.get('/api/methods')
const method = methods.data.find((method) => method.title === project.method)
if (!method?.offline_steps) {
return null
Expand Down Expand Up @@ -426,7 +439,7 @@ function Download({
})
zip.file('obs-images-360px.zip', obsImagesZipContent)
} else {
const response = await axios.get(url)
const response = await gitDoorAxios.get(url)
if (response.status === 200) {
const content = response.data
zip.file(`${resource}.${url.split('.').pop()}`, content)
Expand Down