registration, invite, and organization tokens (#820, #834)

cmd/zrok/adminGenerate.go

@@ -53,7 +53,7 @@ func (cmd *adminGenerateCommand) run(_ *cobra.Command, args []string) {
 		panic(err)
 	}
 	req := admin.NewInviteTokenGenerateParams()
-	req.Body.Tokens = tokens
+	req.Body.InviteTokens = tokens
 
 	_, err = zrok.Admin.InviteTokenGenerate(req, mustGetAdminAuth())
 	if err != nil {

cmd/zrok/adminListOrgMembers.go

@@ -41,7 +41,7 @@ func (cmd *adminListOrgMembersCommand) run(_ *cobra.Command, args []string) {
 	}
 
 	req := admin.NewListOrganizationMembersParams()
-	req.Body.Token = args[0]
+	req.Body.OrganizationToken = args[0]
 
 	resp, err := zrok.Admin.ListOrganizationMembers(req, mustGetAdminAuth())
 	if err != nil {

cmd/zrok/orgMemberships.go

@@ -66,7 +66,7 @@ func (c *orgMembershipsCommand) run(_ *cobra.Command, _ []string) {
 		t.SetStyle(table.StyleColoredDark)
 		t.AppendHeader(table.Row{"Organization Token", "Description", "Admin?"})
 		for _, i := range in.Payload.Memberships {
-			t.AppendRow(table.Row{i.Token, i.Description, i.Admin})
+			t.AppendRow(table.Row{i.OrganizationToken, i.Description, i.Admin})
 		}
 		t.Render()
 		fmt.Println()

controller/inviteTokenGenerate.go

@@ -22,14 +22,14 @@ func (handler *inviteTokenGenerateHandler) Handle(params admin.InviteTokenGenera
 		return admin.NewInviteTokenGenerateUnauthorized()
 	}
 
-	if len(params.Body.Tokens) == 0 {
+	if len(params.Body.InviteTokens) == 0 {
 		logrus.Error("missing tokens")
 		return admin.NewInviteTokenGenerateBadRequest()
 	}
-	logrus.Infof("received invite generate request with %d tokens", len(params.Body.Tokens))
+	logrus.Infof("received invite generate request with %d tokens", len(params.Body.InviteTokens))
 
-	invites := make([]*store.InviteToken, len(params.Body.Tokens))
-	for i, token := range params.Body.Tokens {
+	invites := make([]*store.InviteToken, len(params.Body.InviteTokens))
+	for i, token := range params.Body.InviteTokens {
 		invites[i] = &store.InviteToken{
 			Token: token,
 		}

controller/listMemberships.go

@@ -29,7 +29,7 @@ func (h *listMembershipsHandler) Handle(_ metadata.ListMembershipsParams, princi
 
 	var out []*metadata.ListMembershipsOKBodyMembershipsItems0
 	for _, om := range oms {
-		out = append(out, &metadata.ListMembershipsOKBodyMembershipsItems0{Token: om.Token, Description: om.Description, Admin: om.Admin})
+		out = append(out, &metadata.ListMembershipsOKBodyMembershipsItems0{OrganizationToken: om.Token, Description: om.Description, Admin: om.Admin})
 	}
 	return metadata.NewListMembershipsOK().WithPayload(&metadata.ListMembershipsOKBody{Memberships: out})
 }

controller/listOrganizationMembers.go

@@ -26,13 +26,13 @@ func (h *listOrganizationMembersHandler) Handle(params admin.ListOrganizationMem
 	}
 	defer func() { _ = trx.Rollback() }()
 
-	org, err := str.FindOrganizationByToken(params.Body.Token, trx)
+	org, err := str.FindOrganizationByToken(params.Body.OrganizationToken, trx)
 	if err != nil {
 		logrus.Errorf("error finding organization by token: %v", err)
 		return admin.NewListOrganizationMembersNotFound()
 	}
 	if org == nil {
-		logrus.Errorf("organization '%v' not found", params.Body.Token)
+		logrus.Errorf("organization '%v' not found", params.Body.OrganizationToken)
 		return admin.NewListOrganizationMembersNotFound()
 	}
 

controller/verify.go

@@ -13,18 +13,18 @@ func newVerifyHandler() *verifyHandler {
 }
 
 func (h *verifyHandler) Handle(params account.VerifyParams) middleware.Responder {
-	if params.Body.Token != "" {
-		logrus.Debugf("received verify request for token '%v'", params.Body.Token)
+	if params.Body.RegistrationToken != "" {
+		logrus.Debugf("received verify request for registration token '%v'", params.Body.RegistrationToken)
 		tx, err := str.Begin()
 		if err != nil {
 			logrus.Errorf("error starting transaction: %v", err)
 			return account.NewVerifyInternalServerError()
 		}
 		defer func() { _ = tx.Rollback() }()
 
-		ar, err := str.FindAccountRequestWithToken(params.Body.Token, tx)
+		ar, err := str.FindAccountRequestWithToken(params.Body.RegistrationToken, tx)
 		if err != nil {
-			logrus.Errorf("error finding account request with token '%v': %v", params.Body.Token, err)
+			logrus.Errorf("error finding account request with registration token '%v': %v", params.Body.RegistrationToken, err)
 			return account.NewVerifyNotFound()
 		}