Merge pull request #65 from rashmithachamikara/feature/portal-update-to-v0.3.0

Upgrade Consent Portal to Support Consent Management API v0.3.0

Author: hasithakn

portal/backend/.env.example

@@ -22,14 +22,14 @@ BFF_CORS__ALLOWED_HEADERS=Content-Type,X-Correlation-ID
 BFF_CORS__ALLOW_CREDENTIALS=false
 
 # Proxy
-BFF_PROXY__OPENFGC_API_URL=http://localhost:9090
+BFF_PROXY__OPENFGC_API_URL=http://localhost:8060
 BFF_PROXY__OPENFGC_API_TIMEOUT=10s
 BFF_PROXY__MAX_REQUEST_BYTES=1048576
 BFF_PROXY__MAX_RESPONSE_BYTES=10485760
 BFF_PROXY__ALLOWED_PASSTHROUGH_METHODS=["GET","POST","PUT","DELETE"]
 
-# Placeholder identity mode (Phase 2 only; must be false in production)
+# Placeholder identity mode for local development (must be false in production)
 BFF_PROXY__PLACEHOLDER_MODE_ENABLED=false
 BFF_PROXY__PLACEHOLDER_USER_ID=
 BFF_PROXY__PLACEHOLDER_ORG_ID=
-BFF_PROXY__PLACEHOLDER_CLIENT_ID=
+BFF_PROXY__PLACEHOLDER_GROUP_ID=

portal/backend/README.md

