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

Prevent login if Git Gateway is disabled. (#1295)

Browse Source
This commit is contained in:
Caleb 2018-05-15 16:34:42 -06:00 committed by Shawn Erquhart
parent c6bbfa70c2
commit 80817e2157
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/backends/git-gateway/API.js
View File

@ -16,12 +16,14 @@ export default class API extends GithubAPI {
.catch(error => { .catch(error => {
if (error.status === 401) { if (error.status === 401) {
if (error.message === "Bad credentials") { if (error.message === "Bad credentials") {
throw new Error("Git Gateway Error: Please ask your site administrator to reissue the Git Gateway token."); throw new APIError("Git Gateway Error: Please ask your site administrator to reissue the Git Gateway token.", error.status, 'Git Gateway');
} else { } else {
return false; return false;
} }
} else if (error.status === 404 && (error.message === undefined || error.message === "Unable to locate site configuration")) {
throw new APIError(`Git Gateway Error: Please make sure Git Gateway is enabled on your site.`, error.status, 'Git Gateway');
} else { } else {
console.error("Problem fetching repo data from GitHub"); console.error("Problem fetching repo data from Git Gateway");
throw error; throw error;
} }
}); });
@ -70,11 +72,14 @@ export default class API extends GithubAPI {
if (contentType && contentType.match(/json/)) { if (contentType && contentType.match(/json/)) {
return this.parseJsonResponse(response); return this.parseJsonResponse(response);
} }
const text = response.text();
return response.text(); if (!response.ok) {
return Promise.reject(text);
}
return text;
}) })
.catch(error => { .catch(error => {
throw new APIError(error.message, responseStatus, 'Git Gateway'); throw new APIError((error.message || error.msg), responseStatus, 'Git Gateway');
}); });
} }

6
src/backends/github/API.js
View File

@ -79,7 +79,11 @@ export default class API {
if (contentType && contentType.match(/json/)) { if (contentType && contentType.match(/json/)) {
return this.parseJsonResponse(response); return this.parseJsonResponse(response);
} }
return response.text(); const text = response.text();
if (!response.ok) {
return Promise.reject(text);
}
return text;
}) })
.catch((error) => { .catch((error) => {
throw new APIError(error.message, responseStatus, 'GitHub'); throw new APIError(error.message, responseStatus, 'GitHub');