feat: add qr code switcher to the issuer node

api_ui/api.yaml

@@ -881,16 +881,6 @@ paths:
       summary: Create Authentication Link QRCode
       operationId: CreateLinkQrCode
       parameters:
-        - name: type
-          in: query
-          required: false
-          schema:
-            type: string
-            enum: [ raw, link ]
-          description: >
-            Type:
-              * `link` - (default value) Return a QR code with a link redirection to the raw content. Easier to scan.   
-              * `raw` - Return the raw QR code. (default value)
         - $ref: '#/components/parameters/id'
       tags:
         - Links
@@ -1154,19 +1144,21 @@ components:
           type: string
           example: https://raw.githubusercontent.com/iden3/claim-schema-vocab/main/schemas/json-ld/kyc-v3.json-ld#KYCAgeCredential
 
-
     CredentialLinkQrCodeResponse:
       type: object
       required:
         - issuer
-        - qrCode
+        - qrCodeLink
+        - qrCodeRaw
         - sessionID
         - linkID
         - linkDetail
       properties:
         issuer:
           $ref: '#/components/schemas/IssuerDescription'
-        qrCode:
+        qrCodeRaw:
+          type: string
+        qrCodeLink:
           type: string
           example: iden3comm://?request_uri=https%3A%2F%2Fissuer-demo.polygonid.me%2Fapi%2Fqr-store%3Fid%3Df780a169-8959-4380-9461-f7200e2ed3f4
         sessionID:

internal/api_ui/responses.go

@@ -164,7 +164,7 @@ func connectionsResponse(conns []*domain.Connection) (GetConnectionsResponse, er
 	return resp, nil
 }
 
