Refactor resource-id header from endpoint to policy interceptor