don't rely only on latestStatus to set license as trial

gitkraken · Oct 4, 2024 · 2310bc7 · 2310bc7
1 parent ec3e55e
commit 2310bc7
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 11 deletions.
diff --git a/src/constants.subscription.ts b/src/constants.subscription.ts
@@ -30,4 +30,6 @@ export const enum SubscriptionState {
 	ProTrialReactivationEligible = 5,
 	/** Indicates a Pro/Teams/Enterprise paid user */
 	Paid = 6,
+	/** Indicates a Paid user who's license has expired */
+	PaidExpired = 7,
 }
diff --git a/src/git/gitProviderService.ts b/src/git/gitProviderService.ts
@@ -21,7 +21,7 @@ import { AccessDeniedError, CancellationError, ProviderNotFoundError, ProviderNo
 import type { FeatureAccess, Features, PlusFeatures, RepoFeatureAccess } from '../features';
 import { getApplicablePromo } from '../plus/gk/account/promos';
 import type { Subscription } from '../plus/gk/account/subscription';
-import { isSubscriptionExpired, isSubscriptionPaidPlan, SubscriptionPlanId } from '../plus/gk/account/subscription';
+import { isSubscriptionExpired, isSubscriptionPaidPlan } from '../plus/gk/account/subscription';
 import type { SubscriptionChangeEvent } from '../plus/gk/account/subscriptionService';
 import type { HostingIntegration } from '../plus/integrations/integration';
 import type { RepoComparisonKey } from '../repositories';

diff --git a/src/plus/gk/checkin.ts b/src/plus/gk/checkin.ts
@@ -1,12 +1,7 @@
 import { SubscriptionPlanId } from '../../constants.subscription';
 import type { Organization } from './account/organization';
 import type { Subscription } from './account/subscription';
-import {
-	getSubscriptionPlan,
-	getSubscriptionPlanPriority,
-	isSubscriptionExpired,
-	SubscriptionPlanId,
-} from './account/subscription';
+import { getSubscriptionPlan, getSubscriptionPlanPriority, isSubscriptionExpired } from './account/subscription';
 
 export type GKLicenses = Partial<Record<GKLicenseType, GKLicense>>;
 
@@ -136,14 +131,21 @@ export function getSubscriptionFromCheckIn(
 		organizationId != null ? paidLicensesByOrganizationId.get(organizationId) ?? bestPaidLicense : bestPaidLicense;
 	if (chosenPaidLicense != null) {
 		const [licenseType, license] = chosenPaidLicense;
+		const latestStartDate = new Date(license.latestStartDate);
+		const latestEndDate = new Date(license.latestEndDate);
+		const today = new Date();
 		actual = getSubscriptionPlan(
 			convertLicenseTypeToPlanId(licenseType),
 			isBundleLicenseType(licenseType),
 			license.reactivationCount ?? 0,
 			license.organizationId,
-			new Date(license.latestStartDate),
-			new Date(license.latestEndDate),
-			license.latestStatus === 'trial' || license.latestStatus === 'in_trial',
+			latestStartDate,
+			latestEndDate,
+			undefined,
+			undefined,
+			(license.latestStatus === 'in_trial' || license.latestStatus === 'trial') &&
+				latestEndDate > today &&
+				today > latestStartDate,
 		);
 	}
 
@@ -161,6 +163,7 @@ export function getSubscriptionFromCheckIn(
 			undefined,
 			undefined,
 			data.nextOptInDate,
+			false,
 		);
 	}
 
@@ -171,6 +174,9 @@ export function getSubscriptionFromCheckIn(
 			: bestEffectiveLicense;
 	if (chosenEffectiveLicense != null) {
 		const [licenseType, license] = chosenEffectiveLicense;
+		const latestStartDate = new Date(license.latestStartDate);
+		const latestEndDate = new Date(license.latestEndDate);
+		const today = new Date();
 		effective = getSubscriptionPlan(
 			convertLicenseTypeToPlanId(licenseType),
 			isBundleLicenseType(licenseType),
@@ -180,7 +186,9 @@ export function getSubscriptionFromCheckIn(
 			new Date(license.latestEndDate),
 			license.latestStatus === 'cancelled',
 			license.nextOptInDate ?? data.nextOptInDate,
-			license.latestStatus === 'trial' || license.latestStatus === 'in_trial',
+			(license.latestStatus === 'in_trial' || license.latestStatus === 'trial') &&
+				latestEndDate > today &&
+				today > latestStartDate,
 		);
 	}