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

Remove restoring backed up facts from bindings NewUdManagerFromBackup call

parent 046d5d0c
No related branches found
No related tags found
2 merge requests!510Release,!396Remove restoring backed up facts from bindings NewUdManagerFromBackup call
...@@ -203,27 +203,22 @@ func NewOrLoadUd(e2eID int, follower UdNetworkStatus, username string, ...@@ -203,27 +203,22 @@ func NewOrLoadUd(e2eID int, follower UdNetworkStatus, username string,
} }
// NewUdManagerFromBackup builds a new user discover manager from a backup. It // NewUdManagerFromBackup builds a new user discover manager from a backup. It
// will construct a manager that is already registered and restore already // will construct a manager that is already registered. Confirmed facts have
// registered facts into store. // already been restored via the call NewCmixFromBackup.
// //
// Parameters: // Parameters:
// - e2eID - e2e object ID in the tracker // - e2eID - e2e object ID in the tracker
// - follower - network follower func wrapped in UdNetworkStatus // - follower - network follower func wrapped in UdNetworkStatus
// - username - The username this user registered with initially. This should
// not be nullable, and be JSON marshalled as retrieved from
// UserDiscovery.GetFacts().
// - emailFactJson - nullable JSON marshalled email [fact.Fact]
// - phoneFactJson - nullable JSON marshalled phone [fact.Fact]
// - cert - the TLS certificate for the UD server this call will connect with. // - cert - the TLS certificate for the UD server this call will connect with.
// You may use the UD server run by the xx network team by using // You may use the UD server run by the xx network team by using
// E2e.GetUdCertFromNdf. // [E2e.GetUdCertFromNdf].
// - contactFile - the data within a marshalled contact.Contact. This // - contactFile - the data within a marshalled [contact.Contact]. This
// represents the contact file of the server this call will connect with. You // represents the contact file of the server this call will connect with. You
// may use the UD server run by the xx network team by using // may use the UD server run by the xx network team by using
// E2e.GetUdContactFromNdf. // [E2e.GetUdContactFromNdf].
// - address - the IP address of the UD server this call will connect with. You // - address - the IP address of the UD server this call will connect with. You
// may use the UD server run by the xx network team by using // may use the UD server run by the xx network team by using
// E2e.GetUdAddressFromNdf. // [E2e.GetUdAddressFromNdf].
func NewUdManagerFromBackup(e2eID int, follower UdNetworkStatus, func NewUdManagerFromBackup(e2eID int, follower UdNetworkStatus,
usernameJson, emailFactJson, phoneFactJson, usernameJson, emailFactJson, phoneFactJson,
cert, contactFile []byte, address string) (*UserDiscovery, error) { cert, contactFile []byte, address string) (*UserDiscovery, error) {
...@@ -262,10 +257,8 @@ func NewUdManagerFromBackup(e2eID int, follower UdNetworkStatus, ...@@ -262,10 +257,8 @@ func NewUdManagerFromBackup(e2eID int, follower UdNetworkStatus,
return xxdk.Status(follower.UdNetworkStatus()) return xxdk.Status(follower.UdNetworkStatus())
} }
u, err := ud.NewManagerFromBackup( u, err := ud.NewManagerFromBackup(user.api, user.api.GetComms(),
user.api, user.api.GetComms(), UdNetworkStatusFn, UdNetworkStatusFn, cert, contactFile, address)
username, email, phone,
cert, contactFile, address)
if err != nil { if err != nil {
return nil, err return nil, err
} }
......
...@@ -125,12 +125,8 @@ func NewOrLoad(user udE2e, comms Comms, follower udNetworkStatus, ...@@ -125,12 +125,8 @@ func NewOrLoad(user udE2e, comms Comms, follower udNetworkStatus,
// - user is an interface that adheres to the xxdk.E2e object. // - user is an interface that adheres to the xxdk.E2e object.
// - comms is an interface that adheres to client.Comms object. // - comms is an interface that adheres to client.Comms object.
// - follower is a method off of xxdk.Cmix which returns the network follower's status. // - follower is a method off of xxdk.Cmix which returns the network follower's status.
// - username is the name of the user as it is registered with UD. This will be what the end user
// provides if through the bindings.
// - networkValidationSig is a signature provided by the network (i.e. the client registrar). This may // - networkValidationSig is a signature provided by the network (i.e. the client registrar). This may
// be nil, however UD may return an error in some cases (e.g. in a production level environment). // be nil, however UD may return an error in some cases (e.g. in a production level environment).
// - email is a fact.Fact (type Email) which has been registered with UD already.
// - phone is a fact.Fact (type Phone) which has been registered with UD already.
// - cert is the TLS certificate for the UD server this call will connect with. // - cert is the TLS certificate for the UD server this call will connect with.
// - contactFile is the data within a marshalled contact.Contact. This represents the // - contactFile is the data within a marshalled contact.Contact. This represents the
// contact file of the server this call will connect with. // contact file of the server this call will connect with.
...@@ -138,9 +134,9 @@ func NewOrLoad(user udE2e, comms Comms, follower udNetworkStatus, ...@@ -138,9 +134,9 @@ func NewOrLoad(user udE2e, comms Comms, follower udNetworkStatus,
// //
// Returns // Returns
// - A Manager object which is registered to the specified UD service. // - A Manager object which is registered to the specified UD service.
func NewManagerFromBackup(user udE2e, comms Comms, follower udNetworkStatus, func NewManagerFromBackup(user udE2e, comms Comms,
username, email, phone fact.Fact, follower udNetworkStatus, cert, contactFile []byte,
cert, contactFile []byte, address string) (*Manager, error) { address string) (*Manager, error) {
jww.INFO.Println("ud.NewManagerFromBackup()") jww.INFO.Println("ud.NewManagerFromBackup()")
if follower() != xxdk.Running { if follower() != xxdk.Running {
return nil, errors.New( return nil, errors.New(
...@@ -161,13 +157,6 @@ func NewManagerFromBackup(user udE2e, comms Comms, follower udNetworkStatus, ...@@ -161,13 +157,6 @@ func NewManagerFromBackup(user udE2e, comms Comms, follower udNetworkStatus,
return nil, err return nil, err
} }
// Put any passed in missing facts into store
err = m.store.BackUpMissingFacts(username, email, phone)
if err != nil {
return nil, errors.WithMessage(err, "Failed to restore UD store "+
"from backup")
}
// Set as registered. Since it's from a backup, // Set as registered. Since it's from a backup,
// the user is already registered // the user is already registered
if err = setRegistered(m.getKv()); err != nil { if err = setRegistered(m.getKv()); err != nil {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment