Merge branch 'master' into montreal_user_location

.github/workflows/test_mariadb.yml

@@ -1,32 +0,0 @@
-name: Gradido MariaDB Test CI
-
-on: push
-
-jobs:
-  files-changed:
-    name: Detect File Changes - MariaDB
-    runs-on: ubuntu-latest
-    outputs:
-      mariadb: ${{ steps.changes.outputs.mariadb }}
-    steps:
-      - uses: actions/checkout@v3.3.0
-
-      - name: Check for frontend file changes
-        uses: dorny/paths-filter@v2.11.1
-        id: changes
-        with:
-          token: ${{ github.token }}
-          filters: .github/file-filters.yml
-          list-files: shell
-
-  build_test:
-    if: needs.files-changed.outputs.mariadb == 'true'
-    name: Docker Build Test - MariaDB
-    needs: files-changed
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-
-      - name: MariaDB | Build 'test' image
-        run: docker build --target mariadb_server -t "gradido/mariadb:test" -f ./mariadb/Dockerfile ./

backend/src/apis/ConnectionAgents.ts

@@ -0,0 +1,5 @@
+import { Agent } from 'http'
+import { Agent as HttpsAgent } from 'https'
+
+export const httpAgent = new Agent({ keepAlive: true })
+export const httpsAgent = new HttpsAgent({ keepAlive: true })

backend/src/apis/HttpRequest.ts

@@ -7,10 +7,12 @@ import axios from 'axios'
 import { LogError } from '@/server/LogError'
 import { backendLogger as logger } from '@/server/logger'
 
