Skip to content

A fully open source & end-to-end encrypted note taking alternative to Evernote.

core: get rid of subscription.type (all subs now use .plan)

Abdullah Attad88b30b5386b
diff --git a/packages/core/src/api/subscriptions.ts b/packages/core/src/api/subscriptions.ts
index e6e9f8940..2fe5f1aef 100644
--- a/packages/core/src/api/subscriptions.ts
+++ b/packages/core/src/api/subscriptions.ts
@@ -20,7 +20,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
import {
planToId,
SubscriptionPlan,
- SubscriptionType,
+ SubscriptionStatus,
User
} from "../types.js";
import hosts from "../utils/constants.js";
@@ -241,12 +241,8 @@ export default class Subscriptions {
}
function isLegacySubscription(user: User) {
- const type = user.subscription.type;
return (
- type !== undefined &&
- (type === SubscriptionType.BETA ||
- type === SubscriptionType.PREMIUM ||
- type === SubscriptionType.PREMIUM_CANCELED ||
- type === SubscriptionType.TRIAL)
+ user.subscription.plan === SubscriptionPlan.LEGACY_PRO &&
+ user.subscription.status !== SubscriptionStatus.EXPIRED
);
}
diff --git a/packages/core/src/api/user-manager.ts b/packages/core/src/api/user-manager.ts
index 1e7b98073..0d9a856fb 100644
--- a/packages/core/src/api/user-manager.ts
+++ b/packages/core/src/api/user-manager.ts
@@ -356,7 +356,8 @@ class UserManager {
const oldUser = await this.getUser();
if (
oldUser &&
- (oldUser.subscription.type !== user.subscription.type ||
+ (oldUser.subscription.plan !== user.subscription.plan ||
+ oldUser.subscription.status !== user.subscription.status ||
oldUser.subscription.provider !== user.subscription.provider)
) {
await this.tokenManager._refreshToken(true);
diff --git a/packages/core/src/types.ts b/packages/core/src/types.ts
index 224242959..2dfd85e50 100644
--- a/packages/core/src/types.ts
+++ b/packages/core/src/types.ts
@@ -562,7 +562,8 @@ export enum SubscriptionPlan {
ESSENTIAL = 1,
PRO = 2,
BELIEVER = 3,
- EDUCATION = 4
+ EDUCATION = 4,
+ LEGACY_PRO = 5
}
export enum SubscriptionStatus {
@@ -580,16 +581,6 @@ export enum SubscriptionProvider {
PADDLE = 3
}
-export enum SubscriptionType {
- BASIC = 0,
- TRIAL = 1,
- BETA = 2,
- PREMIUM = 5,
- PREMIUM_EXPIRED = 6,
- PREMIUM_CANCELED = 7,
- PREMIUM_PAUSED = 8
-}
-
export type User = {
id: string;
email: string;
@@ -615,7 +606,6 @@ export type User = {
productId: string;
provider: SubscriptionProvider;
start: number;
- type: SubscriptionType;
plan: SubscriptionPlan;
status: SubscriptionStatus;
trialsAvailed?: SubscriptionPlan[];