opensource/zpan
3
0
Fork 0
mirror of https://github.com/saltbo/zpan.git synced 2026-08-28 15:51:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(oauth): synchronize Realmroot client scopes

Browse Source
This commit is contained in:
saltbo
2026-08-02 17:15:17 -04:00
parent b818facdab
commit 461becc3d3
2 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/backfill-oauth-scopes.ts
+7 -1
View File
@@ -22,6 +22,7 @@ interface OAuthResourceRow {
interface OAuthClientRow {
id: string
name?: string | null
scopes: string | null
}
@@ -43,6 +44,11 @@ export function buildOAuthScopeBackfill(
),
clients: clients.flatMap((client) => {
const scopes = parseScopes(client.scopes)
if (client.name === 'Realmroot ZPan') {
return scopes.length === OAUTH_SCOPES.length && OAUTH_SCOPES.every((scope) => scopes.includes(scope))
? []
: [{ id: client.id, scopes: JSON.stringify(OAUTH_SCOPES) }]
}
if (!scopes.includes(AuthorizationScope.OBJECTS_CREATE) || scopes.includes(AuthorizationScope.QUOTA_PURCHASE)) {
return []
}
@@ -124,7 +130,7 @@ function readRows(
execute: OAuthScopeD1Executor,
): { resources: OAuthResourceRow[]; clients: OAuthClientRow[] } {
const resourceSql = 'SELECT id, name, allowed_scopes AS allowedScopes FROM oauthResource;'
const clientSql = 'SELECT id, scopes FROM oauthClient;'
const clientSql = 'SELECT id, name, scopes FROM oauthClient;'
if (target.kind === 'd1') {
return {
resources: d1Rows(target, resourceSql, execute),
server/scripts/backfill-oauth-scopes.test.ts
+15 -3
View File
@@ -24,7 +24,7 @@ function createScopeDatabase() {
const db = new Database(path)
db.exec(`
CREATE TABLE oauthResource (id TEXT PRIMARY KEY, name TEXT NOT NULL, allowed_scopes TEXT, updated_at INTEGER);
CREATE TABLE oauthClient (id TEXT PRIMARY KEY, scopes TEXT, updated_at INTEGER);
CREATE TABLE oauthClient (id TEXT PRIMARY KEY, name TEXT, scopes TEXT, updated_at INTEGER);
`)
return { db, path }
}
@@ -45,6 +45,11 @@ describe('buildOAuthScopeBackfill', () => {
},
],
[
{
id: 'realmroot-client',
name: 'Realmroot ZPan',
scopes: JSON.stringify([AuthorizationScope.OBJECTS_CREATE, AuthorizationScope.QUOTA_PURCHASE]),
},
{
id: 'upload-client',
scopes: JSON.stringify([AuthorizationScope.OBJECTS_CREATE]),
@@ -59,6 +64,10 @@ describe('buildOAuthScopeBackfill', () => {
expect(changes).toEqual({
resources: [{ id: 'zpan-resource', scopes: JSON.stringify(OAUTH_SCOPES) }],
clients: [
{
id: 'realmroot-client',
scopes: JSON.stringify(OAUTH_SCOPES),
},
{
id: 'upload-client',
scopes: JSON.stringify([AuthorizationScope.OBJECTS_CREATE, AuthorizationScope.QUOTA_PURCHASE]),
@@ -141,7 +150,9 @@ describe('buildOAuthScopeBackfill', () => {
.mockReturnValueOnce(JSON.stringify([{ results: [{ id: "resource'1", name: 'ZPan API', allowedScopes: '[]' }] }]))
.mockReturnValueOnce(
JSON.stringify([
{ results: [{ id: 'client-1', scopes: JSON.stringify([AuthorizationScope.OBJECTS_CREATE]) }] },
{
results: [{ id: 'client-1', name: null, scopes: JSON.stringify([AuthorizationScope.OBJECTS_CREATE]) }],
},
]),
)
.mockReturnValueOnce('')
@@ -149,7 +160,7 @@ describe('buildOAuthScopeBackfill', () => {
.mockReturnValueOnce(
JSON.stringify([{ results: [{ id: "resource'1", name: 'ZPan API', allowedScopes: resourceScopes }] }]),
)
.mockReturnValueOnce(JSON.stringify([{ results: [{ id: 'client-1', scopes: clientScopes }] }]))
.mockReturnValueOnce(JSON.stringify([{ results: [{ id: 'client-1', name: null, scopes: clientScopes }] }]))
runOAuthScopeBackfill(['--d1', 'zpan-db', '--remote', '--env', 'production', '--apply'], () => {}, execute)
@@ -161,6 +172,7 @@ describe('buildOAuthScopeBackfill', () => {
env: 'production',
})
expect(execute.mock.calls[0]?.[2]).toBe(true)
expect(execute.mock.calls[1]?.[1]).toBe('SELECT id, name, scopes FROM oauthClient;')
expect(execute.mock.calls[2]?.[1]).toContain("resource''1")
})
})