K3s deployment (#126)

* fix(deployment):  fix docker config
- make CLIENT_ID and CLIENT_SECRET configurable

backend/.gitignore

@@ -1,5 +1,5 @@
 docker.env
-config/config.env
+src/config/config.env
 node_modules/**
 build/**
 

backend/Dockerfile

@@ -1,11 +1,13 @@
 FROM node:18-bullseye as build
-ARG REACT_APP_GOOGLE_ID=692793330469-6iupo55tt0kelejcie26m4njeckbmnv8.apps.googleusercontent.com
-ARG REACT_APP_URL=/meeting
-ARG REACT_APP_API_URL=https://www.ki.fh-swf.de/meeting/api/v1
+ARG CLIENT_ID=692793330469-6iupo55tt0kelejcie26m4njeckbmnv8.apps.googleusercontent.com
+ARG CLIENT_SECRET
+ARG APP_URL=/meeting
+ARG APP_API_URL=https://hopper.fh-swf.de/meeting/api/v1
 
-ENV REACT_APP_GOOGLE_ID=${REACT_APP_GOOGLE_ID}
-ENV REACT_APP_URL=${REACT_APP_URL}
-ENV REACT_APP_API_URL=${REACT_APP_API_URL}
+ENV CLIENT_ID=${CLIENT_ID}
+ENV CLIENT_SECRET=${CLIENT_SECRET}
+ENV APP_URL=${APP_URL}
+ENV APP_API_URL=${APP_API_URL}
 
 WORKDIR /base
 COPY .yarn .yarn
@@ -41,4 +43,4 @@ COPY --from=build /base/.yarnrc.yml .yarnrc.yml
 RUN yarn set version 4
 RUN yarn install
 EXPOSE 5000
-CMD [ "yarn", "run", "backend"]
+CMD [ "yarn", "workspace", "backend", "start"]

backend/src/controller/authentication_controller.ts

@@ -24,8 +24,8 @@ console.log("redirectUri: %s", REDIRECT_URI);
 console.log("clientId: %s", process.env.GOOGLE_ID);
 
 const oAuth2Client = new OAuth2Client({
-  clientId: process.env.GOOGLE_ID,
-  clientSecret: process.env.GOOGLE_SECRET,
+  clientId: process.env.CLIENT_ID,
+  clientSecret: process.env.CLIENT_SECRET,
   redirectUri: REDIRECT_URI,
 });
 
@@ -205,7 +205,7 @@ export const googleLoginController = (req: Request, res: Response): void => {
   const idToken = req.body.code;
 
   oAuth2Client
-    .verifyIdToken({ idToken, audience: process.env.GOOGLE_ID })
+    .verifyIdToken({ idToken, audience: process.env.CLIENT_ID })
     .then(response => {
       const { email_verified, name, email, picture, sub } = response.getAttributes().payload;
       console.log('picture: %s', picture);

backend/src/controller/google_controller.ts

@@ -19,8 +19,8 @@ import { Event, IntervalSet } from 'common';
 
 
 const oAuth2Client = new OAuth2Client({
-  clientId: process.env.GOOGLE_ID,
-  clientSecret: process.env.GOOGLE_SECRET,
+  clientId: process.env.CLIENT_ID,
+  clientSecret: process.env.CLIENT_SECRET,
   redirectUri: `${process.env.API_URL}/google/oauthcallback`,
 });
 const SCOPES = [

k8s/bookme-deployment.yaml

@@ -30,6 +30,16 @@ spec:
     spec:
       containers:
         - env:
+            - name: CLIENT_ID
+              valueFrom:
+                secretKeyRef:
+                  key: CLIENT_ID
+                  name: bookme-secret
+            - name: CLIENT_SECRET
+              valueFrom:
+                secretKeyRef:
+                  key: CLIENT_SECRET
+                  name: bookme-secret
             - name: API_URL
               valueFrom:
                 configMapKeyRef:
@@ -73,4 +83,4 @@ spec:
     kind: Rule
     services:
     - name: bookme
-      port: 5000
+      port: 5000