+import { httpAgent, httpsAgent } from './ConnectionAgents'
+
 export const apiPost = async (url: string, payload: unknown): Promise<any> => {
   logger.trace('POST', url, payload)
   try {
-    const result = await axios.post(url, payload)
+    const result = await axios.post(url, payload, { httpAgent, httpsAgent })
     logger.trace('POST-Response', result)
     if (result.status !== 200) {
       throw new LogError('HTTP Status Error', result.status)
@@ -27,7 +29,7 @@ export const apiPost = async (url: string, payload: unknown): Promise<any> => {
 export const apiGet = async (url: string): Promise<any> => {
   logger.trace('GET: url=' + url)
   try {
-    const result = await axios.get(url)
+    const result = await axios.get(url, { httpAgent, httpsAgent })
     logger.trace('GET-Response', result)
     if (result.status !== 200) {
       throw new LogError('HTTP Status Error', result.status)

backend/src/apis/gms/GmsClient.ts

@@ -4,6 +4,7 @@
 /* eslint-disable @typescript-eslint/no-unsafe-argument */
 import axios from 'axios'
 
+import { httpAgent, httpsAgent } from '@/apis/ConnectionAgents'
 import { CONFIG } from '@/config'
 import { LogError } from '@/server/LogError'
 import { backendLogger as logger } from '@/server/logger'
@@ -126,9 +127,10 @@ export async function createGmsUser(apiKey: string, user: GmsUser): Promise<bool
         accept: 'application/json',
         language: 'en',
         timezone: 'UTC',
-        connection: 'keep-alive',
         authorization: apiKey,
       },
+      httpAgent,
+      httpsAgent,
     }
     try {
       const result = await axios.post(baseUrl.concat(service), user, config)
@@ -160,9 +162,10 @@ export async function updateGmsUser(apiKey: string, user: GmsUser): Promise<bool
         accept: 'application/json',
         language: 'en',
         timezone: 'UTC',
-        connection: 'keep-alive',
         authorization: apiKey,
       },
+      httpAgent,
+      httpsAgent,
     }
     try {
       const result = await axios.patch(baseUrl.concat(service), user, config)
@@ -197,9 +200,10 @@ export async function verifyAuthToken(
       accept: 'application/json',
       language: 'en',
       timezone: 'UTC',
-      connection: 'keep-alive',
       // authorization: apiKey,
     },
+    httpAgent,
+    httpsAgent,
   }
   try {
     const result = await axios.get(baseUrl.concat(service), config)

backend/src/apis/humhub/HumHubClient.ts

@@ -20,7 +20,9 @@ export class HumHubClient {
 
   // eslint-disable-next-line no-useless-constructor, @typescript-eslint/no-empty-function
   private constructor() {
-    this.restClient = new RestClient('gradido-backend', CONFIG.HUMHUB_API_URL)
+    this.restClient = new RestClient('gradido-backend', CONFIG.HUMHUB_API_URL, undefined, {
+      keepAlive: true,
+    })
     logger.info('create rest client for', CONFIG.HUMHUB_API_URL)
   }
 

docker-compose.test.yml

@@ -92,10 +92,6 @@ services:
   ## MARIADB ##############################################
   #########################################################
   mariadb:
-    image: gradido/mariadb:test
-    environment:
-      - MARIADB_ALLOW_EMPTY_ROOT_PASSWORD=1
-      - MARIADB_USER=root
     networks: 
       - internal-net
       - external-net

docker-compose.yml

@@ -61,11 +61,9 @@ services:
   ## MARIADB ##############################################
   #########################################################
   mariadb:
-    build:
-      context: ./mariadb
-      target: mariadb_server
+    image: mariadb:10.5
     environment:
-      - MARIADB_ALLOW_EMPTY_PASSWORD=1
+      - MARIADB_ALLOW_EMPTY_ROOT_PASSWORD=1
       - MARIADB_USER=root
     networks:
       - internal-net
@@ -92,7 +90,6 @@ services:
       - 4000:4000
     depends_on:
       - mariadb
-    restart: always
     environment:
       # Envs used in Dockerfile
       # - DOCKER_WORKDIR="/app"
@@ -128,7 +125,6 @@ services:
     #  - 5000:5000
     depends_on:
       - mariadb
-    restart: always
     environment:
       # Envs used in Dockerfile
       # - DOCKER_WORKDIR="/app"
@@ -162,7 +158,6 @@ services:
       - external-net
     ports:
       - 6010:6010
-    restart: always
     environment:
       # Envs used in Dockerfile
       # - DOCKER_WORKDIR="/app"
@@ -196,7 +191,6 @@ services:
       - 5010:5010
     depends_on:
       - mariadb
-    restart: always
     environment:
       # Envs used in Dockerfile
       # - DOCKER_WORKDIR="/app"

e2e-tests/cypress.config.ts

@@ -36,6 +36,7 @@ export default defineConfig({
     baseUrl: 'http://localhost:3000',
     chromeWebSecurity: false,
     defaultCommandTimeout: 100000,
+    pageLoadTimeout: 120000,
     supportFile: 'cypress/support/index.ts',
     viewportHeight: 720,
     viewportWidth: 1280,

frontend/src/components/Auth/AuthNavbar.vue

@@ -23,7 +23,7 @@ import { useAuthLinks } from '@/composables/useAuthLinks'
 const { login, register } = useAuthLinks()
 
 const backgroundHeader = '/img/template/gradido_background_header.png'
-const logo = '/img/brand/gradido-logo.png'
+const logo = '/img/brand/gradido-logo_200x59.png'
 const sheet = '/img/template/Blaetter.png'
 </script>
 

frontend/src/layouts/AuthLayout.vue

@@ -30,7 +30,7 @@
                 <div class="mb-0">{{ $t('1000thanks') }}</div>
               </BCol>
               <BCol cols="3" class="text-end d-none d-sm-none d-md-inline">
-                <BAvatar src="/img/brand/gradido_coin●.png" size="6rem" />
+                <BAvatar src="/img/brand/gradido_coin_128x128.png" size="6rem" />
               </BCol>
             </BRow>
             <BCard ref="pageFontSize" no-body class="border-0 mt-4 gradido-custom-background">
@@ -62,7 +62,7 @@
               <BRow class="d-inline d-sm-inline d-md-none d-lg-none mb-3">
                 <BCol class="text-center">
                   <BAvatar
-                    src="/img/brand/gradido_coin●.png"
+                    src="/img/brand/gradido_coin_128x128.png"
                     size="6rem"
                     bg-variant="transparent"
                   ></BAvatar>

mariadb/Dockerfile

@@ -1,4 +0,0 @@
-#########################################################################################################
-# mariadb server 
-#########################################################################################################
-FROM mariadb:10.5 as mariadb_server