IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2026-03-30 22:25:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

treat validUntil as Date in case of DisbursementLink too

Browse Source
This commit is contained in:
clauspeterhuebner 2025-04-24 14:34:26 +02:00
parent f133cb15bc
commit 322e4ca37f
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
backend/src/graphql/model/DisbursementLink.ts
View File

@ -1,5 +1,5 @@
import { Decimal } from 'decimal.js-light' import { Decimal } from 'decimal.js-light'
import { ObjectType, Field, Int } from 'type-graphql' import { ObjectType, Field } from 'type-graphql'
import { DisbursementJwtPayloadType } from '@/auth/jwt/payloadtypes/DisbursementJwtPayloadType' import { DisbursementJwtPayloadType } from '@/auth/jwt/payloadtypes/DisbursementJwtPayloadType'
@ -27,7 +27,7 @@ export class DisbursementLink {
this.memo = disbursementPayload.memo this.memo = disbursementPayload.memo
this.code = disbursementPayload.redeemcode this.code = disbursementPayload.redeemcode
if (disbursementPayload.exp) { if (disbursementPayload.exp) {
this.validUntil = disbursementPayload.exp * 1000 this.validUntil = new Date(disbursementPayload.exp * 1000)
} }
} }
@ -52,6 +52,6 @@ export class DisbursementLink {
@Field(() => String) @Field(() => String)
code: string code: string
@Field(() => Int) @Field(() => Date)
validUntil: number validUntil: Date
} }

8
frontend/src/pages/TransactionLink.vue
View File

@ -104,8 +104,8 @@ const tokenExpiresInSeconds = computed(() => {
const validLink = computed(() => { const validLink = computed(() => {
console.log('TransactionLink.validLink... linkData.value.validUntil=', linkData.value.validUntil) console.log('TransactionLink.validLink... linkData.value.validUntil=', linkData.value.validUntil)
console.log('TransactionLink.validLink... new Date().getTime()=', new Date().getTime()) console.log('TransactionLink.validLink... new Date()=', new Date())
return new Date(linkData.value.validUntil) > new Date() return linkData.value.validUntil > new Date()
}) })
const itemType = computed(() => { const itemType = computed(() => {
@ -113,7 +113,7 @@ const itemType = computed(() => {
console.log('TransactionLink.itemType... TEXT_DELETED') console.log('TransactionLink.itemType... TEXT_DELETED')
return 'TEXT_DELETED' return 'TEXT_DELETED'
} }
if (new Date(linkData.value.validUntil) < new Date()) { if (linkData.value.validUntil < new Date()) {
console.log('TransactionLink.itemType... TEXT_EXPIRED') console.log('TransactionLink.itemType... TEXT_EXPIRED')
return 'TEXT_EXPIRED' return 'TEXT_EXPIRED'
} }
@ -165,7 +165,7 @@ function updateRedeemedBoxText(type) {
break break
case 'TEXT_EXPIRED': case 'TEXT_EXPIRED':
redeemedBoxText.value = t('gdd_per_link.link-expired', { redeemedBoxText.value = t('gdd_per_link.link-expired', {
date: d(new Date(linkData.value.validUntil), 'long'), date: d(linkData.value.validUntil, 'long'),
}) })
break break
case 'TEXT_REDEEMED': case 'TEXT_REDEEMED':