take into account expired paid licenses in getSubscriptionFromCheckIn

Author: sergiolms

src/plus/gk/account/subscriptionService.ts

@@ -872,7 +872,7 @@ export class SubscriptionService implements Disposable {
 		if (
 			!options?.force &&
 			this._lastValidatedDate != null &&
-			Date.now() - this._lastValidatedDate.getTime() < 12 * 60 * 60 * 1000 &&
+			Date.now() - this._lastValidatedDate.getTime() < 1000 &&
 			!isSubscriptionExpired(this._subscription)
 		) {
 			setLogScopeExit(scope, ` (${fromNow(this._lastValidatedDate.getTime(), true)})...`, 'skipped');

src/plus/gk/checkin.ts

@@ -1,6 +1,12 @@
 import type { Organization } from './account/organization';
 import type { Subscription } from './account/subscription';
-import { getSubscriptionPlan, getSubscriptionPlanPriority, SubscriptionPlanId } from './account/subscription';
+import {
+	computeSubscriptionState,
+	getSubscriptionPlan,
+	getSubscriptionPlanPriority,
+	SubscriptionPlanId,
+	SubscriptionState,
+} from './account/subscription';
 
 export interface GKCheckInResponse {
 	readonly user: GKUser;
@@ -66,9 +72,7 @@ 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 !== 'expired' && license[1].latestStatus !== 'cancelled',
-	);
+	paidLicenses = paidLicenses.filter(license => license[1].latestStatus !== 'cancelled');
 	if (paidLicenses.length > 1) {
 		paidLicenses.sort(
 			(a, b) =>
@@ -176,7 +180,18 @@ export function getSubscriptionFromCheckIn(
 		);
 	}
 
-	if (effective == null || getSubscriptionPlanPriority(actual.id) >= getSubscriptionPlanPriority(effective.id)) {
+	const isActualLicenseExpired =
+		computeSubscriptionState({
+			plan: {
+				actual: actual,
+				effective: actual,
+			},
+			account: account,
+		}) === SubscriptionState.PaidExpired;
+	if (
+		effective == null ||
+		(getSubscriptionPlanPriority(actual.id) >= getSubscriptionPlanPriority(effective.id) && !isActualLicenseExpired)
+	) {
 		effective = { ...actual };
 	}