From d0f5dbeb074412c084f24314689e089818cbb8d3 Mon Sep 17 00:00:00 2001 From: Matthew Taylor Date: Fri, 4 Dec 2015 09:52:10 -0500 Subject: [PATCH] Rename `PROXY_HOST` to `FALLBACK` Thanks @rschamp! --- README.md | 8 ++++---- server/index.js | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index d799defa4..a92481006 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ Use `^C` to stop the node process `npm start` starts. | `API_HOST` | `https://api.scratch.mit.edu` | Hostname for API requests | | `NODE_ENV` | `null` | If not `production`, app acts like development | | `PORT` | `8333` | Port for devserver (http://localhost:XXXX) | -| `PROXY_HOST` | `''` | Pass-through location for scratchr2 | +| `FALLBACK` | `''` | Pass-through location for scratchr2 | ### To Test ```bash @@ -40,10 +40,10 @@ npm test ### Current issues with the development We're currently in the process of transitioning into this web client from Scratch's existing structure. As we transition, there are going to be some issues along the way that relate to how this client needs to interact with the existing infrastructure to work properly in production. -On top of migrating to using this as our web client, Scratch is also transitioning into using a new API backend, Scratch REST API. As that is also currently in development and incomplete, we are set up to fall back to using existing Scratch endpoints if an API endpoint does not exist – which is where the `PROXY_HOST` comes in. +On top of migrating to using this as our web client, Scratch is also transitioning into using a new API backend, Scratch REST API. As that is also currently in development and incomplete, we are set up to fall back to using existing Scratch endpoints if an API endpoint does not exist – which is where the `FALLBACK` comes in. -Most of the issues we have currently revolve around the use of `PROXY_HOST`. This variable is used to specify what url to fall back onto should a request fail within the context of this webclient, or when using the `API_HOST`. If not specified in the process, it will not be used, and any request that is not made through the web client or the API will be unreachable. +Most of the issues we have currently revolve around the use of `FALLBACK`. This variable is used to specify what url to fall back onto should a request fail within the context of this webclient, or when using the `API_HOST`. If not specified in the process, it will not be used, and any request that is not made through the web client or the API will be unreachable. -Setting `PROXY_HOST=https://scratch.mit.edu` allows the web client to retrieve data from the Scratch website in your development environment. However, because of security concerns, trying to send data to Scratch through your development environment won't work. This means the following things will be broken for the time being: +Setting `FALLBACK=https://scratch.mit.edu` allows the web client to retrieve data from the Scratch website in your development environment. However, because of security concerns, trying to send data to Scratch through your development environment won't work. This means the following things will be broken for the time being: * Login on the splash page (*In the process of being fixed*) * Some update attempts to production data made through a development version of the web client diff --git a/server/index.js b/server/index.js index d3c379dfb..e146b3c44 100644 --- a/server/index.js +++ b/server/index.js @@ -79,7 +79,7 @@ if (!isProduction) { } })); - var proxyHost = process.env.PROXY_HOST || ''; + var proxyHost = process.env.FALLBACK || ''; if (proxyHost !== '') { // Fall back to scratchr2 in development // This proxy middleware must come last