Fix: #193 - Unified base url, now directly copy and paste from the de…

…veloper APIs
decentralised-dataexchange · Nov 13, 2023 · 12ef6e1 · 12ef6e1
1 parent e27446a
commit 12ef6e1
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 23 deletions.
diff --git a/PrivacyDashboard/src/main/java/com/github/privacyDashboard/PrivacyDashboard.kt b/PrivacyDashboard/src/main/java/com/github/privacyDashboard/PrivacyDashboard.kt
@@ -70,7 +70,10 @@ object PrivacyDashboard {
      * @param baseUrl
      */
     fun withBaseUrl(baseUrl: String?): PrivacyDashboard {
-        this.mBaseUrl = baseUrl
+        if (baseUrl?.last().toString() == "/")
+            this.mBaseUrl = baseUrl
+        else
+            this.mBaseUrl = "$baseUrl/"
         return this
     }
 

diff --git a/...Dashboard/src/main/java/com/github/privacyDashboard/communication/BBConsentAPIServices.kt b/...Dashboard/src/main/java/com/github/privacyDashboard/communication/BBConsentAPIServices.kt
@@ -21,68 +21,68 @@ import retrofit2.Response
 import retrofit2.http.*
 
 interface BBConsentAPIServices {
-    @GET("v1/GetUserOrgsAndConsents")
+    @GET("GetUserOrgsAndConsents")
     suspend fun getOrganizationDetail(
         @Query("orgID") orgID: String?
     ): Response<OrganizationDetailResponse?>?
 
-    @GET("v2/service/organisation")
+    @GET("service/organisation")
     suspend fun getOrganizationDetailV2(
         @Header("X-ConsentBB-IndividualId") userID: String?,
     ): Response<OrganizationResponseV2>
 
-    @GET("v2/service/data-agreements")
+    @GET("service/data-agreements")
     suspend fun getDataAgreementsV2(
         @Header("X-ConsentBB-IndividualId") userID: String?,
     ): Response<DataAgreementsResponseV2>
 
-    @GET("v2/service/data-agreement/{dataAgreementId}")
+    @GET("service/data-agreement/{dataAgreementId}")
     suspend fun getDataAgreementV2(
         @Header("X-ConsentBB-IndividualId") userID: String?,
         @Path("dataAgreementId") dataAgreementId: String?
     ): Response<DataAgreementResponseV2?>?
 
-    @GET("v2/service/individual/record/consent-record")
+    @GET("service/individual/record/consent-record")
     suspend fun getDataAgreementRecordsV2(
         @Header("X-ConsentBB-IndividualId") userID: String?
     ): Response<DataAgreementRecordsResponseV2>
 
-    @POST("v2/service/individual/record/data-agreement/{dataAgreementId}")
+    @POST("service/individual/record/data-agreement/{dataAgreementId}")
     suspend fun createDataAgreementRecordV2(
         @Header("X-ConsentBB-IndividualId") userID: String?,
         @Path("dataAgreementId") dataAgreementId: String?
     ): Response<DataAgreementLatestRecordResponseV2?>?
 
-    @GET("v1/users/{userID}/consenthistory")
+    @GET("users/{userID}/consenthistory")
     suspend fun getConsentHistory(
         @Path("userID") userID: String?,
         @Query("limit") limit: Int,
         @Query("orgid") orgId: String?,
         @Query("startid") startid: String?
     ): Response<ConsentHistoryResponseV1?>
 
-    @GET("v2/service/individual/record/consent-record/history")
+    @GET("service/individual/record/consent-record/history")
     suspend fun getConsentHistoryV2(
         @Header("X-ConsentBB-IndividualId") userID: String?,
         @Query("offset") offset: Int?,
         @Query("limit") limit: Int?,
     ): Response<ConsentHistoryResponseV2?>
 
-    @GET("v1/organizations/{orgID}/users/{userId}/consents/{consentId}/purposes/{purposeId}")
+    @GET("organizations/{orgID}/users/{userId}/consents/{consentId}/purposes/{purposeId}")
     suspend fun getConsentList(
         @Path("orgID") orgID: String?,
         @Path("userId") userId: String?,
         @Path("consentId") consentId: String?,
         @Path("purposeId") purposeId: String?
     ): Response<DataAttributesResponseV1?>?
 
-    @GET("v2/service/data-agreement/{dataAgreementId}/data-attributes")
+    @GET("service/data-agreement/{dataAgreementId}/data-attributes")
     suspend fun getAttributeListV2(
         @Header("X-ConsentBB-IndividualId") userID: String?,
         @Path("dataAgreementId") dataAgreementId: String?
     ): Response<DataAttributesListResponseV2?>?
 
-    @PATCH("v1/organizations/{orgID}/users/{userId}/consents/{consentId}/purposes/{purposeId}/attributes/{attributeId}")
+    @PATCH("organizations/{orgID}/users/{userId}/consents/{consentId}/purposes/{purposeId}/attributes/{attributeId}")
     suspend fun setAttributeStatus(
         @Path("orgID") orgID: String?,
         @Path("userId") userId: String?,
@@ -92,7 +92,7 @@ interface BBConsentAPIServices {
         @Body body: ConsentStatusRequest?
     ): Response<ResultResponseV1?>?
 
-    @POST("v1/organizations/{orgID}/users/{userId}/consents/{consentId}/purposes/{purposeId}/status")
+    @POST("organizations/{orgID}/users/{userId}/consents/{consentId}/purposes/{purposeId}/status")
     suspend fun setOverallStatus(
         @Path("orgID") orgID: String?,
         @Path("userId") userId: String?,
@@ -101,54 +101,54 @@ interface BBConsentAPIServices {
         @Body body: ConsentStatusRequest?
     ): Response<UpdateConsentStatusResponseV1?>?
 
-    @GET("v2/service/individual/record/data-agreement/{dataAgreementId}")
+    @GET("service/individual/record/data-agreement/{dataAgreementId}")
     suspend fun getDataAgreementRecordV2(
         @Header("X-ConsentBB-IndividualId") userID: String?,
         @Path("dataAgreementId") dataAgreementId: String?,
     ): Response<DataAgreementLatestRecordResponseV2?>?
 
-    @PUT("v2/service/individual/record/consent-record/{dataAgreementRecordId}")
+    @PUT("service/individual/record/consent-record/{dataAgreementRecordId}")
     suspend fun setOverallStatusV2(
         @Header("X-ConsentBB-IndividualId") userID: String?,
         @Path("dataAgreementRecordId") dataAgreementRecordId: String?,
         @Query("dataAgreementId") dataAgreementId: String?,
         @Body body: ConsentStatusRequestV2?
     ): Response<DataAgreementLatestRecordResponseV2?>?
 
-    @GET("v1/user/organizations/{orgId}/data-status")
+    @GET("user/organizations/{orgId}/data-status")
     suspend fun getOrgRequestStatus(
         @Path("orgId") orgId: String?,
         @Query("startid") startid: String?
     ): Response<UserRequestHistoryResponseV1>
 
     //data download and delete
-    @GET("v1/user/organizations/{orgId}/data-download/status")
+    @GET("user/organizations/{orgId}/data-download/status")
     suspend fun getDataDownloadStatus(
         @Path("orgId") orgId: String?
     ): Response<UserRequestStatusV1?>
 
-    @GET("v1/user/organizations/{orgId}/data-delete/status")
+    @GET("user/organizations/{orgId}/data-delete/status")
     suspend fun getDataDeleteStatus(
         @Path("orgId") orgId: String?
     ): Response<UserRequestStatusV1?>
 
-    @POST("v1/user/organizations/{orgId}/data-delete")
+    @POST("user/organizations/{orgId}/data-delete")
     suspend fun dataDeleteRequest(
         @Path("orgId") orgId: String?
     ): Response<Void>
 
-    @POST("v1/user/organizations/{orgId}/data-download")
+    @POST("user/organizations/{orgId}/data-download")
     suspend fun dataDownloadRequest(
         @Path("orgId") orgId: String?
     ): Response<Void>
 
-    @POST("v1/user/organizations/{orgId}/data-delete/{requestId}/cancel")
+    @POST("user/organizations/{orgId}/data-delete/{requestId}/cancel")
     suspend fun dataDeleteCancelRequest(
         @Path("orgId") orgId: String?,
         @Path("requestId") requestId: String?
     ): Response<UserRequestGenResponseV1?>
 
-    @POST("v1/user/organizations/{orgId}/data-download/{requestId}/cancel")
+    @POST("user/organizations/{orgId}/data-download/{requestId}/cancel")
     suspend fun dataDownloadCancelRequest(
         @Path("orgId") orgId: String?,
         @Path("requestId") requestId: String?

diff --git a/app/src/main/java/com/github/decentralised_dataexchange/MainActivity.kt b/app/src/main/java/com/github/decentralised_dataexchange/MainActivity.kt
@@ -49,7 +49,7 @@ class MainActivity : AppCompatActivity() {
             PrivacyDashboard.showPrivacyDashboard()
                 .withApiKey("eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJTY29wZXMiOlsic2VydmljZSJdLCJPcmdhbmlzYXRpb25JZCI6IjY1MjY1Nzk2OTM4MGYzNWZhMWMzMDI0NSIsIk9yZ2FuaXNhdGlvbkFkbWluSWQiOiI2NTI2NTc5NjkzODBmMzVmYTFjMzAyNDMiLCJleHAiOjE3MDI0NDUyMjR9.iMbsEe-nN_EHzWg0KOeUGTUR1F3xYH8lQBP90Mpt_ZY")
                 .withUserId("65366979db611cb1948aca50")
-                .withBaseUrl("https://staging-consent-bb-api.igrant.io/")
+                .withBaseUrl("https://staging-consent-bb-api.igrant.io/v2")
                 .start(this)
         }