chore: Fixed broken dependencies

Sphereon-Opensource · Dec 9, 2024 · 10fd2b1 · 10fd2b1
1 parent 33e0be7
commit 10fd2b1
Show file tree

Hide file tree

Showing 13 changed files with 52 additions and 385 deletions.
diff --git a/package.json b/package.json
@@ -23,7 +23,7 @@
     "node": ">=18"
   },
   "resolutions": {
-    "@sphereon/ssi-types": "0.30.2-feature.mdoc.funke2.367",
+    "@sphereon/ssi-types": "link:../SSI-SDK/packages/ssi-types",
     "dcql": "0.2.11",
     "node-fetch": "2.6.12"
   },

diff --git a/packages/callback-example/package.json b/packages/callback-example/package.json
@@ -19,7 +19,7 @@
     "@sphereon/oid4vci-client": "workspace:*",
     "@sphereon/oid4vci-common": "workspace:*",
     "@sphereon/oid4vci-issuer": "workspace:*",
-    "@sphereon/ssi-types": "0.30.2-feature.mdoc.funke2.367",
+    "@sphereon/ssi-types": "link:../../SSI-SDK/packages/ssi-types",
     "jose": "^4.10.0"
   },
   "devDependencies": {

diff --git a/packages/client/package.json b/packages/client/package.json
@@ -17,7 +17,7 @@
   "dependencies": {
     "@sphereon/oid4vc-common": "workspace:*",
     "@sphereon/oid4vci-common": "workspace:*",
-    "@sphereon/ssi-types": "0.30.2-feature.mdoc.funke2.367",
+    "@sphereon/ssi-types": "link:../../SSI-SDK/packages/ssi-types",
     "cross-fetch": "^3.1.8",
     "debug": "^4.3.5"
   },

diff --git a/packages/common/package.json b/packages/common/package.json
@@ -10,7 +10,7 @@
     "build:clean": "tsc --build --clean && tsc --build"
   },
   "dependencies": {
-    "@sphereon/ssi-types": "0.30.2-feature.mdoc.funke2.367",
+    "@sphereon/ssi-types": "link:../../SSI-SDK/packages/ssi-types",
     "jwt-decode": "^4.0.0",
     "sha.js": "^2.4.11",
     "uint8arrays": "3.1.1",

diff --git a/packages/issuer-rest/package.json b/packages/issuer-rest/package.json
@@ -15,7 +15,7 @@
     "@sphereon/oid4vci-common": "workspace:*",
     "@sphereon/oid4vci-issuer": "workspace:*",
     "@sphereon/ssi-express-support": "0.30.2-feature.mdoc.funke2.367",
-    "@sphereon/ssi-types": "0.30.2-feature.mdoc.funke2.367",
+    "@sphereon/ssi-types": "link:../../SSI-SDK/packages/ssi-types",
     "body-parser": "^1.20.2",
     "cookie-parser": "^1.4.6",
     "cors": "^2.8.5",

diff --git a/packages/issuer/package.json b/packages/issuer/package.json
@@ -12,7 +12,7 @@
   "dependencies": {
     "@sphereon/oid4vc-common": "workspace:*",
     "@sphereon/oid4vci-common": "workspace:*",
-    "@sphereon/ssi-types": "0.30.2-feature.mdoc.funke2.367",
+    "@sphereon/ssi-types": "link:../../SSI-SDK/packages/ssi-types",
     "uuid": "^9.0.0"
   },
   "peerDependencies": {

diff --git a/packages/oid4vci-common/package.json b/packages/oid4vci-common/package.json
@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "@sphereon/oid4vc-common": "workspace:*",
-    "@sphereon/ssi-types": "0.30.2-feature.mdoc.funke2.367",
+    "@sphereon/ssi-types": "link:../../SSI-SDK/packages/ssi-types",
     "cross-fetch": "^3.1.8",
     "debug": "^4.3.5",
     "jwt-decode": "^4.0.0",

diff --git a/packages/siop-oid4vp/lib/schemas/AuthorizationRequestPayloadVD11.schema.ts b/packages/siop-oid4vp/lib/schemas/AuthorizationRequestPayloadVD11.schema.ts
@@ -699,9 +699,6 @@ export const AuthorizationRequestPayloadVD11SchemaObj = {
           "type": "string"
         }
       },
-      "required": [
-        "type"
-      ],
       "additionalProperties": false
     },
     "OneOfNumberStringBoolean": {
@@ -934,81 +931,15 @@ export const AuthorizationRequestPayloadVD11SchemaObj = {
           "type": "string"
         },
         "contains": {
-          "$ref": "#/definitions/FilterV2Base"
-        },
-        "items": {
-          "$ref": "#/definitions/FilterV2BaseItems"
-        }
-      },
-      "required": [
-        "type"
-      ],
-      "additionalProperties": false
-    },
-    "FilterV2Base": {
-      "type": "object",
-      "properties": {
-        "const": {
-          "$ref": "#/definitions/OneOfNumberStringBoolean"
-        },
-        "enum": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/OneOfNumberStringBoolean"
-          }
-        },
-        "exclusiveMinimum": {
-          "$ref": "#/definitions/OneOfNumberString"
-        },
-        "exclusiveMaximum": {
-          "$ref": "#/definitions/OneOfNumberString"
-        },
-        "format": {
-          "type": "string"
-        },
-        "formatMaximum": {
-          "type": "string"
-        },
-        "formatMinimum": {
-          "type": "string"
-        },
-        "formatExclusiveMaximum": {
-          "type": "string"
-        },
-        "formatExclusiveMinimum": {
-          "type": "string"
-        },
-        "minLength": {
-          "type": "number"
-        },
-        "maxLength": {
-          "type": "number"
-        },
-        "minimum": {
-          "$ref": "#/definitions/OneOfNumberString"
-        },
-        "maximum": {
-          "$ref": "#/definitions/OneOfNumberString"
-        },
-        "not": {
-          "type": "object"
-        },
-        "pattern": {
-          "type": "string"
-        },
-        "type": {
-          "type": "string"
-        },
-        "contains": {
-          "$ref": "#/definitions/FilterV2Base"
+          "$ref": "#/definitions/FilterV2"
         },
         "items": {
-          "$ref": "#/definitions/FilterV2BaseItems"
+          "$ref": "#/definitions/FilterV2Items"
         }
       },
       "additionalProperties": false
     },
