Merge branch 'additional-minutes-addon-purchase' into temp-feature-all-1.22

Author: ikreymer

.github/workflows/k3d-ci.yaml

@@ -119,7 +119,7 @@ jobs:
           version: 3.10.2
 
       - name: Create secret
-        run: kubectl create secret generic btrix-subs-app-secret --from-literal=BTRIX_SUBS_APP_URL=${{ env.ECHO_SERVER_HOST_URL }}/portalUrl
+        run: kubectl create secret generic btrix-subs-app-secret --from-literal=BTRIX_SUBS_APP_URL=${{ env.ECHO_SERVER_HOST_URL }}
 
       - name: Start Cluster with Helm
         run: |

.github/workflows/k3d-nightly-ci.yaml

@@ -99,6 +99,12 @@ jobs:
         with:
           version: 3.10.2
 
+      - name: Create Secret
+        run: >
+          kubectl create secret generic btrix-subs-app-secret
+          --from-literal=BTRIX_SUBS_APP_URL=${{ env.ECHO_SERVER_HOST_URL }}
+          --from-literal=BTRIX_SUBS_APP_API_KEY=TEST_PRESHARED_SECRET_PASSWORD
+
       - name: Start Cluster with Helm
         run: |
           helm upgrade --install -f ./chart/values.yaml -f ./chart/test/test.yaml -f ./chart/test/test-nightly-addons.yaml btrix ./chart/

.github/workflows/microk8s-ci.yaml

@@ -17,6 +17,12 @@ jobs:
   btrix-microk8s-test:
     runs-on: ubuntu-latest
     steps:
+      - name: Initial Disk Cleanup
+        uses: mathio/gha-cleanup@v1
+        with:
+          remove-browsers: true
+          verbose: true
+
       - uses: balchua/[email protected]
         with:
           channel: "1.25/stable"
@@ -60,7 +66,7 @@ jobs:
           cache-to: type=gha,scope=frontend,mode=max
 
       - name: Create Secret
-        run: sudo microk8s kubectl create secret generic btrix-subs-app-secret --from-literal=BTRIX_SUBS_APP_URL=${{ env.ECHO_SERVER_HOST_URL }}/portalUrl
+        run: sudo microk8s kubectl create secret generic btrix-subs-app-secret --from-literal=BTRIX_SUBS_APP_URL=${{ env.ECHO_SERVER_HOST_URL }}
 
       - name: Start Cluster with Helm
         run: |

backend/btrixcloud/auth.py

@@ -66,7 +66,9 @@ class OA2BearerOrQuery(OAuth2PasswordBearer):
     """Override bearer check to also test query"""
 
     async def __call__(
-        self, request: Request = None, websocket: WebSocket = None  # type: ignore
+        self,
+        request: Request = None,  # type: ignore
+        websocket: WebSocket = None,  # type: ignore
     ) -> str:
         param = None
         exc = None
@@ -163,7 +165,7 @@ async def get_current_user(
                 headers={"WWW-Authenticate": "Bearer"},
             )
 
