From 3d91c4f73e4609bab21117aca33483d991a63e57 Mon Sep 17 00:00:00 2001 From: Andrew Appleton Date: Thu, 25 Jan 2018 13:29:11 +0000 Subject: [PATCH] Make GitHub URLs configurable --- src/decorators/GithubContext.js | 3 ++- src/modules/getGithubAuthorizeUrl.js | 3 ++- src/pages/SignIn.js | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/decorators/GithubContext.js b/src/decorators/GithubContext.js index 2a282aa..2c4a20c 100644 --- a/src/decorators/GithubContext.js +++ b/src/decorators/GithubContext.js @@ -2,6 +2,7 @@ import React, { Component } from 'react' import PropTypes from 'prop-types' import request from 'axios' import NextGlobalClientStore from '../modules/NextGlobalClientStore' +const GITHUB_API_URL = process.env.GITHUB_API_URL || 'https://api.github.com' const getGithubAccessToken = req => { if (process.browser) { @@ -27,7 +28,7 @@ const getGithubUser = async githubAccessToken => { return NextGlobalClientStore.get('githubUser') } - const url = `https://api.github.com/user` + const url = `${GITHUB_API_URL}/user` const headers = { Authorization: `token ${githubAccessToken}` } const options = { headers } diff --git a/src/modules/getGithubAuthorizeUrl.js b/src/modules/getGithubAuthorizeUrl.js index 49fc276..6154bb9 100644 --- a/src/modules/getGithubAuthorizeUrl.js +++ b/src/modules/getGithubAuthorizeUrl.js @@ -1,4 +1,5 @@ -const githubAuthorizeUrl = 'https://github.com/login/oauth/authorize' +const GITHUB_URL = process.env.GITHUB_URL || 'https://github.com' +const githubAuthorizeUrl = `${GITHUB_URL}/login/oauth/authorize` const queryStringFromObj = queryObj => Object.keys(queryObj) diff --git a/src/pages/SignIn.js b/src/pages/SignIn.js index c644729..7d5c511 100644 --- a/src/pages/SignIn.js +++ b/src/pages/SignIn.js @@ -6,7 +6,8 @@ import getGithubAccessTokenCookie from '../modules/getGithubAccessTokenCookie' import getGithubAuthorizeUrl from '../modules/getGithubAuthorizeUrl' import PublicPage from '../decorators/PublicPage' -const githubAccessTokenUrl = 'https://github.com/login/oauth/access_token' +const GITHUB_URL = process.env.GITHUB_URL || 'https://github.com' +const githubAccessTokenUrl = `${GITHUB_URL}/login/oauth/access_token` const githubClientSecret = demandEnvVar('GITHUB_CLIENT_SECRET') const fetchGithubAccessToken = async (githubAuthCode, githubClientId) => {