From 18e01e54bfdc415c0ec1e1def754ef90b03f483a Mon Sep 17 00:00:00 2001 From: Angelo De Caro Date: Fri, 1 Oct 2021 10:04:24 +0200 Subject: [PATCH 1/2] translator: adding ability to read the token request Signed-off-by: Angelo De Caro --- token/services/vault/translator/translator.go | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/token/services/vault/translator/translator.go b/token/services/vault/translator/translator.go index 698ae7f0e..3e28ebab9 100644 --- a/token/services/vault/translator/translator.go +++ b/token/services/vault/translator/translator.go @@ -67,9 +67,9 @@ func (w *Translator) CommitTokenRequest(raw []byte) error { } tr, err := w.RWSet.GetState(w.namespace, key) if err != nil { - return errors.Wrapf(err, "failed to write token request'%s'", w.TxID) + return errors.Wrapf(err, "failed to read token request'%s'", w.TxID) } - if tr != nil { + if len(tr) == 0 { return errors.Wrapf(errors.New("token request with same ID already exists"), "failed to write token request'%s'", w.TxID) } err = w.RWSet.SetState(w.namespace, key, raw) @@ -79,6 +79,18 @@ func (w *Translator) CommitTokenRequest(raw []byte) error { return nil } +func (w *Translator) ReadTokenRequest() ([]byte, error) { + key, err := keys.CreateTokenRequestKey(w.TxID) + if err != nil { + return nil, errors.Errorf("can't create for token request '%s'", w.TxID) + } + tr, err := w.RWSet.GetState(w.namespace, key) + if err != nil { + return nil, errors.Wrapf(err, "failed to read token request'%s'", w.TxID) + } + return tr, nil +} + func (w *Translator) checkProcess(action interface{}) error { if err := w.checkAction(action); err != nil { return err From b7e0a218003c8e79dce70c6139618dbe48cd9e8d Mon Sep 17 00:00:00 2001 From: Angelo De Caro Date: Fri, 1 Oct 2021 10:13:27 +0200 Subject: [PATCH 2/2] check fix Signed-off-by: Angelo De Caro --- token/services/vault/translator/translator.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/token/services/vault/translator/translator.go b/token/services/vault/translator/translator.go index 3e28ebab9..1b1f5e948 100644 --- a/token/services/vault/translator/translator.go +++ b/token/services/vault/translator/translator.go @@ -69,7 +69,7 @@ func (w *Translator) CommitTokenRequest(raw []byte) error { if err != nil { return errors.Wrapf(err, "failed to read token request'%s'", w.TxID) } - if len(tr) == 0 { + if len(tr) != 0 { return errors.Wrapf(errors.New("token request with same ID already exists"), "failed to write token request'%s'", w.TxID) } err = w.RWSet.SetState(w.namespace, key, raw)