Merge pull request #10 from natron-io/fix_env

Fix env
netricsag · Jan 30, 2022 · ce0fc2d · ce0fc2d
2 parents 8564bd1 + 1454045
commit ce0fc2d
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -10,6 +10,6 @@ To configure the tenant dashboard with your settings, fill your information in t
 
 | Env Variable               | Type                           | Description                                                                                    |
 | -------------------------- | :----------------------------- | ---------------------------------------------------------------------------------------------- |
-| `REACT_APP_CLIENT_ID:`     | [string] <YOUR_CLIENT_ID_HERE> | GitHub App client ID                                                                           |
-| `REACT_APP_REDIRECT_URI:`  | [string] <REDIRECT_URL>        | GitHub App redirect URL (Should point back at the frontend, i.e. https://yourdomain.com/login) |
-| `REACT_APP_API_OAUTH_URI:` | [string] <OAUTH_URL>           | GitHub OAuth URL                                                                               |
+| `REACT_APP_CLIENT_ID`     | [string] <YOUR_CLIENT_ID_HERE> | GitHub App client ID                                                                           |
+| `REACT_APP_REDIRECT_URI`  | [string] <REDIRECT_URL>        | GitHub App redirect URL (Should point back at the frontend, i.e. https://yourdomain.com/login) |
+| `REACT_APP_API_OAUTH_URI` | [string] <OAUTH_URL>           | GitHub OAuth URL                                                                               |
diff --git a/public/env-config.js b/public/env-config.js
diff --git a/public/index.html b/public/index.html
@@ -15,6 +15,7 @@
       content="Web site created using create-react-app"
     />
     <meta name="viewport" content="initial-scale=1, width=device-width" />
+    <script src="%PUBLIC_URL%/env-config.js"></script>
     <!--
       manifest.json provides metadata used when your web app is installed on a
       user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/

diff --git a/src/Components/Login.tsx b/src/Components/Login.tsx
@@ -5,16 +5,22 @@ import { AuthenticationContext } from "../App";
 
 import NatronIconWhite from "./Items/NatronIconWhite";
 
+declare global {
+  interface Window {
+    _env_: any;
+  }
+}
+
 export default function Login() {
   const { updateAuthenticated, updateAuthenticationToken } = useContext(
     AuthenticationContext
   );
 
-  const apiUrl = process.env.REACT_APP_API_OAUTH_URI;
+  const apiUrl = window._env_.REACT_APP_API_OAUTH_URI;
 
   const getGithubLogin = () => {
     window.open(
-      `https://github.com/login/oauth/authorize?scope=user&client_id=${process.env.REACT_APP_CLIENT_ID}&redirect_uri=${process.env.REACT_APP_REDIRECT_URI}`,
+      `https://github.com/login/oauth/authorize?scope=user&client_id=${window._env_.REACT_APP_CLIENT_ID}&redirect_uri=${window._env_.REACT_APP_REDIRECT_URI}`,
       "_self"
     );
   };