IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2026-02-06 01:46:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

correct compile errors on JwtTypes

Browse Source
This commit is contained in:
clauspeterhuebner 2025-04-16 15:29:55 +02:00
parent b63dbb5898
commit 9648bb1227
2 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
backend/src/auth/jwt/JWT.ts
View File

@ -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
}

38
backend/src/graphql/resolver/TransactionLinkResolver.ts
View File

@ -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)
}
}
}