luulam/AFFiNE
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix: some event missing with multiple env webhook (#6705)

Browse Source
This commit is contained in:
darkskygit
2024-04-26 02:56:09 +00:00
parent 15c1e46680
commit 8bdd940ac8
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/backend/server/src/plugins/payment/service.ts
View File

@@ -571,6 +571,13 @@ export class SubscriptionService {
const [plan, recurring] = this.decodePlanFromSubscription(subscription); const [plan, recurring] = this.decodePlanFromSubscription(subscription);
const planActivated = SubscriptionActivated.includes(subscription.status); const planActivated = SubscriptionActivated.includes(subscription.status);
// update features first, features modify are idempotent
// so there is no need to skip if a subscription already exists.
this.event.emit('user.subscription.activated', {
userId: user.id,
plan,
});
let nextBillAt: Date | null = null; let nextBillAt: Date | null = null;
if (planActivated && !subscription.canceled_at) { if (planActivated && !subscription.canceled_at) {
// get next bill date from upcoming invoice // get next bill date from upcoming invoice
@@ -624,11 +631,6 @@ export class SubscriptionService {
data: update, data: update,
}); });
} else { } else {
this.event.emit('user.subscription.activated', {
userId: user.id,
plan,
});
return await this.db.userSubscription.create({ return await this.db.userSubscription.create({
data: { data: {
userId: user.id, userId: user.id,