remove expired licenses filter & check actual license expiration

Author: sergiolms

src/plus/gk/checkin.ts

@@ -2,11 +2,10 @@ import { SubscriptionPlanId } from '../../constants.subscription';
 import type { Organization } from './account/organization';
 import type { Subscription } from './account/subscription';
 import {
-	computeSubscriptionState,
 	getSubscriptionPlan,
 	getSubscriptionPlanPriority,
+	isSubscriptionExpired,
 	SubscriptionPlanId,
-	SubscriptionState,
 } from './account/subscription';
 
 export interface GKCheckInResponse {
@@ -73,7 +72,6 @@ export function getSubscriptionFromCheckIn(
 
 	let effectiveLicenses = Object.entries(data.licenses.effectiveLicenses) as [GKLicenseType, GKLicense][];
 	let paidLicenses = Object.entries(data.licenses.paidLicenses) as [GKLicenseType, GKLicense][];
-	paidLicenses = paidLicenses.filter(license => license[1].latestStatus !== 'cancelled');
 	if (paidLicenses.length > 1) {
 		paidLicenses.sort(
 			(a, b) =>
@@ -83,6 +81,7 @@ export function getSubscriptionFromCheckIn(
 					licenseStatusPriority(a[1].latestStatus)),
 		);
 	}
+
 	if (effectiveLicenses.length > 1) {
 		effectiveLicenses.sort(
 			(a, b) =>
@@ -181,17 +180,10 @@ export function getSubscriptionFromCheckIn(
 		);
 	}
 
-	const isActualLicenseExpired =
-		computeSubscriptionState({
-			plan: {
-				actual: actual,
-				effective: actual,
-			},
-			account: account,
-		}) === SubscriptionState.PaidExpired;
 	if (
 		effective == null ||
-		(getSubscriptionPlanPriority(actual.id) >= getSubscriptionPlanPriority(effective.id) && !isActualLicenseExpired)
+		(getSubscriptionPlanPriority(actual.id) >= getSubscriptionPlanPriority(effective.id) &&
+			!isSubscriptionExpired(actual))
 	) {
 		effective = { ...actual };
 	}