gcg/static-cms
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(bitbucket): branchname containing slash (#2963)

Browse Source
This commit is contained in:
Bartholomew 2019-12-13 16:23:43 +01:00 committed by Erez Rokah
parent 1e77d4b768
commit afea44895b
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
packages/netlify-cms-backend-bitbucket/src/API.js
View File

@ -55,6 +55,15 @@ export default class API {
return response.ok; return response.ok;
}; };
branchCommitSha = async () => {
if (this.branchSha) return this.branchSha;
({
target: { hash: this.branchSha },
} = await this.requestJSON(`${this.repoURL}/refs/branches/${this.branch}`));
return this.branchSha;
};
isFile = ({ type }) => type === 'commit_file'; isFile = ({ type }) => type === 'commit_file';
processFile = file => ({ processFile = file => ({
...file, ...file,
@ -70,14 +79,15 @@ export default class API {
}); });
processFiles = files => files.filter(this.isFile).map(this.processFile); processFiles = files => files.filter(this.isFile).map(this.processFile);
readFile = async (path, sha, { ref = this.branch, parseText = true } = {}) => { readFile = async (path, sha, { parseText = true } = {}) => {
const cacheKey = parseText ? `bb.${sha}` : `bb.${sha}.blob`; const cacheKey = parseText ? `bb.${sha}` : `bb.${sha}.blob`;
const cachedFile = sha ? await localForage.getItem(cacheKey) : null; const cachedFile = sha ? await localForage.getItem(cacheKey) : null;
if (cachedFile) { if (cachedFile) {
return cachedFile; return cachedFile;
} }
const node = await this.branchCommitSha();
const result = await this.request({ const result = await this.request({
url: `${this.repoURL}/src/${ref}/${path}`, url: `${this.repoURL}/src/${node}/${path}`,
cache: 'no-store', cache: 'no-store',
}).then(parseText ? responseParser({ format: 'text' }) : responseParser({ format: 'blob' })); }).then(parseText ? responseParser({ format: 'text' }) : responseParser({ format: 'blob' }));
if (sha) { if (sha) {
@ -107,12 +117,13 @@ export default class API {
}; };
listFiles = async path => { listFiles = async path => {
const node = await this.branchCommitSha();
const { entries, cursor } = await flow([ const { entries, cursor } = await flow([
// sort files by filename ascending // sort files by filename ascending
unsentRequest.withParams({ sort: '-path', max_depth: 10 }), unsentRequest.withParams({ sort: '-path', max_depth: 10 }),
this.requestJSON, this.requestJSON,
then(this.getEntriesAndCursor), then(this.getEntriesAndCursor),
])(`${this.repoURL}/src/${this.branch}/${path}`); ])(`${this.repoURL}/src/${node}/${path}`);
return { entries: this.processFiles(entries), cursor }; return { entries: this.processFiles(entries), cursor };
}; };