@lls/common 24.11.0-e3175742 → 24.11.0-e34d1cd7

package/lib/index.js

@@ -47,14 +47,14 @@ var FEATURES = {
   FEATURE_DASHBOARD,
   FEATURE_PROFILE
 };
-var PLANS = {
-  CONNECTED_PLAN: "connected",
-  ANONYMOUS_PLAN: "anonymous",
-  TEACHER_PLAN: "teacher",
-  CLASSROOM_PLAN: "classroom"
+var ROLES = {
+  ROLE_CONNECTED: "connected",
+  ROLE_ANONYMOUS: "anonymous",
+  ROLE_TEACHER: "teacher",
+  ROLE_CLASSROOM: "classroom"
 };
-var PLANS_RIGHTS = {
-  [PLANS.ANONYMOUS_PLAN]: {
+var RIGHTS_FOR_ROLES = {
+  [ROLES.ROLE_ANONYMOUS]: {
     [FEATURES.FEATURE_EXPORT]: false,
     [FEATURES.FEATURE_CUSTOMIZATION]: false,
     [FEATURES.FEATURE_VIDEO_PROJECTION]: false,
@@ -79,7 +79,7 @@ var PLANS_RIGHTS = {
     [FEATURES.FEATURE_DASHBOARD]: false,
     [FEATURES.FEATURE_PROFILE]: false
   },
-  [PLANS.CONNECTED_PLAN]: {
+  [ROLES.ROLE_CONNECTED]: {
     [FEATURES.FEATURE_EXPORT]: false,
     [FEATURES.FEATURE_CUSTOMIZATION]: false,
     [FEATURES.FEATURE_VIDEO_PROJECTION]: false,
@@ -104,7 +104,7 @@ var PLANS_RIGHTS = {
     [FEATURES.FEATURE_DASHBOARD]: true,
     [FEATURES.FEATURE_PROFILE]: true
   },
-  [PLANS.CLASSROOM_PLAN]: {
+  [ROLES.ROLE_CLASSROOM]: {
     [FEATURES.FEATURE_EXPORT]: true,
     [FEATURES.FEATURE_CUSTOMIZATION]: true,
     [FEATURES.FEATURE_VIDEO_PROJECTION]: true,
@@ -129,7 +129,7 @@ var PLANS_RIGHTS = {
     [FEATURES.FEATURE_DASHBOARD]: true,
     [FEATURES.FEATURE_PROFILE]: true
   },
-  [PLANS.TEACHER_PLAN]: {
+  [ROLES.ROLE_TEACHER]: {
     [FEATURES.FEATURE_EXPORT]: true,
     [FEATURES.FEATURE_CUSTOMIZATION]: true,
     [FEATURES.FEATURE_VIDEO_PROJECTION]: true,
@@ -157,36 +157,21 @@ var PLANS_RIGHTS = {
 };
 
 // src/utils/right.ts
-var getPlanRights = ({ user, bookUri }) => {
+var hasRight = ({ feature, user, bookUri }) => {
   if (!user) {
-    return PLANS_RIGHTS[PLANS.ANONYMOUS_PLAN];
+    return RIGHTS_FOR_ROLES[ROLES.ROLE_ANONYMOUS][feature];
   }
-  const plans = user?.plans ?? {};
-  if (!Object.keys(plans)?.length) {
-    return PLANS_RIGHTS[PLANS.CONNECTED_PLAN];
+  const subscriptions = user?.subscriptions ?? {};
+  if (!Object.keys(subscriptions)?.length) {
+    return RIGHTS_FOR_ROLES[ROLES.ROLE_CONNECTED][feature];
   }
-  if (bookUri && plans[PLANS.TEACHER_PLAN]?.includes(bookUri)) {
-    return PLANS_RIGHTS[PLANS.TEACHER_PLAN];
+  if (subscriptions?.[ROLES.ROLE_TEACHER]?.includes(bookUri)) {
+    return RIGHTS_FOR_ROLES[ROLES.ROLE_TEACHER][feature];
   }
-  if (bookUri && plans[PLANS.CLASSROOM_PLAN]?.includes(bookUri)) {
-    return PLANS_RIGHTS[PLANS.CLASSROOM_PLAN];
+  if (subscriptions?.[ROLES.ROLE_CLASSROOM]?.includes(bookUri)) {
+    return RIGHTS_FOR_ROLES[ROLES.ROLE_CLASSROOM][feature];
   }
-  return PLANS_RIGHTS[PLANS.CONNECTED_PLAN];
-};
-var hasFeatureAccess = ({ feature, user, bookUri }) => {
-  if (!feature) return false;
-  if (feature === FEATURES.FEATURE_CLASSROOM && user?.plans?.[PLANS.CLASSROOM_PLAN]?.length) {
-    return true;
-  }
-  const planRights = getPlanRights({ user, bookUri });
-  if (feature in planRights) return planRights[feature] ?? false;
-  return false;
-};
-var getFeaturesAccessByBook = ({
-  user,
-  bookUri
-}) => {
-  return getPlanRights({ user, bookUri });
+  return RIGHTS_FOR_ROLES[ROLES.ROLE_CONNECTED][feature];
 };
 export {
   FEATURES,
@@ -213,8 +198,7 @@ export {
   FEATURE_SIDE_BY_SIDE_PRESENTATION,
   FEATURE_TEXT_TO_SPEECH,
   FEATURE_VIDEO_PROJECTION,
-  PLANS,
-  PLANS_RIGHTS,
-  getFeaturesAccessByBook,
-  hasFeatureAccess
+  RIGHTS_FOR_ROLES,
+  ROLES,
+  hasRight
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lls/common",
-  "version": "24.11.0-e3175742",
+  "version": "24.11.0-e34d1cd7",
   "description": "utils and constants shared between front and backend",
   "main": "./lib/index.js",
   "module": "./lib/index.js",
@@ -34,7 +34,7 @@
     "lodash": "4.17.21",
     "esbuild": "0.24.0",
     "typescript": "5.6.3",
-    "@lls/vitescripts": "24.11.0-e3175742"
+    "@lls/vitescripts": "24.11.0-e34d1cd7"
   },
   "dependencies": {},
   "scripts": {