-    async def shared_secret_or_active_user(
+    async def shared_secret_or_superuser(
         token: str = Depends(oauth2_scheme),
     ) -> User:
         # allow superadmin access if token matches the known shared secret
@@ -257,4 +259,4 @@ async def refresh_jwt(user=Depends(current_active_user)):
         user_info = await user_manager.get_user_info_with_orgs(user)
         return get_bearer_response(user, user_info)
 
-    return auth_jwt_router, current_active_user, shared_secret_or_active_user
+    return auth_jwt_router, current_active_user, shared_secret_or_superuser

backend/btrixcloud/main.py

@@ -172,9 +172,7 @@ def main() -> None:
 
     user_manager = init_user_manager(mdb, email, invites)
 
-    current_active_user, shared_secret_or_active_user = init_users_api(
-        app, user_manager
-    )
+    current_active_user, shared_secret_or_superuser = init_users_api(app, user_manager)
 
     org_ops = init_orgs_api(
         app,
@@ -185,7 +183,7 @@ def main() -> None:
         current_active_user,
     )
 
-    init_subs_api(app, mdb, org_ops, user_manager, shared_secret_or_active_user)
+    init_subs_api(app, mdb, org_ops, user_manager, shared_secret_or_superuser)
 
     event_webhook_ops = init_event_webhooks_api(mdb, org_ops, app_root)
 

backend/btrixcloud/models.py

@@ -1884,6 +1884,8 @@ class S3Storage(BaseModel):
 REASON_PAUSED = "subscriptionPaused"
 REASON_CANCELED = "subscriptionCanceled"
 
+SubscriptionEventType = Literal["create", "import", "update", "cancel", "add-minutes"]
+
 
 # ============================================================================
 class OrgQuotas(BaseModel):
@@ -1936,6 +1938,7 @@ class SubscriptionEventOut(BaseModel):
 
     oid: UUID
     timestamp: datetime
+    type: SubscriptionEventType
 
 
 # ============================================================================
@@ -2001,18 +2004,54 @@ class SubscriptionCancel(BaseModel):
 
 
 # ============================================================================
-class SubscriptionTrialEndReminder(BaseModel):
-    """Email reminder that subscription will end soon"""
+class SubscriptionCancelOut(SubscriptionCancel, SubscriptionEventOut):
+    """Output model for subscription cancellation event"""
 
-    subId: str
-    behavior_on_trial_end: Literal["cancel", "continue", "read-only"]
+    type: Literal["cancel"] = "cancel"
 
 
 # ============================================================================
-class SubscriptionCancelOut(SubscriptionCancel, SubscriptionEventOut):
-    """Output model for subscription cancellation event"""
+class SubscriptionAddMinutes(BaseModel):
+    """Represents a purchase of additional minutes"""
+
+    oid: UUID
+    minutes: int
+    totalPrice: float
+    currency: str
+    paymentId: str
 
-    type: Literal["cancel"] = "cancel"
+
+# ============================================================================
+class SubscriptionAddMinutesOut(SubscriptionAddMinutes, SubscriptionEventOut):
+    """SubscriptionAddMinutes output model"""
+
+    type: Literal["add-minutes"] = "add-minutes"
+
+
+# ============================================================================
+SubscriptionEventAny = Union[
+    SubscriptionCreate,
+    SubscriptionUpdate,
+    SubscriptionCancel,
+    SubscriptionImport,
+    SubscriptionAddMinutes,
+]
+
+SubscriptionEventAnyOut = Union[
+    SubscriptionCreateOut,
+    SubscriptionUpdateOut,
+    SubscriptionCancelOut,
+    SubscriptionImportOut,
+    SubscriptionAddMinutesOut,
+]
+
+
+# ============================================================================
+class SubscriptionTrialEndReminder(BaseModel):
+    """Email reminder that subscription will end soon"""
+
+    subId: str
+    behavior_on_trial_end: Literal["cancel", "continue", "read-only"]
 
 
 # ============================================================================
@@ -2035,6 +2074,30 @@ class SubscriptionPortalUrlResponse(BaseModel):
     portalUrl: str = ""
 
 
+# ============================================================================
+class AddonMinutesPricing(BaseModel):
+    """Addon minutes pricing"""
+
+    value: float
+    currency: str
+
+
+# ============================================================================
+class CheckoutAddonMinutesRequest(BaseModel):
+    """Request for additional minutes checkout session"""
+
+    orgId: str
+    subId: str
+    minutes: int | None = None
+    return_url: str
+
+
+class CheckoutAddonMinutesResponse(BaseModel):
+    """Response for additional minutes checkout session"""
+
+    checkoutUrl: str
+
+
 # ============================================================================
 class Subscription(BaseModel):
     """subscription data"""
@@ -2113,6 +2176,15 @@ class OrgQuotaUpdate(BaseModel):
 
     modified: datetime
     update: OrgQuotas
+    subEventId: str | None = None
+
+
+# ============================================================================
+class OrgQuotaUpdateOut(BaseModel):
+    """Organization quota update output for admins"""
+
+    modified: datetime
+    update: OrgQuotas
 
 
 # ============================================================================
@@ -2189,7 +2261,7 @@ class OrgOut(BaseMongoModel):
     giftedExecSecondsAvailable: int = 0
 
     quotas: OrgQuotas = OrgQuotas()
-    quotaUpdates: Optional[List[OrgQuotaUpdate]] = []
+    quotaUpdates: Optional[List[OrgQuotaUpdateOut]] = []
 
     webhookUrls: Optional[OrgWebhookUrls] = OrgWebhookUrls()
 
@@ -3154,14 +3226,7 @@ class PaginatedProfileResponse(PaginatedResponse):
 class PaginatedSubscriptionEventResponse(PaginatedResponse):
     """Response model for paginated subscription events"""
 
-    items: List[
-        Union[
-            SubscriptionCreateOut,
-            SubscriptionUpdateOut,
-            SubscriptionCancelOut,
-            SubscriptionImportOut,
-        ]
-    ]
+    items: List[SubscriptionEventAnyOut]
 
 
 # ============================================================================