@@ -61,16 +61,16 @@ When credentials are enabled, origins must be explicitly allowlisted (wildcard o
 
 Portal-facing user endpoints:
 
-- `GET /me/consents` -> upstream `GET /api/v1/consents` with forced `userIds=<placeholder>`
-- `GET /me/consents/{consentId}` -> upstream `GET /api/v1/consents/{consentId}`
-- `POST /me/consents/{consentId}/approve` -> BFF fetches current consent, merges selected optional approvals, uses the consent's `clientId` as the trusted upstream `TPP-client-id`, updates an existing authorization to approved for the trusted user (or creates one if none exist), and upstreams `PUT /api/v1/consents/{consentId}`
-- `PUT /me/consents/{consentId}/revoke` -> upstream `PUT /api/v1/consents/{consentId}/revoke`
+- `GET /me/consents` -> upstream `GET /api/v1/consents` with forced `userIds=<placeholder>` and `details=true`
+- `GET /me/consents/{consentId}` -> one upstream `GET /api/v1/consents/{consentId}?details=true`; the detailed consent snapshot is returned unchanged
+- `POST /me/consents/{consentId}/approve` -> BFF fetches the current consent with `details=true`, validates selected optional elements against its embedded stable IDs and versions, automatically approves mandatory elements, preserves existing approvals, and sends a full upstream consent update with the consent's immutable `groupId` as the trusted `group-id` header
+- `POST /me/consents/{consentId}/revoke` -> upstream `POST /api/v1/consents/{consentId}/revoke`
 
 Proxy hardening:
 
 - Path rewrite `/api/*` -> `/api/v1/*` with query preservation
 - Deny-by-default allowlist for consent-server routes (unknown path -> `404`, known path wrong method -> `405`)
-- Hop-by-hop header stripping and trusted-header override prevention (`org-id`, `TPP-client-id`)
+- Hop-by-hop header stripping and trusted-header override prevention (`org-id`, `group-id`, and the rejected legacy client header)
 - Correlation ID propagation/generation via `X-Correlation-ID`
 - Request body limit enforcement (`BFF_PROXY__MAX_REQUEST_BYTES`) with `413`
 - Deterministic upstream error mapping: timeout -> `504`, other connectivity failures -> `502`
@@ -97,6 +97,8 @@ Common error codes:
 
 - `BFF_PROXY__PLACEHOLDER_MODE_ENABLED=true` is blocked when `BFF_ENV=production`
 - `BFF_PROXY__PLACEHOLDER_USER_ID` must be empty if placeholder mode is disabled
+- `BFF_PROXY__PLACEHOLDER_ORG_ID` must be empty if placeholder mode is disabled
+- `BFF_PROXY__PLACEHOLDER_GROUP_ID` must be empty if placeholder mode is disabled
 
 ## AI Instructions
 

portal/backend/internal/me/handler.go

@@ -68,6 +68,7 @@ func (h *Handler) Consents(w http.ResponseWriter, r *http.Request) {
 	}
 	if err := h.svc.Forward(w, r, http.MethodGet, "/api/v1/consents", func(q url.Values) {
 		q.Set("userIds", userID)
+		q.Set("details", "true")
 	}, nil); err != nil {
 		writeProxyError(w, err)
 	}
@@ -93,25 +94,12 @@ func (h *Handler) ConsentByID(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	baseResp, err := h.svc.ForwardRaw(r, http.MethodGet, "/api/v1/consents/"+url.PathEscape(consentID), nil, nil)
-	if err != nil {
-		writeProxyError(w, err)
-		return
-	}
-	if baseResp.StatusCode != http.StatusOK {
-		h.svc.WriteUpstreamResponse(w, baseResp)
-		return
-	}
-
-	aggregatedBody, err := h.svc.BuildAggregatedConsentResponse(r, baseResp.Body)
-	if err != nil {
+	if err := h.svc.Forward(w, r, http.MethodGet, "/api/v1/consents/"+url.PathEscape(consentID), func(q url.Values) {
+		q.Set("details", "true")
+		q.Del("includeStatusHistory")
+	}, nil); err != nil {
 		writeProxyError(w, err)
-		return
 	}
-
-	w.Header().Set("Content-Type", "application/json")
-	w.WriteHeader(http.StatusOK)
-	_, _ = w.Write(aggregatedBody)
 }
 
 // ConsentApprove handles POST /me/consents/{consentId}/approve.
@@ -144,7 +132,10 @@ func (h *Handler) ConsentApprove(w http.ResponseWriter, r *http.Request) {
 		writeJSONError(w, http.StatusBadRequest, "INVALID_PAYLOAD", "invalid request payload")
 		return
 	}
-	baseResp, err := h.svc.ForwardRaw(r, http.MethodGet, "/api/v1/consents/"+url.PathEscape(consentID), nil, nil)
+	baseResp, err := h.svc.ForwardRaw(r, http.MethodGet, "/api/v1/consents/"+url.PathEscape(consentID), func(q url.Values) {
+		q.Set("details", "true")
+		q.Del("includeStatusHistory")
+	}, nil)
 	if err != nil {
 		writeProxyError(w, err)
 		return
@@ -154,7 +145,7 @@ func (h *Handler) ConsentApprove(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	payload, trustedClientID, err := h.svc.BuildApprovalUpdatePayload(r, baseResp.Body, selections, userID)
+	payload, trustedGroupID, err := h.svc.BuildApprovalUpdatePayload(baseResp.Body, selections, userID)
 	if err != nil {
 		if errors.Is(err, proxy.ErrUpstreamTimeout) || errors.Is(err, proxy.ErrUpstreamUnavailable) || errors.Is(err, proxy.ErrUpstreamResponseTooLarge) {
 			writeProxyError(w, err)
@@ -163,14 +154,14 @@ func (h *Handler) ConsentApprove(w http.ResponseWriter, r *http.Request) {
 		writeJSONError(w, http.StatusBadRequest, "INVALID_PAYLOAD", "invalid request payload")
 		return
 	}
-	if err := h.svc.ForwardWithClientID(w, r, http.MethodPut, "/api/v1/consents/"+url.PathEscape(consentID), nil, payload, trustedClientID); err != nil {
+	if err := h.svc.ForwardWithGroupID(w, r, http.MethodPut, "/api/v1/consents/"+url.PathEscape(consentID), nil, payload, trustedGroupID); err != nil {
 		writeProxyError(w, err)
 	}
 }
 
-// ConsentRevoke handles PUT /me/consents/{consentId}/revoke.
+// ConsentRevoke handles POST /me/consents/{consentId}/revoke.
 func (h *Handler) ConsentRevoke(w http.ResponseWriter, r *http.Request) {
-	if r.Method != http.MethodPut {
+	if r.Method != http.MethodPost {
 		writeJSONError(w, http.StatusMethodNotAllowed, "METHOD_NOT_ALLOWED", "method not allowed")
 		return
 	}
@@ -198,7 +189,7 @@ func (h *Handler) ConsentRevoke(w http.ResponseWriter, r *http.Request) {
 		writeJSONError(w, http.StatusBadRequest, "INVALID_PAYLOAD", "invalid request payload")
 		return
 	}
-	if err := h.svc.Forward(w, r, http.MethodPut, "/api/v1/consents/"+url.PathEscape(consentID)+"/revoke", nil, payload); err != nil {
+	if err := h.svc.Forward(w, r, http.MethodPost, "/api/v1/consents/"+url.PathEscape(consentID)+"/revoke", nil, payload); err != nil {
 		writeProxyError(w, err)
 	}
 }

portal/backend/internal/me/init.go

@@ -41,7 +41,7 @@ func Initialize(mux *http.ServeMux, cfg config.Config) error {
 	mux.Handle("GET /me/consents", middleware.UserID(http.HandlerFunc(handler.Consents), userIDOptions))
 	mux.Handle("GET /me/consents/{consentId}", middleware.UserID(http.HandlerFunc(handler.ConsentByID), userIDOptions))
 	mux.Handle("POST /me/consents/{consentId}/approve", middleware.UserID(http.HandlerFunc(handler.ConsentApprove), userIDOptions))
-	mux.Handle("PUT /me/consents/{consentId}/revoke", middleware.UserID(http.HandlerFunc(handler.ConsentRevoke), userIDOptions))
+	mux.Handle("POST /me/consents/{consentId}/revoke", middleware.UserID(http.HandlerFunc(handler.ConsentRevoke), userIDOptions))
 
 	return nil
 }