Repository navigation
fix(cli): validate app-scoped plans with app context #2825
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
deeae10
fix(cli): validate app-scoped plans with app context
WcaleNieWolny 3782d66
docs(cli): describe app-aware plan validation
WcaleNieWolny 375e896
fix(cli): normalize plan validation errors
WcaleNieWolny 4d2ca6f
fix(cli): fall back for legacy plan RPCs
WcaleNieWolny File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| #!/usr/bin/env node | ||
|
|
||
| import process from 'node:process' | ||
| import * as utils from '../src/utils.ts' | ||
|
|
||
| console.log('🧪 Testing app-aware plan validation...\n') | ||
|
|
||
| let testsPassed = 0 | ||
| let testsFailed = 0 | ||
|
|
||
| async function test(name, fn) { | ||
| try { | ||
| console.log(`\n🔍 ${name}`) | ||
| await fn() | ||
| console.log(`✅ PASSED: ${name}`) | ||
| testsPassed++ | ||
| } | ||
| catch (error) { | ||
| console.error(`❌ FAILED: ${name}`) | ||
| console.error(` Error: ${error.message}`) | ||
| testsFailed++ | ||
| } | ||
| } | ||
|
|
||
| function assert(condition, message) { | ||
| if (!condition) | ||
| throw new Error(message) | ||
| } | ||
|
|
||
| function assertEquals(actual, expected, message) { | ||
| if (JSON.stringify(actual) !== JSON.stringify(expected)) | ||
| throw new Error(message || `Expected ${JSON.stringify(expected)}, got ${JSON.stringify(actual)}`) | ||
| } | ||
|
|
||
| await test('checks an app-scoped key through the app-aware plan RPC', async () => { | ||
| assert(typeof utils.isAllowedActionForApp === 'function', 'Expected isAllowedActionForApp to be exported') | ||
|
|
||
| const calls = [] | ||
| const supabase = { | ||
| rpc: async (name, args) => { | ||
| calls.push({ name, args }) | ||
| return { data: true, error: null } | ||
| }, | ||
| } | ||
|
|
||
| const allowed = await utils.isAllowedActionForApp( | ||
| supabase, | ||
| 'org-id', | ||
| 'com.example.app', | ||
| ) | ||
|
|
||
| assertEquals(allowed, true) | ||
| assertEquals(calls, [{ | ||
| name: 'is_allowed_action_org_action', | ||
| args: { | ||
| orgid: 'org-id', | ||
| appid: 'com.example.app', | ||
| actions: ['mau', 'storage', 'bandwidth', 'build_time'], | ||
| }, | ||
| }]) | ||
| }) | ||
|
|
||
| await test('surfaces plan RPC errors instead of reporting an invalid plan', async () => { | ||
| assert(typeof utils.isAllowedActionForApp === 'function', 'Expected isAllowedActionForApp to be exported') | ||
|
|
||
| const supabase = { | ||
| rpc: async () => ({ | ||
| data: null, | ||
| error: { message: 'permission lookup failed' }, | ||
| }), | ||
| } | ||
|
|
||
| let thrown | ||
| try { | ||
| await utils.isAllowedActionForApp(supabase, 'org-id', 'com.example.app') | ||
| } | ||
| catch (error) { | ||
| thrown = error | ||
| } | ||
|
|
||
| assert(thrown instanceof Error, 'Expected the RPC error to be thrown') | ||
| assert(thrown.message.includes('Cannot validate plan'), `Unexpected error: ${thrown.message}`) | ||
| }) | ||
|
|
||
| console.log(`\n📊 Results: ${testsPassed} passed, ${testsFailed} failed`) | ||
| if (testsFailed > 0) | ||
| process.exit(1) |
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.