Merge pull request #10 from fleetbase/dev-v0.0.11

enforce stripe onboard for users to monetize extensions
fleetbase · Jul 31, 2024 · 118af76 · 118af76
2 parents 9bdedfd + 4baf6ab
commit 118af76
Show file tree

Hide file tree

Showing 10 changed files with 152 additions and 97 deletions.
diff --git a/addon/components/extension-monetize-form.hbs b/addon/components/extension-monetize-form.hbs
@@ -1,55 +1,75 @@
 <ContentPanel @title={{t "registry-bridge.developers.extensions.extension-form.extension-payment-details"}} @open={{true}} @pad={{true}} @panelBodyClass="bg-white dark:bg-gray-800">
-    <InputGroup @wrapperClass={{unless @extension.payment_required "mb-0i"}}>
-        <Toggle
-            @isToggled={{@extension.payment_required}}
-            @onToggle={{fn (mut @extension.payment_required)}}
-            @label={{t "registry-bridge.developers.extensions.extension-form.extension-payment-required"}}
-            @helpText={{t "registry-bridge.developers.extensions.extension-form.extension-payment-required-help-text"}}
-        />
-    </InputGroup>
-    {{#if @extension.payment_required}}
-        {{!-- <InputGroup>
+    {{#if this.lookupStripeConnectAccount.isRunning}}
+        <div class="flex items-center justify-center flex-1 p-4">
+            <Spinner @loadingMessage="Loading monetization settings..." @loadingMessageClass="ml-2 text-black dark:text-white" @wrapperClass="flex flex-row items-center" />
+        </div>
+    {{else}}
+        {{#if this.hasStripeConnectAccount}}
+            <InputGroup @wrapperClass={{unless @extension.payment_required "mb-0i"}}>
+                <Toggle
+                    @isToggled={{@extension.payment_required}}
+                    @onToggle={{fn (mut @extension.payment_required)}}
+                    @label={{t "registry-bridge.developers.extensions.extension-form.extension-payment-required"}}
+                    @helpText={{t "registry-bridge.developers.extensions.extension-form.extension-payment-required-help-text"}}
+                />
+            </InputGroup>
+            {{#if @extension.payment_required}}
+                {{!-- <InputGroup>
             <Toggle
                 @isToggled={{@extension.subscription_required}}
                 @onToggle={{fn (mut @extension.subscription_required)}}
                 @label={{t "registry-bridge.developers.extensions.extension-form.extension-subscription-required"}}
                 @helpText={{t "registry-bridge.developers.extensions.extension-form.extension-subscription-required-help-text"}}
             />
         </InputGroup> --}}
-        {{#if @extension.subscription_required}}
-            <InputGroup
-                @name={{t "registry-bridge.developers.extensions.extension-form.extension-subscription-billing-period"}}
-                @helpText={{t "registry-bridge.developers.extensions.extension-form.extension-subscription-billing-period-help-text"}}
-            >
-                <Select
-                    @value={{@extension.subscription_billing_period}}
-                    @options={{this.billingPeriodOptions}}
-                    @onSelect={{fn (mut @extension.subscription_billing_period)}}
-                    @placeholder={{t "registry-bridge.developers.extensions.extension-form.extension-subscription-billing-period-placeholder"}}
-                    class="w-full"
-                />
-            </InputGroup>
-            <InputGroup
-                @name={{t "registry-bridge.developers.extensions.extension-form.extension-subscription-amount"}}
-                @helpText={{t "registry-bridge.developers.extensions.extension-form.extension-subscription-amount-help-text"}}
-                @wrapperClass="mb-0i"
-            >
-                <MoneyInput @value={{@extension.subscription_amount}} @currency="USD" />
-            </InputGroup>
+                {{#if @extension.subscription_required}}
+                    <InputGroup
+                        @name={{t "registry-bridge.developers.extensions.extension-form.extension-subscription-billing-period"}}
+                        @helpText={{t "registry-bridge.developers.extensions.extension-form.extension-subscription-billing-period-help-text"}}
+                    >
+                        <Select
+                            @value={{@extension.subscription_billing_period}}
+                            @options={{this.billingPeriodOptions}}
+                            @onSelect={{fn (mut @extension.subscription_billing_period)}}
+                            @placeholder={{t "registry-bridge.developers.extensions.extension-form.extension-subscription-billing-period-placeholder"}}
+                            class="w-full"
+                        />
+                    </InputGroup>
+                    <InputGroup
+                        @name={{t "registry-bridge.developers.extensions.extension-form.extension-subscription-amount"}}
+                        @helpText={{t "registry-bridge.developers.extensions.extension-form.extension-subscription-amount-help-text"}}
+                        @wrapperClass="mb-0i"
+                    >
+                        <MoneyInput @value={{@extension.subscription_amount}} @currency="USD" />
+                    </InputGroup>
+                {{else}}
+                    <div class="grid grid-cols-1 lg:grid-cols-2 gap-2">
+                        <InputGroup
+                            @name={{t "registry-bridge.developers.extensions.extension-form.extension-price"}}
+                            @helpText={{t "registry-bridge.developers.extensions.extension-form.extension-price-help-text"}}
+                        >
+                            <MoneyInput @value={{@extension.price}} @currency="USD" />
+                        </InputGroup>
+                        <InputGroup
+                            @name={{t "registry-bridge.developers.extensions.extension-form.extension-sale-price"}}
+                            @helpText={{t "registry-bridge.developers.extensions.extension-form.extension-sale-price-help-text"}}
+                        >
+                            <MoneyInput @value={{@extension.sale_price}} @currency="USD" />
+                        </InputGroup>
+                    </div>
+                {{/if}}
+            {{/if}}
         {{else}}
-            <div class="grid grid-cols-1 lg:grid-cols-2 gap-2">
-                <InputGroup
-                    @name={{t "registry-bridge.developers.extensions.extension-form.extension-price"}}
-                    @helpText={{t "registry-bridge.developers.extensions.extension-form.extension-price-help-text"}}
-                >
-                    <MoneyInput @value={{@extension.price}} @currency="USD" />
-                </InputGroup>
-                <InputGroup
-                    @name={{t "registry-bridge.developers.extensions.extension-form.extension-sale-price"}}
-                    @helpText={{t "registry-bridge.developers.extensions.extension-form.extension-sale-price-help-text"}}
-                >
-                    <MoneyInput @value={{@extension.sale_price}} @currency="USD" />
-                </InputGroup>
+            <div class="container">
+                <div class="max-w-3xl mx-auto mt-4">
+                    <div class="content">
+                        <div class="flex flex-col items-center justify-center">
+                            <h1 class="text-lg font-semibold mb-1">Your account is not setup to accept payments yet.</h1>
+                            <p class="text-sm mb-2">To accept payments for extensions, you must complete the onboard process via Stripe.</p>
+                            <Button @type="primary" @size="lg" @text="Start payments onboard" @onClick={{transition-to "developers.payments.onboard"}} />
+                        </div>
+                    </div>
+                </div>
             </div>
         {{/if}}
     {{/if}}

diff --git a/addon/components/extension-monetize-form.js b/addon/components/extension-monetize-form.js
@@ -1,7 +1,25 @@
 import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
+import { inject as service } from '@ember/service';
+import { task } from 'ember-concurrency';
 
 export default class ExtensionMonetizeFormComponent extends Component {
+    @service fetch;
     @tracked subscriptionModelOptions = ['flat_rate', 'tiered', 'usage'];
     @tracked billingPeriodOptions = ['daily', 'weekly', 'monthly', 'quarterly', 'yearly'];
+    @tracked hasStripeConnectAccount = false;
+
+    constructor() {
+        super(...arguments);
+        this.lookupStripeConnectAccount.perform();
+    }
+
+    @task *lookupStripeConnectAccount() {
+        try {
+            const { hasStripeConnectAccount } = yield this.fetch.get('payments/has-stripe-connect-account', {}, { namespace: '~registry/v1' });
+            this.hasStripeConnectAccount = hasStripeConnectAccount;
+        } catch (error) {
+            this.hasStripeConnectAccount = false;
+        }
+    }
 }
diff --git a/addon/controllers/developers/extensions/edit/monetize.js b/addon/controllers/developers/extensions/edit/monetize.js
@@ -1,7 +1,3 @@
 import Controller from '@ember/controller';
-import { tracked } from '@glimmer/tracking';
 
-export default class DevelopersExtensionsEditMonetizeController extends Controller {
-    @tracked subscriptionModelOptions = ['flat_rate', 'tiered', 'usage'];
-    @tracked billingPeriodOptions = ['daily', 'weekly', 'monthly', 'quarterly', 'yearly'];
-}
+export default class DevelopersExtensionsEditMonetizeController extends Controller {}
diff --git a/addon/controllers/developers/payments/index.js b/addon/controllers/developers/payments/index.js
@@ -1,7 +1,10 @@
 import Controller from '@ember/controller';
 import { tracked } from '@glimmer/tracking';
+import { inject as service } from '@ember/service';
+import { task } from 'ember-concurrency';
 
 export default class DevelopersPaymentsIndexController extends Controller {
+    @service fetch;
     @tracked hasStripeConnectAccount = true;
     @tracked table;
     @tracked page = 1;
@@ -37,4 +40,13 @@ export default class DevelopersPaymentsIndexController extends Controller {
             width: '20%',
         },
     ];
+
+    @task *lookupStripeConnectAccount() {
+        try {
+            const { hasStripeConnectAccount } = yield this.fetch.get('payments/has-stripe-connect-account', {}, { namespace: '~registry/v1' });
+            this.hasStripeConnectAccount = hasStripeConnectAccount;
+        } catch (error) {
+            this.hasStripeConnectAccount = false;
+        }
+    }
 }
diff --git a/addon/routes/developers/payments/index.js b/addon/routes/developers/payments/index.js
@@ -15,12 +15,7 @@ export default class DevelopersPaymentsIndexRoute extends Route {
         return this.fetch.get('payments/author-received', {}, { namespace: '~registry/v1' });
     }
 
-    async setupController(controller) {
-        try {
-            const { hasStripeConnectAccount } = await this.fetch.get('payments/has-stripe-connect-account', {}, { namespace: '~registry/v1' });
-            controller.hasStripeConnectAccount = hasStripeConnectAccount;
-        } catch (error) {
-            controller.hasStripeConnectAccount = false;
-        }
+    setupController(controller) {
+        controller.lookupStripeConnectAccount.perform();
     }
 }
diff --git a/addon/templates/developers/payments/index.hbs b/addon/templates/developers/payments/index.hbs
@@ -1,34 +1,42 @@
 <Layout::Section::Header @title="Payments">
-    <div class="flex flex-row space-x-1">
-        <span class="text-sm text-black dark:text-white font-bold">Total Amount:</span>
-        <span class="text-sm text-black dark:text-white">{{format-currency @model.total_amount "USD"}}</span>
-    </div>
+    {{#if this.hasStripeConnectAccount}}
+        <div class="flex flex-row space-x-1">
+            <span class="text-sm text-black dark:text-white font-bold">Total Amount:</span>
+            <span class="text-sm text-black dark:text-white">{{format-currency @model.total_amount "USD"}}</span>
+        </div>
+    {{/if}}
 </Layout::Section::Header>
 
 <Layout::Section::Body class="overflow-y-scroll h-full">
-    {{#if this.hasStripeConnectAccount}}
-        <Table
-            @rows={{@model.data}}
-            @columns={{this.columns}}
-            @selectable={{false}}
-            @canSelectAll={{false}}
-            @onSetup={{fn (mut this.table)}}
-            @pagination={{true}}
-            @paginationMeta={{@model.meta}}
-            @page={{this.page}}
-            @onPageChange={{fn (mut this.page)}}
-        />
+    {{#if this.lookupStripeConnectAccount.isRunning}}
+        <div class="flex items-center justify-center flex-1 p-4">
+            <Spinner @loadingMessage="Loading monetization settings..." @loadingMessageClass="ml-2 text-black dark:text-white" @wrapperClass="flex flex-row items-center" />
+        </div>
     {{else}}
-        <div class="container">
-            <div class="max-w-3xl mx-auto mt-4">
-                <div class="content">
-                    <div class="flex flex-col items-center justify-center">
-                        <h1 class="text-lg font-semibold mb-1">Your account is not setup to accept payments yet.</h1>
-                        <p class="text-sm mb-2">To accept payments for extensions, you must complete the onboard process via Stripe.</p>
-                        <Button @type="primary" @size="lg" @text="Start payments onboard" @onClick={{transition-to "developers.payments.onboard"}} />
+        {{#if this.hasStripeConnectAccount}}
+            <Table
+                @rows={{@model.data}}
+                @columns={{this.columns}}
+                @selectable={{false}}
+                @canSelectAll={{false}}
+                @onSetup={{fn (mut this.table)}}
+                @pagination={{true}}
+                @paginationMeta={{@model.meta}}
+                @page={{this.page}}
+                @onPageChange={{fn (mut this.page)}}
+            />
+        {{else}}
+            <div class="container">
+                <div class="max-w-3xl mx-auto mt-4">
+                    <div class="content">
+                        <div class="flex flex-col items-center justify-center">
+                            <h1 class="text-lg font-semibold mb-1">Your account is not setup to accept payments yet.</h1>
+                            <p class="text-sm mb-2">To accept payments for extensions, you must complete the onboard process via Stripe.</p>
+                            <Button @type="primary" @size="lg" @text="Start payments onboard" @onClick={{transition-to "developers.payments.onboard"}} />
+                        </div>
                     </div>
                 </div>
             </div>
-        </div>
+        {{/if}}
     {{/if}}
 </Layout::Section::Body>
diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "fleetbase/registry-bridge",
-    "version": "0.0.10",
+    "version": "0.0.11",
     "description": "Internal Bridge between Fleetbase API and Extensions Registry",
     "keywords": [
         "fleetbase-extension",

diff --git a/extension.json b/extension.json
@@ -1,6 +1,6 @@
 {
     "name": "Registry Bridge",
-    "version": "0.0.10",
+    "version": "0.0.11",
     "description": "Internal Bridge between Fleetbase API and Extensions Registry",
     "repository": "https://github.com/fleetbase/registry-bridge",
     "license": "AGPL-3.0-or-later",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@fleetbase/registry-bridge-engine",
-    "version": "0.0.10",
+    "version": "0.0.11",
     "description": "Internal Bridge between Fleetbase API and Extensions Registry",
     "fleetbase": {
         "route": "extensions"

diff --git a/server/src/Http/Controllers/Internal/v1/RegistryAuthController.php b/server/src/Http/Controllers/Internal/v1/RegistryAuthController.php
@@ -40,21 +40,27 @@ public function composerAuthentication(Request $request)
             return response()->error('Invalid registry token provided for authentication.', 401);
         }
 
-        // Fetch unauthorized extensions
-        $unauthorizedExtensions = RegistryExtension::where('payment_required', true)
-        ->whereDoesntHave('purchases', function ($query) use ($registryUser) {
-            $query->where('company_uuid', $registryUser->company_uuid);
-        })
-        ->whereHas('currentBundle')
-        ->with('currentBundle')
-        ->get();
-
-        // Map to unathorized to package names
-        $unauthorizedExtensionNames = $unauthorizedExtensions->map(function ($registryExtension) {
-            $composerJson = $registryExtension->currentBundle->meta['composer.json'] ?? [];
-
-            return $composerJson['name'] ?? null;
-        })->filter()->values();
+        // Init unauthorized extensions
+        $unauthorizedExtensionNames = collect();
+
+        // Unless admin the registry user is only allowed access to their extensions
+        if ($registryUser->isNotAdmin()) {
+            // Fetch unauthorized extensions
+            $unauthorizedExtensions = RegistryExtension::where('payment_required', true)
+            ->whereDoesntHave('purchases', function ($query) use ($registryUser) {
+                $query->where('company_uuid', $registryUser->company_uuid);
+            })
+            ->whereHas('currentBundle')
+            ->with('currentBundle')
+            ->get();
+
+            // Map to unathorized to package names
+            $unauthorizedExtensionNames = $unauthorizedExtensions->map(function ($registryExtension) {
+                $composerJson = $registryExtension->currentBundle->meta['composer.json'] ?? [];
+
+                return $composerJson['name'] ?? null;
+            })->filter()->values();
+        }
 
         // Done
         return response()->json([