Package app: Load the ID with the rest of the user data.

[kraftakt.git] / app / user.go

diff --git a/app/user.go b/app/user.go
index ffe65e9..9fe7e5d 100644 (file)
--- a/app/user.go
+++ b/app/user.go
@@ -14,8 +14,10 @@ import (
 )
 
 type User struct {
+       key *datastore.Key
+
+       ID    string
        Email string
-       key   *datastore.Key
 }
 
 type dbUser struct {
@@ -23,14 +25,23 @@ type dbUser struct {
 }
 
 func NewUser(ctx context.Context, email string) (*User, error) {
+       var id string
        err := datastore.RunInTransaction(ctx, func(ctx legacy_context.Context) error {
                key := datastore.NewKey(ctx, "User", email, 0, nil)
-               if err := datastore.Get(ctx, key, &dbUser{}); err != datastore.ErrNoSuchEntity {
-                       return err // may be nil
+
+               var u dbUser
+               err := datastore.Get(ctx, key, &u)
+               if err != nil && err != datastore.ErrNoSuchEntity {
+                       return err
+               }
+               if err == nil {
+                       id = u.ID
+                       return nil
                }
 
-               _, err := datastore.Put(ctx, key, &dbUser{
-                       ID: uuid.New().String(),
+               id = uuid.New().String()
+               _, err = datastore.Put(ctx, key, &dbUser{
+                       ID: id,
                })
                return err
        }, nil)
@@ -39,8 +50,9 @@ func NewUser(ctx context.Context, email string) (*User, error) {
        }
 
        return &User{
-               Email: email,
                key:   datastore.NewKey(ctx, "User", email, 0, nil),
+               ID:    id,
+               Email: email,
        }, nil
 }
 
@@ -55,20 +67,12 @@ func UserByID(ctx context.Context, id string) (*User, error) {
        }
 
        return &User{
-               Email: keys[0].StringID(),
                key:   keys[0],
+               ID:    id,
+               Email: keys[0].StringID(),
        }, nil
 }
 
-func (u *User) ID(ctx context.Context) (string, error) {
-       var db dbUser
-       if err := datastore.Get(ctx, u.key, &db); err != nil {
-               return "", err
-       }
-
-       return db.ID, nil
-}
-
 func (u *User) Token(ctx context.Context, svc string) (*oauth2.Token, error) {
        key := datastore.NewKey(ctx, "Token", svc, 0, u.key)