1 files changed, 44 insertions, 12 deletions

diff --git a/app/models/user.go b/app/models/user.go
index 0cbd92d..2871380 100644
--- a/app/models/user.go
+++ b/app/models/user.go
@@ -2,8 +2,11 @@ package models
 
 import (
         "context"
+        "time"
 
         "code.crute.us/mcrute/golib/db/mongodb"
+        "go.mongodb.org/mongo-driver/bson"
+        "go.mongodb.org/mongo-driver/bson/primitive"
 )
 
 const userCol = "users"
@@ -16,17 +19,21 @@ type UserStore interface {
 }
 
 type AuthToken struct {
-        Kind         string
-        Token        string
-        RefreshToken string
+        Kind  string `json:"kind"`
+        Token string `json:"token"`
+
+        // Do not expose refresh tokens in JSON as they are long-lived tokens that
+        // are harder to invalidate and thus rather security sensitive.
+        RefreshToken string `json:"-"`
 }
 
 type User struct {
-        Username   string `bson:"_id"`
-        IsAdmin    bool
-        IsService  bool
-        Keys       map[string]*SessionKey // kid  -> key
-        AuthTokens map[string]*AuthToken  // kind -> token
+        Username   string                 `bson:"_id" json:"key_id"`
+        IsAdmin    bool                   `json:"is_admin"`
+        IsService  bool                   `json:"is_service"`
+        Keys       map[string]*SessionKey `json:"keys,omitempty"`        // kid  -> key
+        AuthTokens map[string]*AuthToken  `json:"auth_tokens,omitempty"` // kind -> token
+        Deleted    *time.Time             `json:"deleted,omitempty"`
 }
 
 // GCKeys garbage collects keys that are no longer valid
@@ -64,21 +71,41 @@ func (u *User) AddToken(t *AuthToken) {
 
 type MongoDbUserStore struct {
         Db *mongodb.Mongo
+
+        // ReturnDeleted will allow all methods to return deleted items. By default
+        // items where the Deleted field is set will not be returned. This should
+        // be the common cast for most code using this store but in some Admin
+        // use-cases it would be useful to show deleted accounts.
+        ReturnDeleted bool
 }
 
 func (s *MongoDbUserStore) List(ctx context.Context) ([]*User, error) {
         var out []*User
-        if err := s.Db.FindAll(ctx, userCol, &out); err != nil {
+
+        filter := bson.M{}
+        if !s.ReturnDeleted {
+                filter["deleted"] = primitive.Null{}
+        }
+
+        if err := s.Db.FindAllByFilter(ctx, userCol, filter, &out); err != nil {
                 return nil, err
         }
+
         return out, nil
 }
 
 func (s *MongoDbUserStore) Get(ctx context.Context, username string) (*User, error) {
         var u User
-        if err := s.Db.FindOneById(ctx, userCol, username, &u); err != nil {
+
+        filter := bson.M{"_id": username}
+        if !s.ReturnDeleted {
+                filter["deleted"] = primitive.Null{}
+        }
+
+        if err := s.Db.FindOneByFilter(ctx, userCol, filter, &u); err != nil {
                 return nil, err
         }
+
         return &u, nil
 }
 
@@ -90,10 +117,15 @@ func (s *MongoDbUserStore) Put(ctx context.Context, u *User) error {
 }
 
 func (s *MongoDbUserStore) Delete(ctx context.Context, u *User) error {
-        if err := s.Db.DeleteOneById(ctx, userCol, u.Username); err != nil {
+        u, err := s.Get(ctx, u.Username)
+        if err != nil {
                 return err
         }
-        return nil
+
+        now := time.Now()
+        u.Deleted = &now
+
+        return s.Put(ctx, u)
 }
 
 var _ UserStore = (*MongoDbUserStore)(nil)