Use dotenv properly, get api token for jami

.env.template

@@ -1 +1 @@
-API_TOKEN=<API_TOKEN>
+API_TOKEN=<API_TOKEN>

.github/workflows/staging.yml

@@ -1,6 +1,9 @@
 name: Deploy to staging
 
-on: push
+on:
+  push:
+    branches:
+      - master
 
 jobs:
   test:

src/config.ts

@@ -1,29 +1,7 @@
-export const PORT = process.env.PORT || 8000
-
-export const DB_CONFIG = {
-  dialect: 'postgres',
-  pool: {
-    max: 10,
-    min: 0,
-    acquire: 10000,
-    idle: 300000000,
-  },
-  username: process.env.POSTGRES_USER,
-  password: process.env.POSTGRES_PASSWORD,
-  port: 5432,
-  host: process.env.POSTGRES_HOST,
-  database: process.env.POSTGRES_DATABASE,
-  logging: false,
-}
-
 export const inStaging = process.env.REACT_APP_STAGING === 'true'
 
 export const inProduction = !inStaging && process.env.NODE_ENV === 'production'
 
 export const inE2EMode = process.env.REACT_APP_E2E === 'true'
 
 export const GIT_SHA = process.env.REACT_APP_GIT_SHA || ''
-
-export const JAMI_URL = inProduction
-  ? 'https://importer.cs.helsinki.fi/api/auth'
-  : 'https://toska-staging.cs.helsinki.fi/jami'

src/server/db/connection.ts

@@ -2,7 +2,7 @@ import { Sequelize, Options } from 'sequelize'
 import { Umzug, SequelizeStorage } from 'umzug'
 
 import logger from '../util/logger'
-import { DB_CONFIG } from '../../config'
+import { DB_CONFIG } from '../util/config'
 
 const DB_CONNECTION_RETRY_LIMIT = 10
 

src/server/index.ts

@@ -4,7 +4,7 @@ import path from 'path'
 import { Handlers as SentryHandlers } from '@sentry/node'
 import initializeSentry from './util/sentry'
 
-import { PORT } from '../config'
+import { PORT } from './util/config'
 import { connectToDatabase } from './db/connection'
 import logger from './util/logger'
 import errorHandler from './middeware/errorHandler'

src/server/util/config.ts

@@ -0,0 +1,29 @@
+import * as dotenv from 'dotenv'
+
+import { inProduction } from '../../config'
+
+dotenv.config()
+
+export const PORT = process.env.PORT || 8000
+
+export const { API_TOKEN } = process.env
+
+export const DB_CONFIG = {
+  dialect: 'postgres',
+  pool: {
+    max: 10,
+    min: 0,
+    acquire: 10000,
+    idle: 300000000,
+  },
+  username: process.env.POSTGRES_USER,
+  password: process.env.POSTGRES_PASSWORD,
+  port: 5432,
+  host: process.env.POSTGRES_HOST,
+  database: process.env.POSTGRES_DATABASE,
+  logging: false,
+}
+
+export const JAMI_URL = inProduction
+  ? 'https://importer.cs.helsinki.fi/api/auth'
+  : 'https://toska-staging.cs.helsinki.fi/jami'

src/server/util/jami.ts

@@ -1,14 +1,11 @@
 import axios from 'axios'
-import { JAMI_URL, inProduction } from '../../config'
+import { JAMI_URL, API_TOKEN } from './config'
 import { OrganisationData } from '../types'
 
-const API_TOKEN = process.env
-
 export const jamiClient = axios.create({
   baseURL: JAMI_URL,
   params: {
     token: API_TOKEN,
-    noLogging: !inProduction,
   },
 })