@microsoft/ccf-app 6.0.0-dev1 → 6.0.0-dev10

package/endpoints.d.ts

@@ -101,7 +101,16 @@ export interface AuthnIdentityCommon {
 export interface EmptyAuthnIdentity extends AuthnIdentityCommon {
     policy: "no_auth";
 }
-interface UserMemberAuthnIdentityCommon extends AuthnIdentityCommon {
+interface CertAuthnIdentityCommon extends AuthnIdentityCommon {
+    /**
+     * PEM-encoded certificate.
+     */
+    cert: string;
+}
+export interface AnyCertAuthnIdentity extends CertAuthnIdentityCommon {
+    policy: "any_cert";
+}
+interface UserMemberAuthnIdentityCommon extends CertAuthnIdentityCommon {
     /**
      * User/member ID.
      */
@@ -110,10 +119,6 @@ interface UserMemberAuthnIdentityCommon extends AuthnIdentityCommon {
      * User/member data object.
      */
     data: any;
-    /**
-     * PEM-encoded user/member certificate.
-     */
-    cert: string;
 }
 export interface UserCertAuthnIdentity extends UserMemberAuthnIdentityCommon {
     policy: "user_cert";
@@ -160,6 +165,7 @@ export interface AllOfAuthnIdentity extends AuthnIdentityCommon {
     policy: string[];
     user_cert?: UserCertAuthnIdentity;
     member_cert?: MemberCertAuthnIdentity;
+    any_cert?: AnyCertAuthnIdentity;
     user_cose_sign1?: UserCOSESign1AuthnIdentity;
     member_cose_sign1?: MemberCOSESign1AuthnIdentity;
     jwt?: JwtAuthnIdentity;
@@ -169,7 +175,7 @@ export interface AllOfAuthnIdentity extends AuthnIdentityCommon {
  * Each identity corresponds to a matching {@linkcode AuthnIdentityCommon.policy | policy}.
  * Policies have to be declared for each endpoint in ``app.json``.
  */
-export type AuthnIdentity = EmptyAuthnIdentity | UserCertAuthnIdentity | MemberCertAuthnIdentity | JwtAuthnIdentity | MemberCOSESign1AuthnIdentity | UserCOSESign1AuthnIdentity | AllOfAuthnIdentity;
+export type AuthnIdentity = EmptyAuthnIdentity | UserCertAuthnIdentity | MemberCertAuthnIdentity | AnyCertAuthnIdentity | JwtAuthnIdentity | MemberCOSESign1AuthnIdentity | UserCOSESign1AuthnIdentity | AllOfAuthnIdentity;
 /** See {@linkcode Response.body}. */
 export type ResponseBodyType<T> = string | ArrayBuffer | JsonCompatible<T>;
 /**

package/global.d.ts

@@ -312,7 +312,7 @@ export interface CCFCrypto {
     /**
      * Generate an ECDSA key pair.
      *
-     * @param curve The name of the curve, one of "secp256r1", "secp256k1", "secp384r1".
+     * @param curve The name of the curve, one of "secp256r1", "secp384r1".
      */
     generateEcdsaKeyPair(curve: string): CryptoKeyPair;
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/ccf-app",
-  "version": "6.0.0-dev1",
+  "version": "6.0.0-dev10",
   "description": "CCF app support package",
   "main": "index.js",
   "files": [
@@ -26,10 +26,13 @@
     "colors": "1.4.0",
     "cross-env": "^7.0.3",
     "get-func-name": "3.0.0",
-    "mocha": "^10.0.0",
+    "mocha": "^11.0.1",
     "node-forge": "^1.2.0",
     "ts-node": "^10.4.0",
-    "typedoc": "^0.26.2",
-    "typescript": "^5.0.2"
+    "typedoc": "^0.27.0",
+    "typescript": "^5.7.2"
+  },
+  "bin": {
+    "ccf-build-bundle": "scripts/build_bundle.js"
   }
 }

package/scripts/build_bundle.d.ts

@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+export {};

package/scripts/build_bundle.js

@@ -0,0 +1,61 @@
+#!/usr/bin/env node
+import { readdirSync, statSync, readFileSync, writeFileSync, existsSync, } from "fs";
+import { join, resolve, sep } from "path";
+function getAllFiles(dirPath) {
+    const toSearch = [dirPath];
+    const agg = [];
+    for (const filePath of toSearch) {
+        if (statSync(filePath).isDirectory()) {
+            for (const subfile of readdirSync(filePath)) {
+                toSearch.push(join(filePath, subfile));
+            }
+        }
+        else {
+            agg.push(filePath);
+        }
+    }
+    return agg;
+}
+function removePrefix(s, prefix) {
+    if (s.startsWith(prefix)) {
+        return s.slice(prefix.length).split(sep).join(sep);
+    }
+    console.log("Warn: tried to remove invalid prefix", s, prefix);
+    return s;
+}
+const args = process.argv.slice(2);
+if (args.length < 1) {
+    console.log("Usage: build_bundle <root_directory>");
+    process.exit(1);
+}
+function assertFileExists(path) {
+    if (!existsSync(path)) {
+        console.log("File not found: %s", path);
+        process.exit(1);
+    }
+}
+const argRootDirPath = args[0];
+assertFileExists(argRootDirPath);
+const rootDirPath = resolve(argRootDirPath);
+const metadataPath = join(rootDirPath, "app.json");
+assertFileExists(metadataPath);
+const srcDirPath = join(rootDirPath, "src");
+assertFileExists(srcDirPath);
+const metadata = JSON.parse(readFileSync(metadataPath, "utf-8"));
+const allFiles = getAllFiles(srcDirPath);
+// The trailing / is included so that it is trimmed in removePrefix.
+// This produces "foo/bar.js" rather than "/foo/bar.js"
+const toTrim = srcDirPath + "/";
+const modules = allFiles.map(function (filePath) {
+    return {
+        name: removePrefix(filePath, toTrim),
+        module: readFileSync(filePath, "utf-8"),
+    };
+});
+const bundlePath = join(args[0], "bundle.json");
+const bundle = {
+    metadata: metadata,
+    modules: modules,
+};
+console.log(`Writing bundle containing ${modules.length} modules to ${bundlePath}`);
+writeFileSync(bundlePath, JSON.stringify(bundle));