From 9648bb12274267a6070a3f648d439afaca55fe3c Mon Sep 17 00:00:00 2001
From: clauspeterhuebner <hr.softwarelab@t-online.de>
Date: Wed, 16 Apr 2025 15:29:55 +0200
Subject: [PATCH] correct compile errors on JwtTypes

---
 backend/src/auth/jwt/JWT.ts                   |  6 +--
 .../resolver/TransactionLinkResolver.ts       | 38 ++++++++++---------
 2 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/backend/src/auth/jwt/JWT.ts b/backend/src/auth/jwt/JWT.ts
index 1f42cb198..26687d3c5 100644
--- a/backend/src/auth/jwt/JWT.ts
+++ b/backend/src/auth/jwt/JWT.ts
@@ -29,7 +29,7 @@ export const verify = async (token: string, signkey: string): Promise<JwtPayload
       audience: 'urn:gradido:audience',
     })
     logger.info('JWT.verify after jwtVerify... payload=', payload)
-    return payload as unknown as JwtPayloadType
+    return payload as JwtPayloadType
   } catch (err) {
     logger.error('JWT.verify after jwtVerify... error=', err)
     return null
@@ -63,6 +63,6 @@ export const verifyJwtType = async (token: string, signkey: string): Promise<str
 }
 
 export const decode = (token: string): JwtPayloadType => {
-  const payload = decodeJwt(token)
-  return payload as unknown as JwtPayloadType
+  const { payload } = decodeJwt(token)
+  return payload as JwtPayloadType
 }
diff --git a/backend/src/graphql/resolver/TransactionLinkResolver.ts b/backend/src/graphql/resolver/TransactionLinkResolver.ts
index 492643ee8..66e0ba9c4 100644
--- a/backend/src/graphql/resolver/TransactionLinkResolver.ts
+++ b/backend/src/graphql/resolver/TransactionLinkResolver.ts
@@ -182,16 +182,22 @@ export class TransactionLinkResolver {
       } else {
         // disbursement jwt-token
         logger.debug('TransactionLinkResolver.queryTransactionLink... disbursement jwt-token found')
-        const payload = decode(code)
-        logger.debug('TransactionLinkResolver.queryTransactionLink... payload=', payload)
-        if (payload) {
+        const decodedPayload = decode(code)
+        logger.debug(
+          'TransactionLinkResolver.queryTransactionLink... decodedPayload=',
+          decodedPayload,
+        )
+        if (
+          decodedPayload != null &&
+          decodedPayload.tokentype === DisbursementJwtPayloadType.REDEEM_ACTIVATION_TYPE
+        ) {
           const disburseJwtPayload = new DisbursementJwtPayloadType(
-            payload.sendercommunityuuid,
-            payload.sendergradidoid,
-            payload.sendername,
-            payload.redeemcode,
-            payload.amount,
-            payload.memo,
+            decodedPayload.sendercommunityuuid as string,
+            decodedPayload.sendergradidoid as string,
+            decodedPayload.sendername as string,
+            decodedPayload.redeemcode as string,
+            decodedPayload.amount as string,
+            decodedPayload.memo as string,
           )
           logger.debug(
             'TransactionLinkResolver.queryTransactionLink... disburseJwtPayload=',
@@ -214,14 +220,10 @@ export class TransactionLinkResolver {
             jwtPayload = decode(code)
           }
           logger.debug('TransactionLinkResolver.queryTransactionLink... jwtPayload=', jwtPayload)
-          if (jwtPayload !== null && jwtPayload instanceof DisbursementJwtPayloadType) {
-            const disburseJwtPayload = new DisbursementJwtPayloadType(jwtPayload.sendercommunityuuid,
-              jwtPayload.sendergradidoid,
-              jwtPayload.sendername,
-              jwtPayload.redeemcode,
-              jwtPayload.amount,
-              jwtPayload.memo,
-            )
+          if (
+            jwtPayload !== null &&
+            jwtPayload.tokentype === DisbursementJwtPayloadType.REDEEM_ACTIVATION_TYPE
+          ) {
             logger.debug(
               'TransactionLinkResolver.queryTransactionLink... disburseJwtPayload=',
               disburseJwtPayload,
@@ -239,7 +241,7 @@ export class TransactionLinkResolver {
             return transactionLink
           }
         } else {
-          throw new LogError('Redeem with wrong type of JWT-Token! payload=', payload)
+          throw new LogError('Redeem with wrong type of JWT-Token! decodedPayload=', decodedPayload)
         }
       }
     }