From 6541de5ff9cfc3a8c11fbcd09de819c1bc429a45 Mon Sep 17 00:00:00 2001
From: pikiou <pikiou.sub@gmail.com>
Date: Tue, 30 Nov 2021 16:09:36 +0100
Subject: [PATCH] Fix prod api url

---
 .eslintrc.js           | 1 +
 jest/config.js         | 1 +
 package.json           | 4 ++--
 src/config/prod.ts     | 5 ++---
 src/server/secure.ts   | 2 +-
 src/types/index.d.ts   | 2 ++
 webpack/base.config.ts | 2 ++
 7 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index b96f2e4..8fb6966 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -55,5 +55,6 @@ module.exports = {
         __CLIENT__: true,
         __SERVER__: true,
         __DEV__: true,
+        __LOCAL__: false,
     },
 }
diff --git a/jest/config.js b/jest/config.js
index ccc7b2e..4788890 100644
--- a/jest/config.js
+++ b/jest/config.js
@@ -21,6 +21,7 @@ module.exports = {
         __DEV__: true,
         __CLIENT__: true,
         __SERVER__: false,
+        __LOCAL__: false,
     },
     maxConcurrency: 50,
     maxWorkers: 1,
diff --git a/package.json b/package.json
index aca4148..a646572 100644
--- a/package.json
+++ b/package.json
@@ -41,9 +41,9 @@
     "scripts": {
         "dev": "yarn dev:build && nodemon ./public/server",
         "dev:build": "cross-env NODE_ENV=development webpack --config ./webpack/server.config.ts",
-        "local-start": "cross-env INTRANET_HOST=localhost node ./public/server",
+        "local-start": "cross-env LOCAL=true node ./public/server",
         "start": "node ./public/server",
-        "local-build": "cross-env INTRANET_HOST=localhost run-s build:*",
+        "local-build": "cross-env LOCAL=true run-s build:*",
         "build": "run-s build:*",
         "build:server": "cross-env NODE_ENV=production webpack --config ./webpack/server.config.ts",
         "build:client": "cross-env NODE_ENV=production webpack --config ./webpack/client.config.ts",
diff --git a/src/config/prod.ts b/src/config/prod.ts
index 9a2421c..1108dd1 100755
--- a/src/config/prod.ts
+++ b/src/config/prod.ts
@@ -1,9 +1,8 @@
 const PORT = 4000
-const HOST =
-    __SERVER__ && !__DEV__ ? process.env.INTRANET_HOST || "fo.parisestludique.fr" : "localhost"
+const API_URL = __DEV__ || __LOCAL__ ? `http://localhost:${PORT}` : "https://fo.parisestludique.fr"
 
 export default {
     PORT,
     HOST: "0.0.0.0",
-    API_URL: `http://${HOST}:${PORT}`,
+    API_URL,
 }
diff --git a/src/server/secure.ts b/src/server/secure.ts
index a0855b4..6ab36c5 100644
--- a/src/server/secure.ts
+++ b/src/server/secure.ts
@@ -52,7 +52,7 @@ async function getSecret() {
 
 export async function getJwt(email: string): Promise<string> {
     const jwt = sign({ user: canonicalEmail(email), permissions: [] }, await getSecret(), {
-        expiresIn: "7d",
+        expiresIn: "365d",
     })
     return jwt
 }
diff --git a/src/types/index.d.ts b/src/types/index.d.ts
index 14536c3..723cae4 100644
--- a/src/types/index.d.ts
+++ b/src/types/index.d.ts
@@ -1,6 +1,7 @@
 declare const __CLIENT__: boolean
 declare const __SERVER__: boolean
 declare const __DEV__: boolean
+declare const __LOCAL__: boolean
 
 declare module "*.svg"
 declare module "*.gif"
@@ -16,6 +17,7 @@ declare namespace NodeJS {
         __CLIENT__: boolean
         __SERVER__: boolean
         __DEV__: boolean
+        __LOCAL__: boolean
         $RefreshReg$: () => void
         $RefreshSig$$: () => void
     }
diff --git a/webpack/base.config.ts b/webpack/base.config.ts
index d584d50..42f5670 100644
--- a/webpack/base.config.ts
+++ b/webpack/base.config.ts
@@ -8,6 +8,7 @@ import LoadablePlugin from "@loadable/webpack-plugin"
 import { BundleAnalyzerPlugin } from "webpack-bundle-analyzer"
 
 export const isDev = process.env.NODE_ENV === "development"
+const isLocal = process.env.LOCAL === "true"
 const getStyleLoaders = (isWeb: boolean, isSass?: boolean) => {
     let loaders: RuleSetUseItem[] = [
         {
@@ -47,6 +48,7 @@ const getPlugins = (isWeb: boolean) => {
             __CLIENT__: isWeb,
             __SERVER__: !isWeb,
             __DEV__: isDev,
+            __LOCAL__: isLocal,
         }),
     ]