MOSIP-35690 : API endpoints update as per review. (#767)

Signed-off-by: sudeep <[email protected]>
mosip · Sep 17, 2024 · 52f7087 · 52f7087
1 parent c9a7aea
commit 52f7087
Show file tree

Hide file tree

Showing 16 changed files with 56 additions and 56 deletions.
diff --git a/pmp-reactjs-ui/src/pages/authenticationServices/ApiKeysList.js b/pmp-reactjs-ui/src/pages/authenticationServices/ApiKeysList.js
@@ -31,7 +31,7 @@ function ApiKeysList() {
     const [filter, setFilter] = useState(false);
     const [selectedRecordsPerPage, setSelectedRecordsPerPage] = useState(8);
     const [order, setOrder] = useState("ASC");
-    const [activeSortAsc, setActiveSortAsc] = useState("crDtimes");
+    const [activeSortAsc, setActiveSortAsc] = useState("createdDateTime");
     const [activeSortDesc, setActiveSortDesc] = useState("");
     const [isDescending, setIsDescending] = useState(false);
     const [apiKeysList, setApiKeysList] = useState([]);
@@ -55,12 +55,12 @@ function ApiKeysList() {
         const fetchData = async () => {
             try {
                 setDataLoaded(false);
-                const response = await HttpService.get(getPartnerManagerUrl('/partners/getAllApiKeysForAuthPartners', process.env.NODE_ENV));
+                const response = await HttpService.get(getPartnerManagerUrl('/partners/api-keys-for-auth-partners', process.env.NODE_ENV));
                 if (response) {
                     const responseData = response.data;
                     if (responseData && responseData.response) {
                         const resData = responseData.response;
-                        const sortedData = resData.sort((a, b) => new Date(b.crDtimes) - new Date(a.crDtimes));
+                        const sortedData = resData.sort((a, b) => new Date(b.createdDateTime) - new Date(a.createdDateTime));
                         setApiKeysList(sortedData);
                         setFilteredApiKeysList(sortedData);
                     } else {
@@ -83,7 +83,7 @@ function ApiKeysList() {
         { id: "policyGroupName", headerNameKey: "oidcClientsList.policyGroup" },
         { id: "policyName", headerNameKey: "oidcClientsList.policyName" },
         { id: "apiKeyLabel", headerNameKey: "apiKeysList.apiKeyLabel" },
-        { id: "crDtimes", headerNameKey: "oidcClientsList.createdDate" },
+        { id: "createdDateTime", headerNameKey: "oidcClientsList.createdDate" },
         { id: "status", headerNameKey: "oidcClientsList.status" },
         { id: "action", headerNameKey: 'oidcClientsList.action' }
     ];
@@ -143,12 +143,12 @@ function ApiKeysList() {
     }
 
     const sortAscOrder = (header) => {
-        const isDateCol = (header === "crDtimes") ? true : false;
+        const isDateCol = (header === "createdDateTime") ? true : false;
         toggleSortAscOrder(header, isDateCol, filteredApiKeysList, setFilteredApiKeysList, order, setOrder, isDescending, setIsDescending, activeSortAsc, setActiveSortAsc, activeSortDesc, setActiveSortDesc);
     }
 
     const sortDescOrder = (header) => {
-        const isDateCol = (header === "crDtimes") ? true : false;
+        const isDateCol = (header === "createdDateTime") ? true : false;
         toggleSortDescOrder(header, isDateCol, filteredApiKeysList, setFilteredApiKeysList, order, setOrder, isDescending, setIsDescending, activeSortAsc, setActiveSortAsc, activeSortDesc, setActiveSortDesc);
     }
 
@@ -264,7 +264,7 @@ function ApiKeysList() {
                                                                 <td onClick={() => showViewApiKeyDetails(apiKey)} className="px-2 mx-2">{apiKey.policyGroupName}</td>
                                                                 <td onClick={() => showViewApiKeyDetails(apiKey)} className="px-2 mx-2">{apiKey.policyName}</td>
                                                                 <td onClick={() => showViewApiKeyDetails(apiKey)} className="px-2 mx-2">{apiKey.apiKeyLabel}</td>
-                                                                <td onClick={() => showViewApiKeyDetails(apiKey)} className="px-2 mx-2">{formatDate(apiKey.crDtimes, 'date')}</td>
+                                                                <td onClick={() => showViewApiKeyDetails(apiKey)} className="px-2 mx-2">{formatDate(apiKey.createdDateTime, 'date')}</td>
                                                                 <td onClick={() => showViewApiKeyDetails(apiKey)} className="px-2 mx-2">
                                                                     <div className={`${bgOfStatus(apiKey.status)} flex w-fit py-1.5 px-2 my-3 text-xs font-semibold rounded-md`}>
                                                                         {getStatusCode(apiKey.status, t)}

diff --git a/pmp-reactjs-ui/src/pages/authenticationServices/CreateOidcClient.js b/pmp-reactjs-ui/src/pages/authenticationServices/CreateOidcClient.js
@@ -6,7 +6,7 @@ import { getUserProfile } from '../../services/UserProfileService';
 import {
   getPartnerManagerUrl, handleServiceErrors, getPartnerTypeDescription, createRequest,
   moveToOidcClientsList, getGrantTypes,
-  isLangRTL, createDropdownData, validateUrl, getAllApprovedAuthPartnerPolicies,
+  isLangRTL, createDropdownData, validateUrl, getAuthPartnerPolicies,
   onPressEnterKey
 } from '../../utils/AppUtils';
 import { HttpService } from '../../services/HttpService';
@@ -147,7 +147,7 @@ function CreateOidcClient() {
     const fetchData = async () => {
       try {
         setDataLoaded(false);
-        const resData = await getAllApprovedAuthPartnerPolicies(HttpService, setErrorCode, setErrorMsg, t);
+        const resData = await getAuthPartnerPolicies(HttpService, setErrorCode, setErrorMsg, t);
         if (resData) {
           setPartnerData(resData);
           setPartnerIdDropdownData(createDropdownData('partnerId', '', false, resData, t));
@@ -169,7 +169,7 @@ function CreateOidcClient() {
     // Find the selected partner data
     const selectedPartner = partnerData.find(item => item.partnerId === selectedValue);
     if (selectedPartner) {
-      setPartnerType(getPartnerTypeDescription(selectedPartner.partnerType, t));
+      setPartnerType(getPartnerTypeDescription("AUTH_PARTNER", t));
       setPolicyGroupName(selectedPartner.policyGroupName);
       setPoliciesDropdownData(createDropdownData('policyName', 'policyDescription', false, selectedPartner.activePolicies, t));
     }

diff --git a/pmp-reactjs-ui/src/pages/authenticationServices/GenerateApiKey.js b/pmp-reactjs-ui/src/pages/authenticationServices/GenerateApiKey.js
@@ -7,7 +7,7 @@ import LoadingIcon from "../common/LoadingIcon";
 import ErrorMessage from "../common/ErrorMessage";
 import {
     getPartnerManagerUrl, handleServiceErrors, getPartnerTypeDescription, isLangRTL, moveToApiKeysList,
-    createRequest, getAllApprovedAuthPartnerPolicies, createDropdownData
+    createRequest, getAuthPartnerPolicies, createDropdownData
 } from "../../utils/AppUtils";
 import { HttpService } from '../../services/HttpService';
 import DropdownWithSearchComponent from "../common/fields/DropdownWithSearchComponent";
@@ -85,7 +85,7 @@ function GenerateApiKey() {
         // Find the selected partner data
         const selectedPartner = partnerData.find(item => item.partnerId === selectedValue);
         if (selectedPartner) {
-            setPartnerType(getPartnerTypeDescription(selectedPartner.partnerType, t));
+            setPartnerType(getPartnerTypeDescription("AUTH_PARTNER", t));
             setPolicyGroupName(selectedPartner.policyGroupName);
             setPoliciesDropdownData(createDropdownData('policyName', 'policyDescription', false, selectedPartner.activePolicies, t));
         }
@@ -103,7 +103,7 @@ function GenerateApiKey() {
         const fetchData = async () => {
             try {
                 setDataLoaded(false);
-                const resData = await getAllApprovedAuthPartnerPolicies(HttpService, setErrorCode, setErrorMsg, t);
+                const resData = await getAuthPartnerPolicies(HttpService, setErrorCode, setErrorMsg, t);
                 if (resData) {
                     setPartnerData(resData);
                     setPartnerIdDropdownData(createDropdownData('partnerId', '', false, resData, t));

diff --git a/pmp-reactjs-ui/src/pages/authenticationServices/OidcClientsList.js b/pmp-reactjs-ui/src/pages/authenticationServices/OidcClientsList.js
@@ -32,7 +32,7 @@ function OidcClientsList() {
     const [filter, setFilter] = useState(false);
     const [selectedRecordsPerPage, setSelectedRecordsPerPage] = useState(8);
     const [order, setOrder] = useState("ASC");
-    const [activeSortAsc, setActiveSortAsc] = useState("crDtimes");
+    const [activeSortAsc, setActiveSortAsc] = useState("createdDateTime");
     const [activeSortDesc, setActiveSortDesc] = useState("");
     const [isDescending, setIsDescending] = useState(false);
     const [showPopup, setShowPopup] = useState(false);
@@ -59,12 +59,12 @@ function OidcClientsList() {
         const fetchData = async () => {
             try {
                 setDataLoaded(false);
-                const response = await HttpService.get(getPartnerManagerUrl('/getAllOidcClients', process.env.NODE_ENV));
+                const response = await HttpService.get(getPartnerManagerUrl('/oauth/clients', process.env.NODE_ENV));
                 if (response) {
                     const responseData = response.data;
                     if (responseData && responseData.response) {
                         const resData = responseData.response;
-                        const sortedData = resData.sort((a, b) => new Date(b.crDtimes) - new Date(a.crDtimes));
+                        const sortedData = resData.sort((a, b) => new Date(b.createdDateTime) - new Date(a.createdDateTime));
                         setOidcClientsList(sortedData);
                         setFilteredOidcClientsList(sortedData);
                     } else {
@@ -87,7 +87,7 @@ function OidcClientsList() {
         { id: "policyGroupName", headerNameKey: "oidcClientsList.policyGroup" },
         { id: "policyName", headerNameKey: "oidcClientsList.policyName" },
         { id: "oidcClientName", headerNameKey: "oidcClientsList.oidcClientName" },
-        { id: "crDtimes", headerNameKey: "oidcClientsList.createdDate" },
+        { id: "createdDateTime", headerNameKey: "oidcClientsList.createdDate" },
         { id: "status", headerNameKey: "oidcClientsList.status" },
         { id: "oidcClientId", headerNameKey: "oidcClientsList.oidcClientId" },
         { id: "action", headerNameKey: 'oidcClientsList.action' }
@@ -170,12 +170,12 @@ function OidcClientsList() {
     }
 
     const sortAscOrder = (header) => {
-        const isDateCol = (header === "crDtimes") ? true : false;
+        const isDateCol = (header === "createdDateTime") ? true : false;
         toggleSortAscOrder(header, isDateCol, filteredOidcClientsList, setFilteredOidcClientsList, order, setOrder, isDescending, setIsDescending, activeSortAsc, setActiveSortAsc, activeSortDesc, setActiveSortDesc);
     }
 
     const sortDescOrder = (header) => {
-        const isDateCol = (header === "crDtimes") ? true : false;
+        const isDateCol = (header === "createdDateTime") ? true : false;
         toggleSortDescOrder(header, isDateCol, filteredOidcClientsList, setFilteredOidcClientsList, order, setOrder, isDescending, setIsDescending, activeSortAsc, setActiveSortAsc, activeSortDesc, setActiveSortDesc);
     }
 
@@ -294,7 +294,7 @@ function OidcClientsList() {
                                                                 <td onClick={() => showViewOidcClientDetails(client)} className="px-2 mx-2">{client.policyGroupName}</td>
                                                                 <td onClick={() => showViewOidcClientDetails(client)} className="px-2 mx-2">{client.policyName}</td>
                                                                 <td onClick={() => showViewOidcClientDetails(client)} className="px-2 mx-2">{client.oidcClientName}</td>
-                                                                <td onClick={() => showViewOidcClientDetails(client)} className="px-2 mx-2">{formatDate(client.crDtimes, 'date')}</td>
+                                                                <td onClick={() => showViewOidcClientDetails(client)} className="px-2 mx-2">{formatDate(client.createdDateTime, 'date')}</td>
                                                                 <td onClick={() => showViewOidcClientDetails(client)} className="px-2 mx-2">
                                                                     <div className={`${bgOfStatus(client.status)} flex w-fit py-1.5 px-2 my-3 text-xs font-semibold rounded-md`}>
                                                                         {getStatusCode(client.status, t)}

diff --git a/pmp-reactjs-ui/src/pages/authenticationServices/ViewApiKeyDetails.js b/pmp-reactjs-ui/src/pages/authenticationServices/ViewApiKeyDetails.js
@@ -49,11 +49,11 @@ function ViewApiKeyDetails() {
                                 </div>
                                 <div className={`font-semibold ${isLoginLanguageRTL ? "mr-1" : "ml-3"} text-sm text-dark-blue`}>
                                     {t("viewOidcClientDetails.createdOn") + ' ' +
-                                        formatDate(apiKeyDetails.crDtimes, "date")}
+                                        formatDate(apiKeyDetails.createdDateTime, "date")}
                                 </div>
                                 <div className="mx-1 text-gray-300">|</div>
                                 <div className="font-semibold text-sm text-dark-blue">
-                                    {formatDate(apiKeyDetails.crDtimes, "time")}
+                                    {formatDate(apiKeyDetails.createdDateTime, "time")}
                                 </div>
                             </div>
                         </div>
@@ -108,7 +108,7 @@ function ViewApiKeyDetails() {
                                     {t("viewOidcClientDetails.policyNameDescription")}
                                 </p>
                                 <p className="font-[600] text-vulcan text-sm break-normal">
-                                    {apiKeyDetails.policyNameDescription}
+                                    {apiKeyDetails.policyDescription}
                                 </p>
                             </div>
                         </div>

diff --git a/pmp-reactjs-ui/src/pages/authenticationServices/ViewOidcClientDetails.js b/pmp-reactjs-ui/src/pages/authenticationServices/ViewOidcClientDetails.js
@@ -67,11 +67,11 @@ function ViewOidcClientDetails() {
                                 </div>
                                 <div className={`font-semibold ${isLoginLanguageRTL ? "mr-1" : "ml-3"} text-sm text-dark-blue`}>
                                     {t("viewOidcClientDetails.createdOn") + ' ' +
-                                        formatDate(oidcClientDetails.crDtimes, "date")}
+                                        formatDate(oidcClientDetails.createdDateTime, "date")}
                                 </div>
                                 <div className="mx-1 text-gray-300">|</div>
                                 <div className="font-semibold text-sm text-dark-blue">
-                                    {formatDate(oidcClientDetails.crDtimes, "time")}
+                                    {formatDate(oidcClientDetails.createdDateTime, "time")}
                                 </div>
                             </div>
                         </div>
@@ -150,7 +150,7 @@ function ViewOidcClientDetails() {
                                     {t("viewOidcClientDetails.policyNameDescription")}
                                 </p>
                                 <p className="font-[600] text-vulcan text-sm break-normal">
-                                    {oidcClientDetails.policyNameDescription}
+                                    {oidcClientDetails.policyDescription}
                                 </p>
                             </div>
                         </div>

diff --git a/pmp-reactjs-ui/src/pages/certificates/PartnerCertificatesList.js b/pmp-reactjs-ui/src/pages/certificates/PartnerCertificatesList.js
@@ -103,7 +103,7 @@ function PartnerCertificatesList() {
         setErrorMsg("");
         setSuccessMsg("");
         try {
-            const response = await HttpService.get(getPartnerManagerUrl('/partners/' + partnerId + '/originalPartnerCertificate', process.env.NODE_ENV));
+            const response = await HttpService.get(getPartnerManagerUrl('/partners/' + partnerId + '/original-partner-certificate', process.env.NODE_ENV));
             if (response !== null) {
                 const responseData = response.data;
                 if (responseData.errors && responseData.errors.length > 0) {
@@ -131,7 +131,7 @@ function PartnerCertificatesList() {
     useEffect(() => {
         const fetchData = async () => {
             try {
-                const response = await HttpService.get(getPartnerManagerUrl('/partners/getAllCertificateDetails', process.env.NODE_ENV));
+                const response = await HttpService.get(getPartnerManagerUrl('/partners/partner-certificates', process.env.NODE_ENV));
                 if (response != null) {
                     const responseData = response.data;
                     if (responseData.errors && responseData.errors.length > 0) {
@@ -212,7 +212,7 @@ function PartnerCertificatesList() {
 
                                                     <div className="flex-col p-3 items-center">
                                                         <h6 className={`text-sm ${partner.isCertificateAvailable ? 'font-bold text-black' : 'font-semibold text-charcoal-gray'}`}>
-                                                            {partner.isCertificateAvailable ? partner.certificateName : t('partnerCertificatesList.uploadPartnerCertificate')}
+                                                            {partner.isCertificateAvailable ? partner.certificateIssuedTo : t('partnerCertificatesList.uploadPartnerCertificate')}
                                                         </h6>
                                                         <p className="text-xs text-light-gray">{partner.isCertificateAvailable ? null : t('partnerCertificatesList.certificateFormatMsg')}</p>
                                                     </div>
@@ -266,11 +266,11 @@ function PartnerCertificatesList() {
                                                 </div>
                                                 <div className={`flex-col ${isLoginLanguageRTL ? "mr-[5%]" : "ml-[5%]"}`}>
                                                     <p className="font-semibold text-xs text-dim-gray">{t('partnerCertificatesList.expiryDate')}</p>
-                                                    <p className="font-semibold text-sm text-charcoal-gray">{formatDate(partner.certificateExpiryDate, 'dateTime')}</p>
+                                                    <p className="font-semibold text-sm text-charcoal-gray">{formatDate(partner.certificateExpiryDateTime, 'dateTime')}</p>
                                                 </div>
                                                 <div className={`flex-col ${isLoginLanguageRTL ? "mr-[10%]" : "ml-[10%]"}`}>
                                                     <p className="font-semibold text-xs text-dim-gray">{t('partnerCertificatesList.timeOfUpload')}</p>
-                                                    <p className="font-semibold text-sm text-charcoal-gray">{formatDate(partner.certificateUploadDate, 'dateTime')}</p>
+                                                    <p className="font-semibold text-sm text-charcoal-gray">{formatDate(partner.certificateUploadDateTime, 'dateTime')}</p>
                                                 </div>
                                             </div>
                                         </li>

diff --git a/pmp-reactjs-ui/src/pages/certificates/UploadCertificate.js b/pmp-reactjs-ui/src/pages/certificates/UploadCertificate.js
@@ -132,11 +132,11 @@ function UploadCertificate({ closePopup, popupData, request }) {
         setPartnerType(getPartnerType(popupData));
         setPartnerDomainType(getPartnerDomainType(popupData.partnerType));
         if (popupData.isCertificateAvailable) {
-            const dateString = popupData.certificateUploadDate.toString();
+            const dateString = popupData.certificateUploadDateTime.toString();
             const formatted = formatDate(dateString, 'dateTime');
             setFormattedDate(formatted);
         }
-    }, [popupData.isCertificateAvailable, popupData.certificateUploadDate, popupData, getPartnerType]);
+    }, [popupData.isCertificateAvailable, popupData.certificateUploadDateTime, popupData, getPartnerType]);
 
     return (
         <div className="fixed inset-0 flex items-center justify-center bg-black bg-opacity-[30%] z-50">

diff --git a/pmp-reactjs-ui/src/pages/dashboard/ConsentPopup.js b/pmp-reactjs-ui/src/pages/dashboard/ConsentPopup.js
@@ -33,7 +33,7 @@ function ConsentPopup() {
         setDataLoaded(false);
         document.body.style.overflow = "auto";
         try {
-            const response = await HttpService.post(getPartnerManagerUrl(`/partners/saveUserConsentGiven`, process.env.NODE_ENV));
+            const response = await HttpService.post(getPartnerManagerUrl(`/users/user-consent`, process.env.NODE_ENV));
             if (response) {
                 const responseData = response.data;
                 if (responseData && responseData.response) {