fix: handle userID and context correctly (#5755)

* fix: handle userID and context correctly

* fix linting
This commit is contained in:
Livio Spring
2023-04-26 16:19:32 +02:00
committed by GitHub
parent e4a4b7cfbe
commit 6774e7f444
5 changed files with 95 additions and 85 deletions

View File

@@ -333,9 +333,9 @@ func (c *Commands) SetUpInstance(ctx context.Context, setup *InstanceSetup) (str
validations = append(validations, prepareAddUserMachineKey(machineKey, c.machineKeySize))
}
} else if setup.Org.Human != nil {
setup.Org.Human.ID = userAgg.ID
setup.Org.Human.ID = userID
validations = append(validations,
c.AddHumanCommand(userAgg, setup.Org.Human, c.userPasswordAlg, c.userEncryption, true),
c.AddHumanCommand(setup.Org.Human, orgID, c.userPasswordAlg, c.userEncryption, true),
)
}