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

correct check for validLink base on validUntil-value

Browse Source
This commit is contained in:
clauspeterhuebner 2025-05-02 17:21:20 +02:00
parent 3bb4ece631
commit c5d307daba
2 changed files with 46 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/src/components/LinkInformations/RedeemSelectCommunity.vue
View File

@ -4,11 +4,12 @@
v-model:recipient-community="recipientCommunity"
:link-data="props.linkData"
:redeem-code="props.redeemCode"
:is-transaction-link-loaded="props.isTransactionLinkLoaded"
:is-contribution-link="props.isContributionLink"
:is-redeem-jwt-link="props.isRedeemJwtLink"
/>
<BCard>
<BCard v-if="props.isTransactionLinkLoaded">
<div class="mb-2">
<h2>{{ $t('gdd_per_link.redeem') }}</h2>
</div>
@ -42,6 +43,7 @@ const props = defineProps({
redeemCode: { type: String, required: true },
isContributionLink: { type: Boolean, default: false },
isRedeemJwtLink: { type: Boolean, default: false },
isTransactionLinkLoaded: { type: Boolean, default: false },
})
const recipientCommunity = ref({

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

@ -1,12 +1,13 @@
<!-- eslint-disable no-console -->
<template>
<div class="show-transaction-link-informations">
<div class="mt-4">
<div v-if="isTransactionLinkLoaded" class="mt-4">
<transaction-link-item :type="itemTypeExt">
<template #REDEEM_SELECT_COMMUNITY>
<redeem-select-community
:link-data="linkData"
:redeem-code="redeemCode"
:is-transaction-link-loaded="isTransactionLinkLoaded"
:is-contribution-link="isContributionLink"
:is-redeem-jwt-link="isRedeemJwtLink"
/>
@ -55,6 +56,7 @@ const { params, meta } = useRoute()
const store = useStore()
const { d, t } = useI18n()
const isTransactionLinkLoaded = ref(false)
const linkData = ref({
__typename: 'TransactionLink',
validUntil: null,
@ -91,7 +93,10 @@ const isContributionLink = computed(() => {
})
const isRedeemJwtLink = computed(() => {
if (result.value?.queryTransactionLink?.__typename === 'RedeemJwtLink') {
if (
isTransactionLinkLoaded.value &&
result.value?.queryTransactionLink?.__typename === 'RedeemJwtLink'
) {
return true
}
return false
@ -109,27 +114,41 @@ const tokenExpiresInSeconds = computed(() => {
const validLink = computed(() => {
console.log('TransactionLink.validLink... linkData.value.validUntil=', linkData.value.validUntil)
console.log('TransactionLink.validLink... new Date()=', new Date())
return !(linkData.value.validUntil < new Date())
if (!isTransactionLinkLoaded.value) {
return false
}
return !(linkData.value.validUntil !== null && linkData.value.validUntil < new Date())
})
const itemType = computed(() => {
console.log('TransactionLink.itemType... linkData.value=', linkData.value)
if (linkData.value.deletedAt) {
console.log('TransactionLink.itemType... TEXT_DELETED')
return 'TEXT_DELETED'
}
if (linkData.value.validUntil < new Date()) {
console.log('TransactionLink.itemType... TEXT_EXPIRED')
return 'TEXT_EXPIRED'
}
if (linkData.value.redeemedAt) {
console.log('TransactionLink.itemType... TEXT_REDEEMED')
return 'TEXT_REDEEMED'
}
if (store.state.token && store.state.tokenTime) {
if (tokenExpiresInSeconds.value < 5) {
console.log('TransactionLink.itemType... REDEEM_SELECT_COMMUNITY')
return 'REDEEM_SELECT_COMMUNITY'
console.log('TransactionLink.itemType... isTransactionLinkLoaded=', isTransactionLinkLoaded.value)
if (isTransactionLinkLoaded.value) {
console.log('TransactionLink.itemType... linkData.value=', linkData.value)
if (linkData.value.deletedAt) {
console.log('TransactionLink.itemType... TEXT_DELETED')
return 'TEXT_DELETED'
}
const validUntilDate = new Date(linkData.value.validUntil)
console.log('TransactionLink.itemType... validUntilDate=', validUntilDate)
console.log('TransactionLink.itemType... new Date()=', new Date())
console.log(
'TransactionLink.itemType... validUntilDate.getTime() < new Date().getTime()=',
validUntilDate.getTime() < new Date().getTime(),
)
if (validUntilDate.getTime() < new Date().getTime()) {
console.log('TransactionLink.itemType... TEXT_EXPIRED')
return 'TEXT_EXPIRED'
}
if (linkData.value.redeemedAt) {
console.log('TransactionLink.itemType... TEXT_REDEEMED')
return 'TEXT_REDEEMED'
}
if (store.state.token && store.state.tokenTime) {
if (tokenExpiresInSeconds.value < 5) {
console.log('TransactionLink.itemType... REDEEM_SELECT_COMMUNITY')
return 'REDEEM_SELECT_COMMUNITY'
}
}
console.log(
'TransactionLink.itemType... linkData.value.recipientUser=',
@ -141,11 +160,11 @@ const itemType = computed(() => {
console.log('TransactionLink.itemType... linkData.value.senderUser=', linkData.value.senderUser)
console.log(
'TransactionLink.itemType... linkData.value.recipientUser.gradidoID=',
linkData.value.recipientUser.gradidoID,
linkData.value.recipientUser?.gradidoID,
)
console.log(
'TransactionLink.itemType... linkData.value.senderUser.gradidoID=',
linkData.value.senderUser.gradidoID,
linkData.value.senderUser?.gradidoID,
)
if (
(!isRedeemJwtLink.value &&
@ -189,7 +208,6 @@ watch(itemType, (newItemType) => {
function updateRedeemedBoxText(type) {
console.log('TransactionLink.updateRedeemedBoxText... type=', type)
console.log('TransactionLink.updateRedeemedBoxText... validLink=', validLink.value)
switch (type) {
case 'TEXT_DELETED':
redeemedBoxText.value = t('gdd_per_link.link-deleted', {
@ -224,9 +242,11 @@ onResult(() => {
console.log('TransactionLink.onResult... stringify result=', JSON.stringify(result.value))
if (result.value?.queryTransactionLink?.__typename === 'TransactionLink') {
console.log('TransactionLink.onResult... TransactionLink')
isTransactionLinkLoaded.value = true
setTransactionLinkInformation()
} else if (result.value?.queryTransactionLink?.__typename === 'RedeemJwtLink') {
console.log('TransactionLink.onResult... RedeemJwtLink')
isTransactionLinkLoaded.value = true
setRedeemJwtLinkInformation()
} else {
console.log('TransactionLink.onResult... unknown type:', result.value)