-func connectionsPaginatedResponse(conns []*domain.Connection, pagFilter *pagination.Filter, total uint) (ConnectionsPaginated, error) {
+func connectionsPaginatedResponse(conns []*domain.Connection, pagFilter pagination.Filter, total uint) (ConnectionsPaginated, error) {
 	resp, err := connectionsResponse(conns)
 	if err != nil {
 		return ConnectionsPaginated{}, err
@@ -173,13 +173,13 @@ func connectionsPaginatedResponse(conns []*domain.Connection, pagFilter *paginat
 	connsPag := ConnectionsPaginated{
 		Items: resp,
 		Meta: PaginatedMetadata{
-			Page:  1, // default
-			Total: total,
+			MaxResults: pagFilter.MaxResults,
+			Page:       1, // default
+			Total:      total,
 		},
 	}
-	if pagFilter != nil {
+	if pagFilter.Page != nil {
 		connsPag.Meta.Page = *pagFilter.Page
-		connsPag.Meta.MaxResults = pagFilter.MaxResults
 	}
 
 	return connsPag, nil

internal/api_ui/server.go

@@ -595,22 +595,20 @@ func (s *Server) CreateLinkQrCode(ctx context.Context, req CreateLinkQrCodeReque
 		return CreateLinkQrCode500JSONResponse{N500JSONResponse{"Unexpected error while creating qr code"}}, nil
 	}
 
-	qrContent := createLinkQrCodeResponse.QrCode
 	// Backward compatibility. If the type is raw, we return the raw qr code
-	if req.Params.Type != nil && *req.Params.Type == CreateLinkQrCodeParamsTypeRaw {
-		rawQrCode, err := s.qrService.Find(ctx, createLinkQrCodeResponse.QrID)
-		if err != nil {
-			log.Error(ctx, "qr store. Finding qr", "err", err, "id", createLinkQrCodeResponse.QrID)
-			return CreateLinkQrCode500JSONResponse{N500JSONResponse{"error looking for qr body"}}, nil
-		}
-		qrContent = string(rawQrCode)
+	qrCodeRaw, err := s.qrService.Find(ctx, createLinkQrCodeResponse.QrID)
+	if err != nil {
+		log.Error(ctx, "qr store. Finding qr", "err", err, "id", createLinkQrCodeResponse.QrID)
+		return CreateLinkQrCode500JSONResponse{N500JSONResponse{"error looking for qr body"}}, nil
 	}
+
 	return CreateLinkQrCode200JSONResponse{
 		Issuer: IssuerDescription{
 			DisplayName: s.cfg.APIUI.IssuerName,
 			Logo:        s.cfg.APIUI.IssuerLogo,
 		},
-		QrCode:     qrContent,
+		QrCodeLink: createLinkQrCodeResponse.QrCode,
+		QrCodeRaw:  string(qrCodeRaw),
 		SessionID:  createLinkQrCodeResponse.SessionID,
 		LinkDetail: getLinkSimpleResponse(*createLinkQrCodeResponse.Link),
 	}, nil

internal/api_ui/server_test.go

@@ -2904,7 +2904,7 @@ func TestServer_GetConnections(t *testing.T) {
 			auth: authOk,
 			request: GetConnectionsRequestObject{
 				Params: GetConnectionsParams{
-					MaxResults: common.ToPointer(uint(1)),
+					MaxResults: common.ToPointer(uint(2)),
 				},
 			},
 			expected: expected{
@@ -4298,7 +4298,6 @@ func TestServer_CreateLinkQRCode(t *testing.T) {
 	type expected struct {
 		linkDetail Link
 		httpCode   int
-		qrWithLink bool
 		message    string
 	}
 
@@ -4320,57 +4319,27 @@ func TestServer_CreateLinkQRCode(t *testing.T) {
 		{
 			name: "Expired link",
 			request: CreateLinkQrCodeRequestObject{
-				Id:     linkExpired.ID,
-				Params: CreateLinkQrCodeParams{Type: nil},
+				Id: linkExpired.ID,
 			},
 			expected: expected{
 				httpCode: http.StatusNotFound,
 				message:  "error: cannot issue a credential for an expired link",
 			},
 		},
 		{
-			name: "Happy path without qr type, expecting a qr code with link",
-			request: CreateLinkQrCodeRequestObject{
-				Id:     link.ID,
-				Params: CreateLinkQrCodeParams{Type: nil},
-			},
-			expected: expected{
-				linkDetail: linkDetail,
-				qrWithLink: true,
-				httpCode:   http.StatusOK,
-			},
-		},
-		{
-			name: "Happy path with qr type == link",
-			request: CreateLinkQrCodeRequestObject{
-				Id:     link.ID,
-				Params: CreateLinkQrCodeParams{Type: common.ToPointer(CreateLinkQrCodeParamsTypeLink)},
-			},
-			expected: expected{
-				linkDetail: linkDetail,
-				qrWithLink: true,
-				httpCode:   http.StatusOK,
-			},
-		},
-		{
-			name: "Happy path with qr type == raw",
+			name: "Happy path",
 			request: CreateLinkQrCodeRequestObject{
-				Id:     link.ID,
-				Params: CreateLinkQrCodeParams{Type: common.ToPointer(CreateLinkQrCodeParamsTypeRaw)},
+				Id: link.ID,
 			},
 			expected: expected{
 				linkDetail: linkDetail,
-				qrWithLink: false,
 				httpCode:   http.StatusOK,
 			},
 		},
 	} {
 		t.Run(tc.name, func(t *testing.T) {
 			rr := httptest.NewRecorder()
 			apiURL := fmt.Sprintf("/v1/credentials/links/%s/qrcode", tc.request.Id.String())
-			if tc.request.Params.Type != nil {
-				apiURL = apiURL + "?type=" + string(*tc.request.Params.Type)
-			}
 
 			req, err := http.NewRequest(http.MethodPost, apiURL, tests.JSONBody(t, nil))
 			require.NoError(t, err)
@@ -4386,20 +4355,17 @@ func TestServer_CreateLinkQRCode(t *testing.T) {
 				require.NoError(t, json.Unmarshal(rr.Body.Bytes(), &response))
 
 				realQR := protocol.AuthorizationRequestMessage{}
-				if tc.expected.qrWithLink {
-					qrLink := checkQRfetchURL(t, response.QrCode)
 
-					// Now let's fetch the original QR using the url
-					rr := httptest.NewRecorder()
-					req, err := http.NewRequest(http.MethodGet, qrLink, nil)
-					require.NoError(t, err)
-					handler.ServeHTTP(rr, req)
-					require.Equal(t, http.StatusOK, rr.Code)
+				qrLink := checkQRfetchURL(t, response.QrCodeLink)
 
-					require.NoError(t, json.Unmarshal(rr.Body.Bytes(), &realQR))
-				} else {
-					require.NoError(t, json.Unmarshal([]byte(response.QrCode), &realQR))
-				}
+				// Now let's fetch the original QR using the url
+				rr := httptest.NewRecorder()
+				req, err := http.NewRequest(http.MethodGet, qrLink, nil)
+				require.NoError(t, err)
+				handler.ServeHTTP(rr, req)
+				require.Equal(t, http.StatusOK, rr.Code)
+
+				require.NoError(t, json.Unmarshal(rr.Body.Bytes(), &realQR))
 
 				assert.NotNil(t, realQR.Body)
 				assert.Equal(t, "authentication", realQR.Body.Reason)

internal/core/ports/connections_service.go

@@ -15,28 +15,24 @@ import (
 type NewGetAllConnectionsRequest struct {
 	WithCredentials bool
 	Query           string
-	Pagination      *pagination.Filter
+	Pagination      pagination.Filter
 	OrderBy         sqltools.OrderByFilters
 }
 
 // NewGetAllRequest returns the request object for obtaining all connections
 func NewGetAllRequest(withCredentials *bool, query *string, page *uint, maxResults *uint, orderBy sqltools.OrderByFilters) *NewGetAllConnectionsRequest {
-	var (
-		connQuery string
-		pagFilter *pagination.Filter
-	)
+	var connQuery string
+
 	if query != nil {
 		connQuery = *query
 	}
 
-	if page != nil {
-		pagFilter = pagination.NewFilter(maxResults, page)
-	}
+	pagFilter := pagination.NewFilter(maxResults, page)
 
 	return &NewGetAllConnectionsRequest{
 		WithCredentials: withCredentials != nil && *withCredentials,
 		Query:           connQuery,
-		Pagination:      pagFilter,
+		Pagination:      *pagFilter,
 		OrderBy:         orderBy,
 	}
 }