[feat] Pay to enable extension #2516
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
not only will we now have an inncentive for developers to make extensions they can sell, we also have a massive incentive for people just to run LNbits and attract users. This is really amazing |
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## dev #2516 +/- ##
==========================================
- Coverage 61.98% 61.38% -0.61%
==========================================
Files 69 69
Lines 9729 9865 +136
==========================================
+ Hits 6031 6056 +25
- Misses 3698 3809 +111 ☔ View full report in Codecov by Sentry. |
5f1196a to
022296e
Compare
motorina0
commented
May 27, 2024
|
|
||
| async def send_payment_notification(wallet: Wallet, payment: Payment): | ||
| await websocket_updater( | ||
| wallet.id, |
There was a problem hiding this comment.
valid fix unrelated to this PR
motorina0
commented
May 27, 2024
| stop_fn_name = next((fn for fn in stop_fns if hasattr(old_module, fn)), None) | ||
| assert stop_fn_name, "No stop function found for '{ext.module_name}'" | ||
|
|
||
| await getattr(old_module, stop_fn_name)() |
There was a problem hiding this comment.
valid fix unrelated to this PR
52a7605 to
6d3ab34
Compare
dni
reviewed
May 27, 2024
motorina0
commented
May 27, 2024
| ) from exc | ||
|
|
||
|
|
||
| async def toggle_extension(extension_to_enable, extension_to_disable, user_id): |
There was a problem hiding this comment.
this logic is moved to: /api/v1/extension/{ext_id}/enable and /api/v1/extension/{ext_id}/disable
motorina0
commented
May 27, 2024
Comment on lines
-114
to
-133
| ext_id = activate or deactivate | ||
| all_extensions = get_valid_extensions() | ||
| ext = next((e for e in all_extensions if e.code == ext_id), None) | ||
| if ext_id and user.admin: | ||
| if deactivate: | ||
| settings.lnbits_deactivated_extensions.add(deactivate) | ||
| elif activate: | ||
| # if extension never loaded (was deactivated on server startup) | ||
| if ext_id not in sys.modules.keys(): | ||
| # run extension start-up routine | ||
| core_app_extra.register_new_ext_routes(ext) | ||
|
|
||
| settings.lnbits_deactivated_extensions.remove(activate) | ||
|
|
||
| await update_installed_extension_state( | ||
| ext_id=ext_id, active=activate is not None | ||
| ) | ||
|
|
||
| all_ext_ids = [ext.code for ext in all_extensions] | ||
| inactive_extensions = await get_inactive_extensions() |
There was a problem hiding this comment.
this logic is moved to: /api/v1/extension/{ext_id}/activate and /api/v1/extension/{ext_id}/deactivate
motorina0
commented
May 27, 2024
Comment on lines
-53
to
-81
|
|
||
|
|
||
| # check GET /extensions: enable extension | ||
| # TODO: test fails because of removing lnurlp extension | ||
| # @pytest.mark.asyncio | ||
| # async def test_get_extensions_enable(client, to_user): | ||
| # response = await client.get( | ||
| # "extensions", params={"usr": to_user.id, "enable": "lnurlp"} | ||
| # ) | ||
| # assert response.status_code == 200, f"{response.url} {response.status_code}" | ||
|
|
||
|
|
||
| # check GET /extensions: enable and disable extensions, expect code 400 bad request | ||
| # @pytest.mark.asyncio | ||
| # async def test_get_extensions_enable_and_disable(client, to_user): | ||
| # response = await client.get( | ||
| # "extensions", | ||
| # params={"usr": to_user.id, "enable": "lnurlp", "disable": "lnurlp"}, | ||
| # ) | ||
| # assert response.status_code == 400, f"{response.url} {response.status_code}" | ||
|
|
||
|
|
||
| # check GET /extensions: enable nonexistent extension, expect code 400 bad request | ||
| @pytest.mark.asyncio | ||
| async def test_get_extensions_enable_nonexistent_extension(client, to_user): | ||
| response = await client.get( | ||
| "extensions", params={"usr": to_user.id, "enable": "12341234"} | ||
| ) | ||
| assert response.status_code == 400, f"{response.url} {response.status_code}" |
There was a problem hiding this comment.
- this logic has been moved out of
/extensionsand into/api/v1/extension - it is now covered by JMeter integration tests (see https://github.com/lnbits/lnbits-extensions/tree/pay_to_enable_extension_upgrades)
motorina0
commented
May 27, 2024
.github/workflows/jmeter.yml
Outdated
| run: | | ||
| git clone https://github.com/lnbits/lnbits-extensions | ||
| cd lnbits-extensions | ||
| git checkout pay_to_enable_extension_upgrades |
There was a problem hiding this comment.
Before merging into dev:
- remove this line
- merge this PR: Pay to enable extension upgrades lnbits-extensions#360
dni
approved these changes
May 28, 2024
arcbtc
approved these changes
May 28, 2024
motorina0
added a commit
that referenced
this pull request
Jul 10, 2024
* feat: add payment tab
* feat: add buttons
* feat: persist `pay to enable` changes
* fix: do not disable extension on upgrade
* fix: show releases tab first
* feat: extract `enableExtension` logic
* refactor: rename routes
* feat: show dialog for paying extension
* feat: create invoice to enable
* refactor: extract enable/disable extension logic
* feat: add extra info to UserExtensions
* feat: check payment for extension enable
* fix: parsing
* feat: admins must not pay
* fix: code checks
* fix: test
* refactor: extract extension activate/deactivate to the `api` side
* feat: add `get_user_extensions `
* feat: return explicit `requiresPayment`
* feat: add `isPaymentRequired` to extension list
* fix: `paid_to_enable` status
* fix: ui layout
* feat: show QR Code
* feat: wait for invoice to be paid
* test: removed deprecated test and dead code
* feat: add re-check button
* refactor: rename paths for endpoints
* feat: i18n
* feat: add `{"success": True}`
* test: fix listener
* fix: rebase errors
* chore: update bundle
* fix: return error status code for the HTML error pages
* fix: active extension loading from file system
* chore: temp commit
* fix: premature optimisation
* chore: make check
* refactor: remove extracted logic
* chore: code format
* fix: enable by default after install
* fix: use `discard` instead of `remove` for `set`
* chore: code format
* fix: better error code
* fix: check for stop function before invoking
* feat: check if the wallet belongs to the admin user
* refactor: return 402 Requires Payment
* chore: more typing
* chore: temp checkout different branch for tests
* fix: too much typing
* fix: remove try-except
* fix: typo
* fix: manual format
* fix: merge issue
* remove this line
---------
Co-authored-by: dni ⚡ <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
The functionality in this PR allows the administrators of LNbits instances to ask for payment when a regular user wants to
enablean extension. The payment will go to a wallet specified by the admin.Once a user pays for an extension, that extension will be accessible for that user no matter if it is upgraded or the user enables/disables multiple times.
Check this comment before merging: #2516 (comment)
Screenshots
pay_to_enable.mov
Depends on: #2516
viewstoapi