Makefile

@@ -23,7 +23,7 @@ keycloak: ./keycloak/.installed
 
 keycloak/.installed:
 	@echo "running one time install"
-	@cd keycloak/CAS && sudo sh build.sh
+	@cd keycloak/CAS && sh build.sh
 	@touch ./keycloak/.installed
 
 dev-front: clean vite keycloak
@@ -33,6 +33,8 @@ dev-front: clean vite keycloak
 	@cp config/frontdev.docker-compose.yaml docker-compose.yaml
 	@docker compose up -d --build
 	@cd ./front/MyINPulse-front/ && npm run dev
+	@echo "cd MyINPulse-back" && echo 'export $$(cat .env | xargs)'
+	@echo "./gradlew bootRun --args='--server.port=8081'"
 
 prod: clean keycloak
 	@cp config/prod.env front/MyINPulse-front/.env
@@ -43,6 +45,7 @@ prod: clean keycloak
 	
 
 
+
 dev-back: keycloak
 	@cp config/backdev.env front/MyINPulse-front/.env
 	@cp config/backdev.env .env

config/frontdev.docker-compose.yaml

@@ -34,19 +34,19 @@ services:
     depends_on:
       - postgres
 
-  #front:
+  front:
-  #  build:
-  #    context: ./front/
-  #    dockerfile: Dockerfile
-  #  container_name: MyINPulse-front
-  #  ports:
-  #    - "8080:80"
-
-  back:
     build:
-      context: ./MyINPulse-back/
+      context: ./front/
       dockerfile: Dockerfile
-    container_name: MyINPulse-back
+    container_name: MyINPulse-front
     ports:
-      - "8081:8080"
+      - "8080:80"
+
+  #back:
+  #  build:
+  #    context: ./MyINPulse-back/
+  #    dockerfile: Dockerfile
+  #  container_name: MyINPulse-back
+  #  ports:
+  #    - "8081:8080"
   

config/frontdev.env

@@ -16,7 +16,7 @@ BACKEND_PASSWORD=backend_db_user_password
 DATABASE_URL=MyINPulse-DB
 
 VITE_KEYCLOAK_URL=http://localhost:7080
-VITE_KEYCLOAK_CLIENT_ID=myinpulse-dev
+VITE_KEYCLOAK_CLIENT_ID=myinpulse
-VITE_KEYCLOAK_REALM=test
+VITE_KEYCLOAK_REALM=MyINPulse
 VITE_APP_URL=http://localhost:5173
 VITE_BACKEND_URL=http://localhost:8081/

front/MyINPulse-front/src/views/AdminMain.vue

@@ -70,7 +70,7 @@ const fallbackProjects = [
     },
 ];
 
-
+/*
 const createFirstAdmin = () => {
     createAdmin(
         (response) => {
@@ -84,8 +84,7 @@ const createFirstAdmin = () => {
         }
     );
 };
-
+*/
-onMounted(createFirstAdmin)
 
 const fetchProjects = () => {
     getAdminProjects(

keycloak/CAS/.gitignore

@@ -1 +0,0 @@
-keycloak-cas

keycloak/CAS/Dockerfile

@@ -1,6 +0,0 @@
-FROM maven:3.8.8-eclipse-temurin-21-alpine
-
-COPY ./keycloak-cas/ .
-
-RUN mvn clean package
-

keycloak/CAS/build.sh

@@ -1,15 +0,0 @@
-#!/bin/bash
-
-if [ ! -d "./keycloak-cas/" ]
-then
-    git clone https://github.com/RoboJackets/keycloak-cas
-    patch $(find . | grep UrlHelper.java) https_patch
-fi
-if [ -d "./target/" ]
-then
-	rm -r target/
-fi
-docker build -t build-dep .
-docker create -it --name build-dep-container build-dep bash
-docker cp build-dep-container:/target ./target
-docker rm -f build-dep-container

keycloak/CAS/https_patch

@@ -1,4 +0,0 @@
-41c41
-<             .queryParam(PROVIDER_PARAMETER_SERVICE, uriInfo.getAbsolutePath().toString());
----
->             .queryParam(PROVIDER_PARAMETER_SERVICE, uriInfo.getAbsolutePath().toString().replace("http://", "https://"));

keycloak/Dockerfile

@@ -1,30 +0,0 @@
-FROM quay.io/keycloak/keycloak:latest AS builder
-
-ARG KC_DB
-ENV KC_DB=$KC_DB
-
-# Install custom providers
-
-ADD --chown=keycloak:keycloak --chmod=644 ./CAS/target/*.jar /opt/keycloak/providers/cas-provider.jar
-
-# build optimized image
-RUN /opt/keycloak/bin/kc.sh build 
-
-FROM quay.io/keycloak/keycloak:latest
-
-ARG KC_DB
-ENV KC_DB=$KC_DB
-
-ARG KC_DB_URL
-ENV KC_DB_URL=$KC_DB_URL
-
-ARG KC_DB_USERNAME
-ENV KC_DB_USERNAME=$KC_DB_USERNAME
-
-ARG KC_DB_PASSWORD
-ENV KC_DB_PASSWORD=$KC_DB_PASSWORD
-
-COPY --from=builder /opt/keycloak/ /opt/keycloak/
-WORKDIR /opt/keycloak
-
-ENTRYPOINT ["/opt/keycloak/bin/kc.sh"]