feat: refactor api's for connection verification and issuance module

Signed-off-by: bhavanakarwade <[email protected]>
credebl · Sep 18, 2023 · 5c8163c · 5c8163c
1 parent d2d8b3a
commit 5c8163c
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 30 deletions.
diff --git a/src/api/connection.ts b/src/api/connection.ts
@@ -6,7 +6,7 @@ import { getFromLocalStorage } from './Auth';
 
 export const getConnectionsByOrg = async () => {
 	const orgId = await getFromLocalStorage(storageKeys.ORG_ID);
-	const url = `${apiRoutes.Issuance.getAllConnections}?orgId=${orgId}`;
+	const url = `${apiRoutes.organizations.root}/${orgId}${apiRoutes.Issuance.getAllConnections}`;	
 	const axiosPayload = {
 		url,
 		config: await getHeaderConfigs(),

diff --git a/src/api/issuance.ts b/src/api/issuance.ts
@@ -7,8 +7,7 @@ import { getFromLocalStorage } from './Auth';
 
 export const getIssuedCredentials = async (state: IssueCredential) => {
 	const orgId = await getFromLocalStorage(storageKeys.ORG_ID);
-	const url = `${apiRoutes.Issuance.getIssuedCredentials}?orgId=${orgId}`;
-
+	const url = `${apiRoutes.organizations.root}/${orgId}${apiRoutes.Issuance.getIssuedCredentials}`;
 	const axiosPayload = {
 		url,
 		config: await getHeaderConfigs(),
@@ -40,8 +39,8 @@ export const getCredentialDefinitions = async (schemaId: string) => {
 
 
 export const issueCredential = async (data: object) => {
-	const url = apiRoutes.Issuance.issueCredential;
-	const payload = data;
+	const orgId = await getFromLocalStorage(storageKeys.ORG_ID);
+	const url = `${apiRoutes.organizations.root}/${orgId}${apiRoutes.Issuance.issueCredential}`;	const payload = data;
 	const axiosPayload = {
 		url,
 		payload,

diff --git a/src/api/organization.ts b/src/api/organization.ts
@@ -274,10 +274,8 @@ export const editOrganizationUserRole = async (userId: number, roles: number[])
 
 
 export const createConnection = async (orgName: string) => {
-
-    const url = apiRoutes.connection.create
-
     const orgId = await getFromLocalStorage(storageKeys.ORG_ID)
+    const url = `${apiRoutes.organizations.root}/${orgId}${apiRoutes.connection.create}`
 
     const data = {
         label: orgName,

diff --git a/src/api/verification.ts b/src/api/verification.ts
@@ -6,8 +6,8 @@ import { axiosGet, axiosPost } from '../services/apiRequests';
 import { getFromLocalStorage } from './Auth';
 
 export const verifyCredential = async (payload: any) => {
-	const url = apiRoutes.Verification.verifyCredential;
-	const axiosPayload = {
+	const orgId = await getFromLocalStorage(storageKeys.ORG_ID);
+	const url = `${apiRoutes.organizations.root}/${orgId}${apiRoutes.Verification.verifyCredential}`;	const axiosPayload = {
 		url,
 		payload,
 		config: await getHeaderConfigs(),
@@ -40,8 +40,7 @@ export const getVerificationCredential = async (state: IssueCredential) => {
 
 export const getVerificationList = async () => {
 	const orgId = await getFromLocalStorage(storageKeys.ORG_ID);
-	const url = `${apiRoutes.Verification.getAllRequestList}?orgId=${orgId}`;
-
+	const url = `${apiRoutes.organizations.root}/${orgId}${apiRoutes.Verification.getAllRequestList}`
 	const axiosPayload = {
 		url,
 		config: await getHeaderConfigs(),
@@ -55,10 +54,9 @@ export const getVerificationList = async () => {
 	}
 };
 
-export const verifyPresentation = async (id:string) => {
+export const verifyPresentation = async (proofId:string) => {
 	const orgId = await getFromLocalStorage(storageKeys.ORG_ID);
-	const url = `${apiRoutes.Verification.presentationVerification}?orgId=${orgId}&id=${id}`;
-
+	const url = `${apiRoutes.organizations.root}/${orgId}${apiRoutes.Verification.presentationVerification}/${proofId}/verify`;
 	const axiosPayload = {
 		url,
 		config: await getHeaderConfigs(),
@@ -73,10 +71,9 @@ export const verifyPresentation = async (id:string) => {
 };
 
 
-export const getProofAttributes=async (id:string)=>{
+export const getProofAttributes=async (proofId:string)=>{
 	const orgId = await getFromLocalStorage(storageKeys.ORG_ID);
-	const url = `${apiRoutes.Verification.proofRequestAttributesVerification}?id=${id}&orgId=${orgId}`;
-
+	const url = `${apiRoutes.organizations.root}/${orgId}${apiRoutes.Verification.proofRequestAttributesVerification}/${proofId}/form`;
 	const axiosPayload = {
 		url,
 		config: await getHeaderConfigs(),

diff --git a/src/config/apiRoutes.ts b/src/config/apiRoutes.ts
@@ -18,6 +18,7 @@ export const apiRoutes = {
         recentActivity: '/users/activity',
     },
     organizations: {
+        root: '/orgs',
         create: '/organization',
         update: '/organization',
         getAll: '/organization',
@@ -51,18 +52,17 @@ export const apiRoutes = {
         fidoVerifyAuthentication: 'Fido/verify-authentication/'
 
     },
-		Issuance:{
-			getIssuedCredentials:'/issue-credentials',
-			getCredDefBySchemaId :'/schemas/credential-definitions',
-			getAllConnections:'/connections',
-			issueCredential:'/issue-credentials/create-offer'
-		},
-        Verification:{
-			getAllRequestList: '/proofs',
-			verifyCredential:'/proofs/request-proof',
-            presentationVerification:'/proofs/verify-presentation',
-		    proofRequestAttributesVerification:'/proofs/form-data'
-		},
+    Issuance: {
+        getIssuedCredentials: '/credentials',
+        getAllConnections: '/connections',
+        issueCredential: '/credentials/offer',
+    },
+    Verification: {
+        getAllRequestList: '/credentials/proofs',
+        verifyCredential: '/proofs',
+        presentationVerification: '/proofs',
+        proofRequestAttributesVerification: '/proofs'
+    },
         Agent:{
 			checkAgentHealth: '/agent-service/health',
 		},