Skip to content

Commit 4b6f2b4

Browse files
committed
refactor: Integrate UCP package into UMA package
1 parent 3fc83f4 commit 4b6f2b4

35 files changed

+68
-197
lines changed

packages/css/src/util/fetch/SignedFetcher.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
import { InternalServerError, type JwkGenerator } from '@solid/community-server';
2-
import { RequestInfo } from '@solidlab/ucp';
32
import { getLoggerFor } from 'global-logger-factory';
43
import { httpbis, type SigningKey } from 'http-message-signatures';
54
import { BufferSource } from 'node:stream/web';
6-
import type { Fetcher } from './Fetcher';
5+
import type { Fetcher, FetchParams } from './Fetcher';
76

87
const algMap = {
98
'Ed25519': { name: 'Ed25519' },
@@ -33,7 +32,7 @@ export class SignedFetcher implements Fetcher {
3332
protected keyGen: JwkGenerator,
3433
) {}
3534

36-
public async fetch(input: RequestInfo, init?: RequestInit): Promise<Response> {
35+
public async fetch(...[ input, init ]: FetchParams): Promise<Response> {
3736
const jwk = await this.keyGen.getPrivateKey();
3837

3938
const { alg, kid } = jwk;

packages/ucp/.componentsignore

Lines changed: 0 additions & 2 deletions
This file was deleted.

packages/ucp/.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

packages/ucp/config/default.json

Lines changed: 0 additions & 5 deletions
This file was deleted.

packages/ucp/package.json

Lines changed: 0 additions & 70 deletions
This file was deleted.

packages/ucp/src/index.ts

Lines changed: 0 additions & 13 deletions
This file was deleted.

packages/ucp/test/tsconfig.json

Lines changed: 0 additions & 6 deletions
This file was deleted.

packages/ucp/tsconfig.json

Lines changed: 0 additions & 24 deletions
This file was deleted.

packages/uma/config/demo.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"@context": [
3-
"https://linkedsoftwaredependencies.org/bundles/npm/@solidlab/uma/^0.0.0/components/context.jsonld",
4-
"https://linkedsoftwaredependencies.org/bundles/npm/@solidlab/ucp/^0.0.0/components/context.jsonld"
3+
"https://linkedsoftwaredependencies.org/bundles/npm/@solidlab/uma/^0.0.0/components/context.jsonld"
54
],
65
"import": [
76
"sai-uma:config/default.json"

packages/uma/config/policies/authorizers/default.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"@context": [
3-
"https://linkedsoftwaredependencies.org/bundles/npm/@solidlab/uma/^0.0.0/components/context.jsonld",
4-
"https://linkedsoftwaredependencies.org/bundles/npm/@solidlab/ucp/^0.0.0/components/context.jsonld"
3+
"https://linkedsoftwaredependencies.org/bundles/npm/@solidlab/uma/^0.0.0/components/context.jsonld"
54
],
65
"@graph": [
76
{

0 commit comments

Comments
 (0)