Conflict resolution

2025-12-21 02:33:46 +00:00 · 2024-04-02 17:18:45 +01:00
parent 8a1df6671a
commit 0c0c2039ed
699 changed files with 17230 additions and 8095 deletions
--- a/libs/importer/spec/test-data/bitwarden-json/cipher-with-collections.json.ts
+++ b/libs/importer/spec/test-data/bitwarden-json/cipher-with-collections.json.ts
@@ -0,0 +1,37 @@
+export const cipherWithCollections = `{
+    "encrypted": false,
+    "collections": [
+      {
+        "id": "8e3f5ba1-3e87-4ee8-8da9-b1180099ff9f",
+        "organizationId": "c6181652-66eb-4cd9-a7f2-b02a00e12352",
+        "name": "asdf",
+        "externalId": null
+      }
+    ],
+    "items": [
+      {
+        "passwordHistory": null,
+        "revisionDate": "2024-02-16T09:20:48.383Z",
+        "creationDate": "2024-02-16T09:20:48.383Z",
+        "deletedDate": null,
+        "id": "f761a968-4b0f-4090-a568-b118009a07b5",
+        "organizationId": "c6181652-66eb-4cd9-a7f2-b02a00e12352",
+        "folderId": null,
+        "type": 1,
+        "reprompt": 0,
+        "name": "asdf123",
+        "notes": null,
+        "favorite": false,
+        "login": {
+          "fido2Credentials": [],
+          "uris": [],
+          "username": null,
+          "password": null,
+          "totp": null
+        },
+        "collectionIds": [
+          "8e3f5ba1-3e87-4ee8-8da9-b1180099ff9f"
+        ]
+      }
+    ]
+  }`;