Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix links empty authorization #799

Merged
merged 2 commits into from
Sep 25, 2024
Merged

Fix links empty authorization #799

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c659fd
fx: links empty auth
martinsaporiti Sep 25, 2024
f1e65da
Merge branch 'develop-v2' into fix_links_empty_authorization
martinsaporiti Sep 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 35 additions & 33 deletions internal/core/services/link.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import (
"github.com/iden3/go-schema-processor/v2/verifiable"
"github.com/iden3/iden3comm/v2/packers"
"github.com/iden3/iden3comm/v2/protocol"
"github.com/jackc/pgtype"
"github.com/jackc/pgx/v4"

"github.com/polygonid/sh-id-platform/internal/common"
Expand Down Expand Up @@ -141,16 +142,43 @@ func (ls *Link) Activate(ctx context.Context, issuerID w3c.DID, linkID uuid.UUID
}

// GetByID returns a link by id and issuerDID
func (ls *Link) GetByID(ctx context.Context, issuerID w3c.DID, id uuid.UUID, serverURL string) (*domain.Link, error) {
link, err := ls.linkRepository.GetByID(ctx, issuerID, id)
func (ls *Link) GetByID(ctx context.Context, issuerDID w3c.DID, id uuid.UUID, serverURL string) (*domain.Link, error) {
link, err := ls.linkRepository.GetByID(ctx, issuerDID, id)
if err != nil {
if errors.Is(err, repositories.ErrLinkDoesNotExist) {
return nil, ErrLinkNotFound
}
return nil, err
}

ls.addLinksToLink(link, serverURL, issuerID)
if link.AuthorizationRequestMessage == nil {
reqID := uuid.New().String()
authorizationRequestMessage := &protocol.AuthorizationRequestMessage{
From: issuerDID.String(),
ID: reqID,
ThreadID: reqID,
Typ: packers.MediaTypePlainMessage,
Type: protocol.AuthorizationRequestMessageType,
Body: protocol.AuthorizationRequestMessageBody{
CallbackURL: fmt.Sprintf(ports.LinksCallbackURL, serverURL, issuerDID.String(), link.ID.String()),
Reason: authReason,
Scope: make([]protocol.ZeroKnowledgeProofRequest, 0),
},
}
if err := ls.linkRepository.AddAuthorizationRequest(ctx, link.ID, issuerDID, authorizationRequestMessage); err != nil {
log.Error(ctx, "cannot add the authorization request", "err", err)
return nil, err
}

link.AuthorizationRequestMessage = &pgtype.JSONB{}
err = link.AuthorizationRequestMessage.Set(authorizationRequestMessage)
if err != nil {
log.Error(ctx, "cannot assign the authorization", "err", err)
return nil, err
}
}

ls.addLinksToLink(link, serverURL, issuerDID)
return link, nil
}

Expand Down Expand Up @@ -194,37 +222,11 @@ func (ls *Link) CreateQRCode(ctx context.Context, issuerDID w3c.DID, linkID uuid

var authorizationRequestMessage *protocol.AuthorizationRequestMessage
var raw []byte
if link.AuthorizationRequestMessage == nil {
reqID := uuid.New().String()
authorizationRequestMessage = &protocol.AuthorizationRequestMessage{
From: issuerDID.String(),
ID: reqID,
ThreadID: reqID,
Typ: packers.MediaTypePlainMessage,
Type: protocol.AuthorizationRequestMessageType,
Body: protocol.AuthorizationRequestMessageBody{
CallbackURL: fmt.Sprintf(ports.LinksCallbackURL, serverURL, issuerDID.String(), linkID.String()),
Reason: authReason,
Scope: make([]protocol.ZeroKnowledgeProofRequest, 0),
},
}
if err := ls.linkRepository.AddAuthorizationRequest(ctx, linkID, issuerDID, authorizationRequestMessage); err != nil {
log.Error(ctx, "cannot add the authorization request", "err", err)
return nil, err
}
raw, err = json.Marshal(authorizationRequestMessage)
if err != nil {
log.Error(ctx, "cannot marshal the authorization", "err", err)
}
} else {
if err := json.Unmarshal(link.AuthorizationRequestMessage.Bytes, &authorizationRequestMessage); err != nil {
log.Error(ctx, "cannot unmarshal the authorization", "err", err)
return nil, err
}
raw = link.AuthorizationRequestMessage.Bytes

if err := json.Unmarshal(link.AuthorizationRequestMessage.Bytes, &authorizationRequestMessage); err != nil {
log.Error(ctx, "cannot unmarshal the authorization", "err", err)
return nil, err
}

raw = link.AuthorizationRequestMessage.Bytes
return &ports.CreateQRCodeResponse{
DeepLink: qrlink.NewDeepLink(serverURL, linkID, &issuerDID),
UniversalLink: qrlink.NewUniversal(ls.cfg.BaseUrl, serverURL, link.ID, &issuerDID),
Expand Down
Loading