-    "FilterV2BaseItems": {
+    "FilterV2Items": {
       "type": "object",
       "properties": {
         "const": {
@@ -1063,15 +994,12 @@ export const AuthorizationRequestPayloadVD11SchemaObj = {
           "type": "string"
         },
         "contains": {
-          "$ref": "#/definitions/FilterV2Base"
+          "$ref": "#/definitions/FilterV2"
         },
         "items": {
-          "$ref": "#/definitions/FilterV2BaseItems"
+          "$ref": "#/definitions/FilterV2Items"
         }
       },
-      "required": [
-        "type"
-      ],
       "additionalProperties": false
     }
   }

diff --git a/packages/siop-oid4vp/lib/schemas/AuthorizationRequestPayloadVD12OID4VPD18.schema.ts b/packages/siop-oid4vp/lib/schemas/AuthorizationRequestPayloadVD12OID4VPD18.schema.ts
@@ -705,9 +705,6 @@ export const AuthorizationRequestPayloadVD12OID4VPD18SchemaObj = {
           "type": "string"
         }
       },
-      "required": [
-        "type"
-      ],
       "additionalProperties": false
     },
     "OneOfNumberStringBoolean": {
@@ -940,81 +937,15 @@ export const AuthorizationRequestPayloadVD12OID4VPD18SchemaObj = {
           "type": "string"
         },
         "contains": {
-          "$ref": "#/definitions/FilterV2Base"
-        },
-        "items": {
-          "$ref": "#/definitions/FilterV2BaseItems"
-        }
-      },
-      "required": [
-        "type"
-      ],
-      "additionalProperties": false
-    },
-    "FilterV2Base": {
-      "type": "object",
-      "properties": {
-        "const": {
-          "$ref": "#/definitions/OneOfNumberStringBoolean"
-        },
-        "enum": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/OneOfNumberStringBoolean"
-          }
-        },
-        "exclusiveMinimum": {
-          "$ref": "#/definitions/OneOfNumberString"
-        },
-        "exclusiveMaximum": {
-          "$ref": "#/definitions/OneOfNumberString"
-        },
-        "format": {
-          "type": "string"
-        },
-        "formatMaximum": {
-          "type": "string"
-        },
-        "formatMinimum": {
-          "type": "string"
-        },
-        "formatExclusiveMaximum": {
-          "type": "string"
-        },
-        "formatExclusiveMinimum": {
-          "type": "string"
-        },
-        "minLength": {
-          "type": "number"
-        },
-        "maxLength": {
-          "type": "number"
-        },
-        "minimum": {
-          "$ref": "#/definitions/OneOfNumberString"
-        },
-        "maximum": {
-          "$ref": "#/definitions/OneOfNumberString"
-        },
-        "not": {
-          "type": "object"
-        },
-        "pattern": {
-          "type": "string"
-        },
-        "type": {
-          "type": "string"
-        },
-        "contains": {
-          "$ref": "#/definitions/FilterV2Base"
+          "$ref": "#/definitions/FilterV2"
         },
         "items": {
-          "$ref": "#/definitions/FilterV2BaseItems"
+          "$ref": "#/definitions/FilterV2Items"
         }
       },
       "additionalProperties": false
     },
-    "FilterV2BaseItems": {
+    "FilterV2Items": {
       "type": "object",
       "properties": {
         "const": {
@@ -1069,15 +1000,12 @@ export const AuthorizationRequestPayloadVD12OID4VPD18SchemaObj = {
           "type": "string"
         },
         "contains": {
-          "$ref": "#/definitions/FilterV2Base"
+          "$ref": "#/definitions/FilterV2"
         },
         "items": {
-          "$ref": "#/definitions/FilterV2BaseItems"
+          "$ref": "#/definitions/FilterV2Items"
         }
       },
-      "required": [
-        "type"
-      ],
       "additionalProperties": false
     },
     "ClientIdSchemeOID4VPD18": {