From 4e7f1021d924dbe3c26e2c3a218f8a394a2f4a6c Mon Sep 17 00:00:00 2001
From: Albert Solana <iamtxena@gmail.com>
Date: Fri, 6 Nov 2020 17:29:27 +0100
Subject: [PATCH] refactor: using types directly from vid-did-resolver library

---
 package-lock.json                      | 14 +++++++-------
 package.json                           | 15 +++++++++++----
 src/@types/vid-did-resolver/index.d.ts | 13 -------------
 src/VidDIDAuth.ts                      |  2 +-
 4 files changed, 19 insertions(+), 25 deletions(-)
 delete mode 100644 src/@types/vid-did-resolver/index.d.ts

diff --git a/package-lock.json b/package-lock.json
index 7a5fe2a..770bb23 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1804,10 +1804,10 @@
         "eslint-visitor-keys": "^2.0.0"
       }
     },
-    "@validated-id/vid-did-resolver": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/@validated-id/vid-did-resolver/-/vid-did-resolver-0.0.7.tgz",
-      "integrity": "sha512-kioPxyE4f2amD5VDRWMaPRDbxXQa/Xghw+2PUed+M+N1M1+jgQdT7VWRaXD8ZAMvAc2K6MJPpfCeQYLdlv12qw==",
+    "@validatedid/vid-did-resolver": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/@validatedid/vid-did-resolver/-/vid-did-resolver-0.0.1.tgz",
+      "integrity": "sha512-QRSEdStFR0pmD3y5VDO8XMG4LF9P/p2yorbc+ybOlQJiVHSBe2YAW+O5bq7Px8OsKNa4IwOeMhNzKFUX0AuNVQ==",
       "requires": {
         "@babel/polyfill": "^7.10.1",
         "@babel/runtime": "^7.10.1",
@@ -3303,9 +3303,9 @@
       "integrity": "sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA=="
     },
     "core-js-pure": {
-      "version": "3.6.5",
-      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.6.5.tgz",
-      "integrity": "sha512-lacdXOimsiD0QyNf9BC/mxivNJ/ybBGJXQFKzRekp1WTHoVUWsUHEn+2T8GJAzzIhyOuXA+gOxCVN3l+5PLPUA=="
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.7.0.tgz",
+      "integrity": "sha512-EZD2ckZysv8MMt4J6HSvS9K2GdtlZtdBncKAmF9lr2n0c9dJUaUN88PSTjvgwCgQPWKTkERXITgS6JJRAnljtg=="
     },
     "core-util-is": {
       "version": "1.0.2",
diff --git a/package.json b/package.json
index 54ba863..878dc11 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@validatedid/did-auth",
-  "version": "0.0.1",
+  "version": "0.0.5",
   "description": "Validated ID Authentication library that implements an OIDC-SIOP with DIDs",
   "author": "Validated ID",
   "license": "Apache-2.0",
@@ -8,8 +8,15 @@
     "type": "github",
     "url": "https://github.com/validatedid/did-auth-oidc-siop.git"
   },
+  "keywords": [
+    "Authentication",
+    "DID-Auth",
+    "SIOP",
+    "OIDC",
+    "DID-SIOP"
+  ],
   "main": "dist/index.js",
-  "types": "dist/index.d.js",
+  "types": "dist/index.d.ts",
   "files": [
     "dist"
   ],
@@ -17,7 +24,7 @@
     "audit": "audit-ci --moderate",
     "prepare": "npm run build",
     "build": "npm run clean && tsc -p tsconfig.build.json",
-    "clean": "rm -rf ./dist ./coverage ./build",
+    "clean": "rm -rf ./dist ./coverage",
     "compile": "tsc",
     "compile:dev": "tsc -w",
     "coverage": "jest --coverage",
@@ -64,7 +71,7 @@
     "typescript": "^4.0.5"
   },
   "dependencies": {
-    "@validated-id/vid-did-resolver": "0.0.7",
+    "@validatedid/vid-did-resolver": "0.0.1",
     "axios": "^0.21.0",
     "did-jwt": "^4.6.2",
     "did-resolver": "^2.1.1",
diff --git a/src/@types/vid-did-resolver/index.d.ts b/src/@types/vid-did-resolver/index.d.ts
deleted file mode 100644
index 760b8fd..0000000
--- a/src/@types/vid-did-resolver/index.d.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/* eslint-disable import/prefer-default-export */
-declare module "@validated-id/vid-did-resolver" {
-  import { DIDResolver } from "did-resolver";
-
-  interface ResolverRegistry {
-    [index: string]: DIDResolver;
-  }
-
-  export function getResolver(options: {
-    rpcUrl: string;
-    registry: string;
-  }): ResolverRegistry;
-}
diff --git a/src/VidDIDAuth.ts b/src/VidDIDAuth.ts
index 928f5b8..f50d40f 100644
--- a/src/VidDIDAuth.ts
+++ b/src/VidDIDAuth.ts
@@ -6,7 +6,7 @@ import {
   JWTVerified,
 } from "did-jwt";
 import { Resolver } from "did-resolver";
-import VidDidResolver from "@validated-id/vid-did-resolver";
+import VidDidResolver from "@validatedid/vid-did-resolver";
 import { AxiosResponse } from "axios";
 import SHA from "sha.js";
 import {