|
1 | | -import { DisclosureFrame, JWTHeaderParameters, SDJWTPayload, SaltGenerator, issueSDJWT } from '@meeco/sd-jwt'; |
| 1 | +import { DisclosureFrame, JWTHeaderParameters, SDJWTPayload, base64encode, issueSDJWT } from '@meeco/sd-jwt'; |
2 | 2 | import { SDJWTVCError } from './errors.js'; |
3 | | -import { |
4 | | - CreateSDJWTPayload, |
5 | | - CreateSignedJWTOpts, |
6 | | - HasherConfig, |
7 | | - JWT, |
8 | | - ReservedJWTClaimKeys, |
9 | | - SignerConfig, |
10 | | - VCClaims, |
11 | | -} from './types.js'; |
| 3 | +import { CreateSignedJWTOpts, HasherConfig, JWT, ReservedJWTClaimKeys, SignerConfig, VCClaims } from './types.js'; |
12 | 4 | import { ValidTypValues, isValidUrl } from './util.js'; |
13 | 5 |
|
14 | 6 | export class Issuer { |
@@ -42,58 +34,48 @@ export class Issuer { |
42 | 34 | return this.hasher; |
43 | 35 | } |
44 | 36 |
|
45 | | - /** |
46 | | - * Creates a VC SD-JWT. |
47 | | - * @deprecated This method will be removed in the next version. Use `createSignedVCSDJWT` instead. |
48 | | - * @param claims The VC claims. |
49 | | - * @param sdJWTPayload The SD-JWT payload. |
50 | | - * @param sdVCClaimsDisclosureFrame The SD-VC claims disclosure frame. |
51 | | - * @param saltGenerator The salt generator. |
52 | | - * @param sdJWTHeader additional header parameters |
53 | | - * @throws An error if the VC SD-JWT cannot be created. |
54 | | - * @returns The VC SD-JWT. |
55 | | - */ |
56 | | - async createVCSDJWT( |
57 | | - vcClaims: VCClaims, |
58 | | - sdJWTPayload: CreateSDJWTPayload, |
59 | | - sdVCClaimsDisclosureFrame: DisclosureFrame = {}, |
60 | | - saltGenerator?: SaltGenerator, |
61 | | - sdJWTHeader?: Omit<JWTHeaderParameters, 'typ' | 'alg'>, |
62 | | - ): Promise<JWT> { |
63 | | - return this.createSignedVCSDJWT({ vcClaims, sdJWTPayload, sdVCClaimsDisclosureFrame, saltGenerator, sdJWTHeader }); |
64 | | - } |
65 | | - |
66 | 37 | /** |
67 | 38 | * Creates a signed SD-JWT VC. |
68 | 39 | */ |
69 | 40 | async createSignedVCSDJWT(opts: CreateSignedJWTOpts): Promise<JWT> { |
70 | | - const { vcClaims, sdJWTPayload, sdVCClaimsDisclosureFrame = {}, saltGenerator, sdJWTHeader } = opts; |
| 41 | + const { |
| 42 | + vcClaims, |
| 43 | + sdJWTPayload, |
| 44 | + sdVCClaimsDisclosureFrame = {}, |
| 45 | + saltGenerator, |
| 46 | + sdJWTHeader, |
| 47 | + typeMetadataGlueDocuments, |
| 48 | + } = opts; |
71 | 49 | if (!vcClaims) throw new SDJWTVCError('vcClaims is required'); |
72 | 50 | if (!sdJWTPayload) throw new SDJWTVCError('sdJWTPayload is required'); |
73 | 51 |
|
74 | 52 | this.validateVCClaims(vcClaims as VCClaims); |
75 | 53 | this.validateSDJWTPayload(sdJWTPayload); |
76 | 54 | this.validateSDVCClaimsDisclosureFrame(sdVCClaimsDisclosureFrame); |
77 | 55 |
|
| 56 | + const header: JWTHeaderParameters & { vctm?: string[] } = { |
| 57 | + ...sdJWTHeader, |
| 58 | + typ: Issuer.SD_JWT_TYP, |
| 59 | + alg: this.signer.alg, |
| 60 | + }; |
| 61 | + |
| 62 | + if (typeMetadataGlueDocuments && typeMetadataGlueDocuments.length > 0) { |
| 63 | + header.vctm = typeMetadataGlueDocuments.map((doc) => { |
| 64 | + const docString = typeof doc === 'string' ? doc : JSON.stringify(doc); |
| 65 | + return base64encode(docString); |
| 66 | + }); |
| 67 | + } |
| 68 | + |
78 | 69 | try { |
79 | | - const jwt = await issueSDJWT( |
80 | | - { |
81 | | - ...sdJWTHeader, |
82 | | - typ: Issuer.SD_JWT_TYP, |
83 | | - alg: this.signer.alg, |
84 | | - }, |
85 | | - { ...sdJWTPayload, ...vcClaims }, |
86 | | - sdVCClaimsDisclosureFrame, |
87 | | - { |
88 | | - signer: this.signer.callback, |
89 | | - hash: { |
90 | | - alg: this.hasher.alg, |
91 | | - callback: this.hasher.callback, |
92 | | - }, |
93 | | - cnf: sdJWTPayload?.cnf, |
94 | | - generateSalt: saltGenerator, |
| 70 | + const jwt = await issueSDJWT(header, { ...sdJWTPayload, ...vcClaims }, sdVCClaimsDisclosureFrame, { |
| 71 | + signer: this.signer.callback, |
| 72 | + hash: { |
| 73 | + alg: this.hasher.alg, |
| 74 | + callback: this.hasher.callback, |
95 | 75 | }, |
96 | | - ); |
| 76 | + cnf: sdJWTPayload?.cnf, |
| 77 | + generateSalt: saltGenerator, |
| 78 | + }); |
97 | 79 |
|
98 | 80 | return jwt; |
99 | 81 | } catch (error: any) { |
|
0 commit comments