Adding mock saml2, adding logs rules for makefile

Author: Benoît Ngô

Makefile

@@ -2,12 +2,16 @@
 # Change tabs to space in makefile
 
 # Load .env variable (the prod is added also if there is any)
+ifneq (,$(wildcard ./.env.dist))
+    include .env.dist
+    export
+endif
 ifneq (,$(wildcard ./.env))
     include .env
     export
 endif
 ifneq (,$(wildcard ./.env.prod))
-    include .env
+    include .env.prod
     export
 endif
 
@@ -44,9 +48,13 @@ db-migrate-diff: ;\
     docker compose exec back composer -- run  console  doctrine:migrations:diff -n
 
 # See logs of back
-.PHONY: backlogs
-backlogs: ;\
+.PHONY: blogs
+blogs: ;\
     docker-compose logs back -f
+
+.PHONY: flogs
+flogs: ;\
+    docker-compose logs front -f
 # Init dev env
 init-dev: ;\
     cp -n docker-compose.override.yml.template docker-compose.override.yml; \
@@ -63,7 +71,7 @@ down: ;\
     docker compose down
 # up docker compose
 up: ;\
-    DOCKER_BUILDKIT=1 docker compose up -d
+    DOCKER_BUILDKIT=1 docker compose up -d ; docker compose logs initback back front -f
 
 # stronger down (remove volume / image / orphans)
 .PHONY: fdown

apps/front/nuxt.config.ts

@@ -1,41 +1,37 @@
 // https://nuxt.com/docs/api/configuration/nuxt-config
 export default defineNuxtConfig({
-    srcDir: "src/",
-    modules: [
-        '@pinia/nuxt',
-    ],
-    runtimeConfig: {
-        API_URL: process.env.API_URL || '',
-        public: {
-            DISABLE_AUTHENTICATION: process.env.DISABLE_AUTHENTICATION || ''
-        }
-    },
-    app: {
+  srcDir: 'src/',
+  modules: [
+    '@pinia/nuxt',
+  ],
+  runtimeConfig: {
+    API_URL: process.env.API_URL || '',
+  },
+  app: {
 
-        head: {
-            // @see https://getbootstrap.com/docs/5.0/getting-started/introduction/#starter-template
-            charset: 'utf-8',
-            viewport: 'width=device-width, initial-scale=1',
-            title: 'KB Backbone',
-            meta: [
-                // <meta name="description" content="My amazing site">
-              //  { name: 'description', content: 'My amazing site.' }
-            ],
-        }
+    head: {
+      // @see https://getbootstrap.com/docs/5.0/getting-started/introduction/#starter-template
+      charset: 'utf-8',
+      viewport: 'width=device-width, initial-scale=1',
+      title: 'KB Backbone',
+      meta: [
+        // <meta name="description" content="My amazing site">
+        //  { name: 'description', content: 'My amazing site.' }
+      ],
+    },
+  },
+  css: [
+    '@/assets/styles/main.scss',
+  ],
+  vite: {
+    css: {
+      preprocessorOptions: {
+        scss: {
+          additionalData: '@import "@/assets/styles/_functions.scss";@import "@/assets/styles/_variables.scss";@import "@/assets/styles/_mixins.scss";',
+        },
+      },
     },
-    css: [
-       // "bootstrap/dist/css/bootstrap.min.css",
-        '@/assets/styles/main.scss'
-    ],
-    vite: {
-        css: {
-            preprocessorOptions: {
-                scss: {
-                    additionalData: '@import "@/assets/styles/_functions.scss";@import "@/assets/styles/_variables.scss";@import "@/assets/styles/_mixins.scss";'
-                }
-            }
-        }
-    }
-    //ssr: false
+  },
+  // ssr: false
 
-})
+});

apps/front/package.json

@@ -6,7 +6,7 @@
     "generate": "nuxt generate",
     "preview": "nuxt preview",
     "postinstall": "nuxt prepare",
-    "lint": "eslint ./src/"
+    "lint": "eslint nuxt.config.ts --fix ; eslint ./src/"
   },
   "devDependencies": {
     "@nuxt/eslint-config": "^0.1.1",

apps/front/src/app.vue

@@ -18,14 +18,13 @@ const route = useRoute();
 const mHandleError = (e) => {
   logger.error('Primary error boundary', e);
 };
-
-const { DISABLE_AUTHENTICATION } = useRuntimeConfig();
+const isPendingValue = computed(() => authStore.isPending);
 // Doing this here instead than in the middleware allow reactivity on the auth user
 watchEffect(async () => {
-  if (authStore.isPending) {
+  if (isPendingValue.value) {
     return;
   }
-  const shouldRedirectToLogin = !DISABLE_AUTHENTICATION && !authStore.isAuthenticated && authStore.authUrl && route.name !== 'auth-login';
+  const shouldRedirectToLogin = !authStore.isAuthenticated && authStore.authUrl && route.name !== 'auth-login';
   if (shouldRedirectToLogin) {
     await navigateTo(authStore.authUrl, { external: true });
   }

docker-compose.override.yml.template

@@ -55,6 +55,21 @@ services:
   mysql:
     volumes:
       - ./apps/back/dump/dump.sql:/docker-entrypoint-initdb.d/001-dump.sql
+
+  samltest:
+    image: kristophjunge/test-saml-idp
+    labels:
+      - traefik.enable=true
+      - traefik.http.routers.samltest.rule=Host(`samltest.$BASE_DOMAIN`)
+      - traefik.http.routers.samltest.service=samltest
+      - traefik.http.services.samltest.loadbalancer.server.port=8080
+    environment:
+      - SIMPLESAMLPHP_SP_ENTITY_ID=http://$BASE_DOMAIN
+      - SIMPLESAMLPHP_SP_ASSERTION_CONSUMER_SERVICE=http://$BASE_DOMAIN/api/1.0/auth/sso/saml2/login
+      - SIMPLESAMLPHP_SP_SINGLE_LOGOUT_SERVICE=http://$API_DOMAIN/api/1.0/auth/sso/saml2/logout
+    volumes:
+      - ./apps/ssoidp/idpUser.php:/var/www/simplesamlphp/config/authsources.php
+
 networks:
   # This could be very usefull to run multiple project on the same machine
   tcm_network:

docker-compose.yml

@@ -43,7 +43,6 @@ services:
     environment:
       # This is used only per the proxy
       - NUXT_API_URL=http://${API_DOMAIN}/
-      #- NUXT_PUBLIC_DISABLE_AUTHENTICATION=true
   proxy:
     image: traefik:3.0
     container_name: tcm_proxy