refactor: fix duplicate keychecker #2339
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
4b5a895 to
27dc00a
Compare
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## dev #2339 +/- ##
==========================================
- Coverage 61.65% 61.61% -0.05%
==========================================
Files 68 68
Lines 9720 9681 -39
==========================================
- Hits 5993 5965 -28
+ Misses 3727 3716 -11 ☔ View full report in Codecov by Sentry. |
ce20c93 to
0cca7b3
Compare
motorina0
reviewed
Mar 22, 2024
aea699c to
6bb4fd6
Compare
a57cf79 to
2a9f0bd
Compare
24c040e to
f8942b8
Compare
- refactor KeyChecker to be more approachable - only 1 sql query needed even if you use `get_key_type` - rename `WalletType` to `KeyType` wallet type was misleading fix test sorting
f8942b8 to
f4ad2cc
Compare
motorina0
reviewed
May 13, 2024
tests/api/test_api.py
Outdated
| }, | ||
| ) | ||
| assert response.status_code == 404 | ||
| assert response.status_code == 401 |
There was a problem hiding this comment.
- add assertion for delete with invoice key:
response = await client.delete(
"/api/v1/wallet",
headers={
"X-Api-Key": result["inkey"],
"Content-type": "application/json",
},
)
motorina0
reviewed
May 13, 2024
lnbits/decorators.py
Outdated
| key_value = ( | ||
| self._api_key | ||
| if self._api_key | ||
| else request.headers.get("X-API-KEY") or request.query_params["api-key"] |
There was a problem hiding this comment.
A bit inconsistent:
- if
request.query_paramsis missing then an exception is raised andHTTP 400 (BAD_REQUEST)is returned - but if
request.query_paramsisNoneor""then anHTTP 401 (UNAUTHORIZED)is returned
Suggested change
| else request.headers.get("X-API-KEY") or request.query_params["api-key"] | |
| else request.headers.get("X-API-KEY") or request.query_paramsget("api-key") |
There was a problem hiding this comment.
as a consequence the catch block should catch a generic Exception and return an Internal Server Error
motorina0
reviewed
May 13, 2024
tests/api/test_api.py
Outdated
| async def test_put_empty_request_expected_admin_keys(client): | ||
| response = await client.put("/api/v1/wallet/newwallet") | ||
| assert response.status_code == 401 | ||
| assert response.status_code == 400 |
There was a problem hiding this comment.
revert as a consequence of https://github.com/lnbits/lnbits/pull/2339/files#r1598398184
motorina0
reviewed
May 13, 2024
tests/api/test_api.py
Outdated
| async def test_post_empty_request_expected_invoice_keys(client): | ||
| response = await client.post("/api/v1/payments") | ||
| assert response.status_code == 401 | ||
| assert response.status_code == 400 |
There was a problem hiding this comment.
revert as a consequence of https://github.com/lnbits/lnbits/pull/2339/files#r1598398184
motorina0
approved these changes
May 13, 2024
arcbtc
approved these changes
May 13, 2024
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.
get_key_typeWalletTypetoKeyTypewallet type was misleading