Snyk report fixes + offcanvas sidebar fix (#263)
Refactor: - Improved consistency and robustness by standardizing file encoding arguments from 'utf-8' to 'utf8' across various file read/write operations. - Simplified status mapping logic in billing components and services by replacing switch statements with direct mapping objects for clearer and more maintainable code. - Enhanced type conversion and error handling in billing and internationalization components for improved reliability. - Updated sorting logic in team member tables for more predictable member ordering. - Improved error logging with sanitized output to prevent formatting issues. - Adjusted environment variable whitelisting to use a more flexible matching pattern. - Fix variables for sidebar style handling Style: - Refined spacing and layout in account selector and sidebar header components for better visual consistency.
This commit is contained in:
committed by
GitHub
parent
cb80e4fdcf
commit
fc2fda595a
@@ -1,4 +1,3 @@
|
||||
import { BillingConfig } from '@kit/billing';
|
||||
import { UpsertSubscriptionParams } from '@kit/billing/types';
|
||||
|
||||
type SubscriptionStatus =
|
||||
@@ -23,8 +22,6 @@ export function createLemonSqueezySubscriptionPayloadBuilderService() {
|
||||
* @description This class is used to build the subscription payload for Lemon Squeezy
|
||||
*/
|
||||
class LemonSqueezySubscriptionPayloadBuilderService {
|
||||
private config?: BillingConfig;
|
||||
|
||||
/**
|
||||
* @name build
|
||||
* @description Build the subscription payload for Lemon Squeezy
|
||||
@@ -103,24 +100,18 @@ class LemonSqueezySubscriptionPayloadBuilderService {
|
||||
}
|
||||
|
||||
private getSubscriptionStatus(status: SubscriptionStatus) {
|
||||
switch (status) {
|
||||
case 'active':
|
||||
return 'active';
|
||||
case 'cancelled':
|
||||
return 'canceled';
|
||||
case 'paused':
|
||||
return 'paused';
|
||||
case 'on_trial':
|
||||
return 'trialing';
|
||||
case 'past_due':
|
||||
return 'past_due';
|
||||
case 'unpaid':
|
||||
return 'unpaid';
|
||||
case 'expired':
|
||||
return 'past_due';
|
||||
default:
|
||||
return 'active';
|
||||
}
|
||||
const statusMap = {
|
||||
active: 'active',
|
||||
cancelled: 'canceled',
|
||||
paused: 'paused',
|
||||
on_trial: 'trialing',
|
||||
past_due: 'past_due',
|
||||
unpaid: 'unpaid',
|
||||
expired: 'past_due',
|
||||
} satisfies Record<SubscriptionStatus, UpsertSubscriptionParams['status']>;
|
||||
|
||||
// Default to 'active' if status is unknown
|
||||
return statusMap[status] || 'active';
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -447,19 +447,16 @@ export class LemonSqueezyWebhookHandlerService
|
||||
|
||||
return type;
|
||||
}
|
||||
|
||||
private getOrderStatus(status: OrderStatus) {
|
||||
switch (status) {
|
||||
case 'paid':
|
||||
return 'succeeded';
|
||||
case 'pending':
|
||||
return 'pending';
|
||||
case 'failed':
|
||||
return 'failed';
|
||||
case 'refunded':
|
||||
return 'failed';
|
||||
default:
|
||||
return 'pending';
|
||||
}
|
||||
const statusMap = {
|
||||
paid: 'succeeded',
|
||||
pending: 'pending',
|
||||
failed: 'failed',
|
||||
refunded: 'failed',
|
||||
} satisfies Record<OrderStatus, UpsertOrderParams['status']>
|
||||
|
||||
return statusMap[status] ?? 'pending';
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user