From c9816e3b74ad6a51f99835a8409f2dba0cf50a52 Mon Sep 17 00:00:00 2001
From: einhornimmond <info@einhornimmond.de>
Date: Wed, 12 Mar 2025 15:47:45 +0100
Subject: [PATCH] add all neccessary for showing humhub profile link in admin

---
 admin/.env.dist                               |  3 ++-
 admin/.env.template                           |  3 +++
 .../ContributionMessagesList.vue              | 27 +++++++++++++++++--
 admin/src/config/index.js                     |  5 ++++
 admin/src/config/schema.js                    |  9 +++++++
 admin/src/graphql/adminListContributions.js   |  1 +
 admin/vite.config.js                          |  3 ++-
 backend/src/config/schema.ts                  |  7 ++---
 backend/src/graphql/model/Contribution.ts     | 11 ++++++++
 config/src/commonSchema.ts                    |  5 ++++
 10 files changed, 65 insertions(+), 9 deletions(-)

diff --git a/admin/.env.dist b/admin/.env.dist
index c3d62bfd2..62c2b0ffd 100644
--- a/admin/.env.dist
+++ b/admin/.env.dist
@@ -3,4 +3,5 @@ GRAPHQL_PATH=/graphql
 WALLET_URL=http://localhost
 WALLET_AUTH_PATH=/authenticate?token=
 WALLET_LOGIN_PATH=/login
-DEBUG_DISABLE_AUTH=false
\ No newline at end of file
+DEBUG_DISABLE_AUTH=false
+HUMHUB_ACTIVE=false
\ No newline at end of file
diff --git a/admin/.env.template b/admin/.env.template
index 11e849271..354a684a3 100644
--- a/admin/.env.template
+++ b/admin/.env.template
@@ -6,3 +6,6 @@ WALLET_AUTH_PATH=$WALLET_AUTH_PATH
 WALLET_LOGIN_PATH=$WALLET_LOGIN_PATH
 GRAPHQL_PATH=$GRAPHQL_PATH
 DEBUG_DISABLE_AUTH=false
+
+HUMHUB_ACTIVE=$HUMHUB_ACTIVE
+HUMHUB_API_URL=$HUMHUB_API_URL
\ No newline at end of file
diff --git a/admin/src/components/ContributionMessages/ContributionMessagesList.vue b/admin/src/components/ContributionMessages/ContributionMessagesList.vue
index 9b6285a21..dc27b1597 100644
--- a/admin/src/components/ContributionMessages/ContributionMessagesList.vue
+++ b/admin/src/components/ContributionMessages/ContributionMessagesList.vue
@@ -13,7 +13,20 @@
         </BTooltip>
         &nbsp;
         {{ contribution.username }}
-        &nbsp; Humhub-Profil
+        &nbsp;
+        <span>
+          <a
+            v-if="humhubProfileLink"
+            id="humhub-username"
+            :href="humhubProfileLink"
+            target="_blank"
+          >
+            <i-arcticons-circles class="svg-icon" />
+          </a>
+          <BTooltip target="humhub-username" triggers="hover">
+            {{ $t('goTo.humhubProfile') }}
+          </BTooltip>
+        </span>
       </BListGroupItem>
       <BListGroupItem>
         {{ $t('registered') }}: {{ new Date(contribution.createdAt).toLocaleString() }}
@@ -45,10 +58,10 @@
 <script setup>
 import { ref, computed } from 'vue'
 import { useQuery } from '@vue/apollo-composable'
-
 import { adminListContributionMessages } from '../../graphql/adminListContributionMessages.js'
 import { useAppToast } from '@/composables/useToast'
 import { BListGroupItem } from 'bootstrap-vue-next'
