Fix old name in plan decoding

simple-login · Nov 29, 2024 · 3b0b5f4 · 3b0b5f4
1 parent 6b21273
commit 3b0b5f4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/app/account_linking.py b/app/account_linking.py
@@ -91,7 +91,7 @@ def set_plan_for_partner_user(partner_user: PartnerUser, plan: SLPlan):
             end_time = None
         if sub is None:
             LOG.i(
-                f"Creating partner_subscription [user_id={partner_user.user_id}] [partner_id={partner_user.partner_id}]"
+                f"Creating partner_subscription [user_id={partner_user.user_id}] [partner_id={partner_user.partner_id}] with {end_time} / {is_lifetime}"
             )
             create_partner_subscription(
                 partner_user=partner_user,
@@ -102,14 +102,14 @@ def set_plan_for_partner_user(partner_user: PartnerUser, plan: SLPlan):
             agent.record_custom_event("PlanChange", {"plan": "premium", "type": "new"})
         else:
             if sub.end_at != plan.expiration or sub.lifetime != is_lifetime:
-                LOG.i(
-                    f"Updating partner_subscription [user_id={partner_user.user_id}] [partner_id={partner_user.partner_id}]"
-                )
                 agent.record_custom_event(
                     "PlanChange", {"plan": "premium", "type": "extension"}
                 )
                 sub.end_at = plan.expiration if not is_lifetime else None
                 sub.lifetime = is_lifetime
+                LOG.i(
+                    f"Updating partner_subscription [user_id={partner_user.user_id}] [partner_id={partner_user.partner_id}] to {sub.end_at} / {sub.lifetime} "
+                )
                 emit_user_audit_log(
                     user=partner_user.user,
                     action=UserAuditLogAction.SubscriptionExtended,

diff --git a/app/proton/proton_client.py b/app/proton/proton_client.py
@@ -113,7 +113,7 @@ def get_user(self) -> Optional[UserInformation]:
         if plan_value == PLAN_FREE:
             plan = SLPlan(type=SLPlanType.Free, expiration=None)
         elif plan_value == PLAN_PREMIUM:
-            expiration = info.get("Expiration", "1")
+            expiration = info.get("PlanExpiration", "1")
             plan = SLPlan(
                 type=SLPlanType.Premium,
                 expiration=Arrow.fromtimestamp(expiration, tzinfo="utc"),