Skip to content
Snippets Groups Projects
Commit 57115e88 authored by Josh Brooks's avatar Josh Brooks
Browse files

Add TEMPORARY printing of protoUser JSON

parent d95902f2
Branches
Tags
2 merge requests!67Release,!47Modify Login_Unsafe for pregenerated user JSON
...@@ -8,7 +8,10 @@ ...@@ -8,7 +8,10 @@
package api package api
import ( import (
"encoding/json"
"github.com/pkg/errors" "github.com/pkg/errors"
jww "github.com/spf13/jwalterweatherman"
"gitlab.com/elixxir/client/interfaces/user"
"gitlab.com/elixxir/client/storage" "gitlab.com/elixxir/client/storage"
) )
...@@ -39,6 +42,13 @@ func (c *Client) registerWithPermissioning() error { ...@@ -39,6 +42,13 @@ func (c *Client) registerWithPermissioning() error {
userData.SetReceptionRegistrationValidationSignature(receptionRegValidationSignature) userData.SetReceptionRegistrationValidationSignature(receptionRegValidationSignature)
userData.SetRegistrationTimestamp(registrationTimestamp) userData.SetRegistrationTimestamp(registrationTimestamp)
err = c.printProtoUser(regCode, transmissionRegValidationSignature, receptionRegValidationSignature)
if err != nil {
return errors.WithMessage(err, "failed to print proto user")
}
//update the registration state //update the registration state
err = c.storage.ForwardRegistrationStatus(storage.PermissioningComplete) err = c.storage.ForwardRegistrationStatus(storage.PermissioningComplete)
if err != nil { if err != nil {
...@@ -47,3 +57,43 @@ func (c *Client) registerWithPermissioning() error { ...@@ -47,3 +57,43 @@ func (c *Client) registerWithPermissioning() error {
} }
return nil return nil
} }
// todo: remove once deploy has been tested
func (c *Client) printProtoUser(regCode string,
transmissionRegValidationSignature, receptionRegValidationSignature []byte) error {
// todo: remove this once proto has been generated
username, err := c.GetStorage().User().GetUsername()
if err != nil {
return errors.WithMessage(err, "failed to register with "+
"permissioning")
}
Usr := user.Proto{
TransmissionID: c.GetUser().TransmissionID,
TransmissionSalt: c.GetUser().TransmissionSalt,
TransmissionRSA: c.GetUser().TransmissionRSA,
ReceptionID: c.GetUser().ReceptionID,
ReceptionSalt: c.GetUser().ReceptionSalt,
ReceptionRSA: c.GetUser().ReceptionRSA,
Precanned: c.GetUser().Precanned,
RegistrationTimestamp: c.GetUser().RegistrationTimestamp,
Username: username,
RegCode: regCode,
TransmissionRegValidationSig: transmissionRegValidationSignature,
ReceptionRegValidationSig: receptionRegValidationSignature,
CmixDhPrivateKey: c.GetStorage().Cmix().GetDHPrivateKey(),
CmixDhPublicKey: c.GetStorage().Cmix().GetDHPublicKey(),
E2eDhPrivateKey: c.GetStorage().E2e().GetDHPrivateKey(),
E2eDhPublicKey: c.GetStorage().E2e().GetDHPublicKey(),
}
jsonBytes, err := json.Marshal(Usr)
if err != nil {
return errors.WithMessage(err, "failed to register with "+
"permissioning")
}
jww.INFO.Printf("PROTO USER JSON: \n%s", string(jsonBytes))
return nil
}
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment