NewCredential/NewAccount: use types.AccountID instead of string.

Author: zenhack

cmd/tempest-make-user/main.go

@@ -1,7 +1,6 @@
 package main
 
 import (
-	"encoding/base64"
 	"flag"
 
 	"zenhack.net/go/tempest/internal/common/types"
@@ -17,7 +16,7 @@ var (
 )
 
 func main() {
-	accountID := base64.RawStdEncoding.EncodeToString(tokenutil.GenToken()[:16])
+	accountID := types.AccountID(tokenutil.Gen128Base64())
 	flag.Parse()
 	role := types.Role(*roleStr)
 	if !role.IsValid() {

internal/server/database/legacy/import.go

@@ -202,7 +202,7 @@ func importUsers(snapshotDir string, tx database.Tx) error {
 				return
 			}
 			throw(tx.AddAccount(database.NewAccount{
-				ID:      u.ID,
+				ID:      types.AccountID(u.ID),
 				Role:    u.Role,
 				Profile: u.Profile,
 			}))
@@ -229,7 +229,7 @@ func importUsers(snapshotDir string, tx database.Tx) error {
 			}
 			owner := credentialOwners[u.ID]
 			var entry database.NewCredential
-			entry.AccountID = owner.accountID
+			entry.AccountID = types.AccountID(owner.accountID)
 			entry.Login = owner.login
 			if u.Services.Dev.Name != "" {
 				entry.Credential = types.Credential{

internal/server/database/queries.go

@@ -83,7 +83,7 @@ type NewGrain struct {
 }
 
 type NewAccount struct {
-	ID      string
+	ID      types.AccountID
 	Role    types.Role
 	Profile Profile
 }
@@ -94,7 +94,7 @@ type Profile struct {
 }
 
 type NewCredential struct {
-	AccountID  string
+	AccountID  types.AccountID
 	Login      bool
 	Credential types.Credential
 }
@@ -256,11 +256,11 @@ func (tx Tx) CredentialAccount(cred types.Credential) (types.AccountID, error) {
 			// No account; create one and link it to the credential:
 			accountID = types.AccountID(tokenutil.Gen128Base64())
 			throw(tx.AddAccount(NewAccount{
-				ID:   string(accountID),
+				ID:   accountID,
 				Role: types.RoleVisitor,
 			}))
 			throw(tx.AddCredential(NewCredential{
-				AccountID:  string(accountID),
+				AccountID:  accountID,
 				Login:      true,
 				Credential: cred,
 			}))