+import CONFIG from '@/config'
 
 const props = defineProps({
   contribution: {
@@ -78,6 +91,16 @@ const mailtoLink = computed(() => {
 const searchLink = computed(() => {
   return `/user?search=${props.contribution.email}`
 })
+const humhubProfileLink = computed(() => {
+  if (CONFIG.HUMHUB_ACTIVE !== true) {
+    return undefined
+  }
+  let url = CONFIG.HUMHUB_API_URL
+  if (url.endsWith('/')) {
+    url = url.slice(0, -1)
+  }
+  return `${url}/u/${props.contribution.humhubUsername}`
+})
 
 const messages = ref([])
 
diff --git a/admin/src/config/index.js b/admin/src/config/index.js
index b73657219..684b568ef 100644
--- a/admin/src/config/index.js
+++ b/admin/src/config/index.js
@@ -50,12 +50,17 @@ const endpoints = {
 const debug = {
   DEBUG_DISABLE_AUTH: process.env.DEBUG_DISABLE_AUTH === 'true' ?? false,
 }
+const humhub = {
+  HUMHUB_ACTIVE: process.env.HUMHUB_ACTIVE === 'true' || false,
+  HUMHUB_API_URL: process.env.HUMHUB_API_URL ?? COMMUNITY_URL + '/community/',
+}
 
 const CONFIG = {
   ...version,
   ...environment,
   ...endpoints,
   ...debug,
+  ...humhub,
   ADMIN_MODULE_URL,
   COMMUNITY_URL,
 }
diff --git a/admin/src/config/schema.js b/admin/src/config/schema.js
index 7aee8136f..ecf134a1a 100644
--- a/admin/src/config/schema.js
+++ b/admin/src/config/schema.js
@@ -5,6 +5,8 @@ const {
   COMMUNITY_URL,
   DEBUG,
   GRAPHQL_URI,
+  HUMHUB_ACTIVE,
+  HUMHUB_API_URL,
   NODE_ENV,
   PRODUCTION,
 } = require('gradido-config/build/src/commonSchema.js')
@@ -17,9 +19,16 @@ module.exports = Joi.object({
   COMMUNITY_URL,
   DEBUG,
   GRAPHQL_URI,
+  HUMHUB_ACTIVE,
+  // HUMHUB_API_URL,
   NODE_ENV,
   PRODUCTION,
 
+  HUMHUB_API_URL: Joi.string()
+    .uri({ scheme: ['http', 'https'] })
+    .when('HUMHUB_ACTIVE', { is: true, then: Joi.required(), otherwise: Joi.optional() })
+    .description('The API URL for HumHub integration'),
+
   ADMIN_HOSTING: Joi.string()
     .valid('nodejs', 'nginx')
     .description('set to `nodejs` if admin is hosted by vite with a own nodejs instance')
diff --git a/admin/src/graphql/adminListContributions.js b/admin/src/graphql/adminListContributions.js
index 4329fef05..b37988233 100644
--- a/admin/src/graphql/adminListContributions.js
+++ b/admin/src/graphql/adminListContributions.js
@@ -28,6 +28,7 @@ export const adminListContributions = gql`
         lastName
         email
         username
+        humhubUsername
         amount
         memo
         createdAt
diff --git a/admin/vite.config.js b/admin/vite.config.js
index a815f3d3f..c49f054c5 100644
--- a/admin/vite.config.js
+++ b/admin/vite.config.js
@@ -24,7 +24,6 @@ export default defineConfig(async ({ command }) => {
   } else {
     CONFIG.ADMIN_HOSTING = 'nginx'
   }
-  // Check config
   validate(schema, CONFIG)
   // make sure that all urls used in browser have the same protocol to prevent mixed content errors
   validate(browserUrls, [
@@ -78,6 +77,8 @@ export default defineConfig(async ({ command }) => {
         WALLET_AUTH_PATH: CONFIG.WALLET_AUTH_PATH ?? null,
         WALLET_LOGIN_PATH: CONFIG.WALLET_LOGIN_URL ?? null, // null,
         DEBUG_DISABLE_AUTH: CONFIG.DEBUG_DISABLE_AUTH ?? null, // null,
+        HUMHUB_ACTIVE: CONFIG.HUMHUB_ACTIVE ?? null, // null,
+        HUMHUB_API_URL: CONFIG.HUMHUB_API_URL ?? null, // null,
         // CONFIG_VERSION: CONFIG.CONFIG_VERSION, // null,
       }),
       vitePluginGraphqlLoader(),
diff --git a/backend/src/config/schema.ts b/backend/src/config/schema.ts
index d6ff97560..8e950a405 100644
--- a/backend/src/config/schema.ts
+++ b/backend/src/config/schema.ts
@@ -17,6 +17,7 @@ import {
   GMS_ACTIVE,
   GRAPHIQL,
   HUMHUB_ACTIVE,
+  HUMHUB_API_URL,
   LOG4JS_CONFIG,
   LOGIN_APP_SECRET,
   LOGIN_SERVER_KEY,
@@ -44,6 +45,7 @@ export const schema = Joi.object({
   GMS_ACTIVE,
   GRAPHIQL,
   HUMHUB_ACTIVE,
+  HUMHUB_API_URL,
   LOG4JS_CONFIG,
   LOGIN_APP_SECRET,
   LOGIN_SERVER_KEY,
@@ -281,11 +283,6 @@ export const schema = Joi.object({
     .when('GMS_ACTIVE', { is: true, then: Joi.required(), otherwise: Joi.optional() })
     .description('The secret postfix for the GMS webhook endpoint'),
 
-  HUMHUB_API_URL: Joi.string()
-    .uri({ scheme: ['http', 'https'] })
-    .when('HUMHUB_ACTIVE', { is: true, then: Joi.required(), otherwise: Joi.optional() })
-    .description('The API URL for HumHub integration'),
-
   HUMHUB_JWT_KEY: Joi.string()
     .min(1)
     .when('HUMHUB_ACTIVE', {
diff --git a/backend/src/graphql/model/Contribution.ts b/backend/src/graphql/model/Contribution.ts
index f0a5bfd5b..31b486265 100644
--- a/backend/src/graphql/model/Contribution.ts
+++ b/backend/src/graphql/model/Contribution.ts
@@ -3,6 +3,10 @@ import { User } from '@entity/User'
 import { Decimal } from 'decimal.js-light'
 import { ObjectType, Field, Int } from 'type-graphql'
 
+import { PublishNameType } from '@enum/PublishNameType'
+
+import { PublishNameLogic } from '@/data/PublishName.logic'
+
 @ObjectType()
 export class Contribution {
   constructor(contribution: dbContribution, user?: User | null) {
@@ -11,6 +15,10 @@ export class Contribution {
     this.lastName = user?.lastName ?? null
     this.email = user?.emailContact?.email ?? null
     this.username = user?.alias ?? null
+    if (user) {
+      const publishNameLogic = new PublishNameLogic(user)
+      this.humhubUsername = publishNameLogic.getUsername(user.humhubPublishName as PublishNameType)
+    }
     this.amount = contribution.amount
     this.memo = contribution.memo
     this.createdAt = contribution.createdAt
@@ -45,6 +53,9 @@ export class Contribution {
   @Field(() => String, { nullable: true })
   username: string | null
 
+  @Field(() => String, { nullable: true })
+  humhubUsername: string | null
+
   @Field(() => Decimal)
   amount: Decimal
 
diff --git a/config/src/commonSchema.ts b/config/src/commonSchema.ts
index 1cf9f429c..11cc35a46 100644
--- a/config/src/commonSchema.ts
+++ b/config/src/commonSchema.ts
@@ -117,6 +117,11 @@ export const HUMHUB_ACTIVE = Joi.boolean()
   .default(false)
   .required()
 
+export const HUMHUB_API_URL = Joi.string()
+  .uri({ scheme: ['http', 'https'] })
+  .when('HUMHUB_ACTIVE', { is: true, then: Joi.required(), otherwise: Joi.optional() })
+  .description('The API URL for HumHub integration')
+
 export const LOG_LEVEL = Joi.string()
   .valid('all', 'mark', 'trace', 'debug', 'info', 'warn', 'error', 'fatal', 'off') 
   .description('set log level')