Merge pull request #156 from hypersign-protocol/HSSTUD-256

some changes based on updated hs-ssi-sdk
hypersign-protocol · Aug 7, 2023 · 1623ec0 · 1623ec0
2 parents 26216a8 + 91aaf91
commit 1623ec0
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 236 deletions.
diff --git a/server/package.json b/server/package.json
@@ -32,8 +32,8 @@
     "express": "^4.17.1",
     "express-validator": "^6.14.2",
     "hid-hd-wallet": "git+https://github.com/hypersign-protocol/hid-hd-wallet.git#ssi-integration",
-    "hs-ssi-sdk": "github:hypersign-protocol/hs-ssi-sdk#fix-org-cred",
-    "hypersign-auth-node-sdk": "^6.1.0",
+    "hs-ssi-sdk": "github:hypersign-protocol/hs-ssi-sdk#develop",
+    "hypersign-auth-node-sdk": "git+https://github.com/hypersign-protocol/hypersign-auth-node-sdk.git#registration-on-registry-optional",
     "jsonwebtoken": "^8.5.1",
     "lds-sdk": "^4.0.1",
     "mongoose": "^6.5.2",

diff --git a/server/src/controllers/pController.ts b/server/src/controllers/pController.ts
@@ -9,7 +9,7 @@ import { uuid } from 'uuidv4';
 import ApiResponse from '../response/apiResponse';
 
 import HIDWallet from 'hid-hd-wallet';
-import HypersignSsiSDK from 'hs-ssi-sdk';
+import { HypersignSSISdk } from 'hs-ssi-sdk';
 import { walletOptions, mnemonic } from '../config';
 
 const verifyPresentation = async (vp, challenge, issuerDid, holderDid, domain, holderDidDocSigned) => {
@@ -25,16 +25,16 @@ const verifyPresentation = async (vp, challenge, issuerDid, holderDid, domain, h
   // TODO: This initialization need to be done one time globally
   const hidWalletInstance = new HIDWallet(walletOptions);
   await hidWalletInstance.generateWallet({ mnemonic });
-  const hsSdk = new HypersignSsiSDK(
-    hidWalletInstance.offlineSigner,
-    walletOptions.hidNodeRPCUrl,
-    walletOptions.hidNodeRestUrl,
-    'testnet'
-  );
+  const hsSdk = new HypersignSSISdk({
+    offlineSigner: hidWalletInstance.offlineSigner,
+    nodeRpcEndpoint: walletOptions.hidNodeRPCUrl,
+    nodeRestEndpoint: walletOptions.hidNodeRestUrl,
+    namespace: 'testnet',
+  });
   await hsSdk.init();
   const holderVerificationMethodId = vp.proof.verificationMethod;
   const issuerVerificationMethodId = vp.verifiableCredential[0].proof.verificationMethod;
-  const result = await hsSdk.vp.verifyPresentation({
+  const result = await hsSdk.vp.verify({
     signedPresentation: vp,
     challenge,
     domain,
@@ -107,8 +107,8 @@ export async function verify(req, res, next) {
       holderDidDocSigned
     );
 
-    const { verified } = result;
-    logger.debug(`Result of credential verification ${result.verified}`);
+    const verified = result['verified'];
+    logger.debug(`Result of credential verification ${result['verified']}`);
     if (verified === true) {
       // TODO: 4. send data or create JWT
 
@@ -119,7 +119,7 @@ export async function verify(req, res, next) {
         holderDid: presentationInfo.holder,
         credentialId: presentationInfo.verifiableCredential[0].id,
         credentialDetail: presentationInfo.verifiableCredential[0].credentialSubject,
-        presentation: presentationInfo
+        presentation: presentationInfo,
       });
       const accessToken = JWT.sign({ id: userCredInfo._id }, jwtSecret, { expiresIn: '5m' });
       PresentationRequestSchema.findOneAndUpdate({ challenge: challenge }, { status: 1, accessToken }).exec();
@@ -179,7 +179,7 @@ export async function getChallenge(req, res, next) {
         appName: name,
         challenge,
         reason,
-        domain
+        domain,
       },
     };
 

diff --git a/server/src/controllers/presentationController.ts b/server/src/controllers/presentationController.ts
@@ -2,7 +2,7 @@ import { Request, Response, NextFunction } from 'express';
 import PresentationTemplateSchema, { IPresentationTemplate } from '../models/presentationTemplateSchema';
 
 import HIDWallet from 'hid-hd-wallet';
-import HypersignSsiSDK from 'hs-ssi-sdk';
+import { HypersignSSISdk } from 'hs-ssi-sdk';
 import { walletOptions, mnemonic, logger } from '../config';
 import ApiResponse from '../response/apiResponse';
 
@@ -15,12 +15,12 @@ const verifyPresentation = async (req: Request, res: Response, next: NextFunctio
     hidWalletInstance
       .generateWallet({ mnemonic })
       .then(async () => {
-        hsSdk = new HypersignSsiSDK(
-          hidWalletInstance.offlineSigner,
-          walletOptions.hidNodeRPCUrl,
-          walletOptions.hidNodeRestUrl,
-          'devnet'
-        );
+        hsSdk = new HypersignSSISdk({
+          offlineSigner: hidWalletInstance.offlineSigner,
+          nodeRpcEndpoint: walletOptions.hidNodeRPCUrl,
+          nodeRestEndpoint: walletOptions.hidNodeRestUrl,
+          namespace: 'testnet',
+        });
         return hsSdk.init();
       })
       .then(async () => {

diff --git a/server/src/controllers/presentationRequestController.ts b/server/src/controllers/presentationRequestController.ts
diff --git a/server/src/models/userCredentialInfo.ts b/server/src/models/userCredentialInfo.ts
@@ -10,6 +10,6 @@ export const UserCredential = new Schema({
   holderDid: { type: String, required: true },
   credentialId: { type: String, required: true },
   credentialDetail: { type: Object, required: true },
-  presentation: { type: Object, required: true }
+  presentation: { type: Object, required: true },
 });
 export default mongoose.model<IUserPresentation>('userCredDetail', UserCredential);
diff --git a/server/src/services/db.service.ts b/server/src/services/db.service.ts
@@ -183,7 +183,7 @@ export class DBService {
       logger.debug(`Values = `, values);
       db.all(query, values, (err, rows) => {
         if (err) return reject(err);
-        return resolve(rows);
+        return resolve(rows as object[]);
       });
     });
   }