Skip to content

Commit

Permalink
Revert "close session that is being created"
Browse files Browse the repository at this point in the history 
This reverts commit a9e45ed.
  • Loading branch information
Rob Archibald committed Aug 3, 2018
1 parent a9e45ed commit 507e6cb
Showing 1 changed file with 33 additions and 74 deletions.
107 changes: 33 additions & 74 deletions backendMongo.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,56 +34,44 @@ func NewBackendMongo(m mgo.Sessioner, c Crypter) Backender {
return &backendMongo{m, c}
}

func (b *backendMongo) Clone() mgo.Sessioner {
return b.m.Clone()
}

func (b *backendMongo) AddUser(email string, info map[string]interface{}) (string, error) {
m := b.Clone()
defer m.Close()
u, err := b.getUser(m, email)
u, err := b.getUser(email)
if err == nil {
return u.ID.Hex(), errors.New("user already exists")
}

id := bson.NewObjectId()
return id.Hex(), b.users(m).Insert(mongoUser{ID: id, PrimaryEmail: email, Info: info})
return id.Hex(), b.users().Insert(mongoUser{ID: id, PrimaryEmail: email, Info: info})
}

func (b *backendMongo) AddUserFull(email, password string, info map[string]interface{}) (*User, error) {
m := b.Clone()
defer m.Close()
passwordHash, err := b.c.Hash(password)
if err != nil {
return nil, err
}
_, err = b.getUser(m, email)
_, err = b.getUser(email)
if err == nil {
return nil, errors.New("user already exists")
}

id := bson.NewObjectId()
return &User{id.Hex(), email, info}, b.users(m).Insert(mongoUser{ID: id, PrimaryEmail: email, PasswordHash: passwordHash, Info: info})
return &User{id.Hex(), email, info}, b.users().Insert(mongoUser{ID: id, PrimaryEmail: email, PasswordHash: passwordHash, Info: info})
}

func (b *backendMongo) getUser(m mgo.Sessioner, email string) (*mongoUser, error) {
func (b *backendMongo) getUser(email string) (*mongoUser, error) {
u := &mongoUser{}
return u, b.users(m).Find(bson.M{"primaryEmail": email}).One(u)
return u, b.users().Find(bson.M{"primaryEmail": email}).One(u)
}

func (b *backendMongo) GetUser(email string) (*User, error) {
m := b.Clone()
defer m.Close()
u, err := b.getUser(m, email)
u, err := b.getUser(email)
if err != nil {
return nil, err
}
return &User{u.ID.Hex(), u.PrimaryEmail, u.Info}, nil
}

func (b *backendMongo) UpdateUser(userID, password string, info map[string]interface{}) error {
m := b.Clone()
defer m.Close()
passwordHash, err := b.c.Hash(password)
if err != nil {
return err
Expand All @@ -93,27 +81,23 @@ func (b *backendMongo) UpdateUser(userID, password string, info map[string]inter
set["info."+key] = info[key]
}
set["passwordHash"] = passwordHash
return b.users(m).UpdateId(bson.ObjectIdHex(userID), bson.M{"$set": set})
return b.users().UpdateId(bson.ObjectIdHex(userID), bson.M{"$set": set})
}

func (b *backendMongo) UpdatePassword(userID, password string) error {
m := b.Clone()
defer m.Close()
passwordHash, err := b.c.Hash(password)
if err != nil {
return err
}
return b.users(m).UpdateId(bson.ObjectIdHex(userID), bson.M{"$set": bson.M{"passwordHash": passwordHash}})
return b.users().UpdateId(bson.ObjectIdHex(userID), bson.M{"$set": bson.M{"passwordHash": passwordHash}})
}

func (b *backendMongo) UpdateInfo(userID string, info map[string]interface{}) error {
m := b.Clone()
defer m.Close()
var set bson.M
for key := range info {
set["info."+key] = info[key]
}
return b.users(m).UpdateId(bson.ObjectIdHex(userID), bson.M{"$set": set})
return b.users().UpdateId(bson.ObjectIdHex(userID), bson.M{"$set": set})
}

func (b *backendMongo) Close() error {
Expand All @@ -122,9 +106,7 @@ func (b *backendMongo) Close() error {
}

func (b *backendMongo) LoginAndGetUser(email, password string) (*User, error) {
m := b.Clone()
defer m.Close()
u, err := b.getUser(m, email)
u, err := b.getUser(email)
if err != nil {
return nil, err
}
Expand All @@ -148,93 +130,70 @@ func (b *backendMongo) UpdatePrimaryEmail(userID, secondaryEmail string) error {
}

func (b *backendMongo) CreateEmailSession(email string, info map[string]interface{}, emailVerifyHash, csrfToken string) error {
m := b.Clone()
defer m.Close()
c, _ := b.emailSessions(m).FindId(emailVerifyHash).Count()
s := b.emailSessions()
c, _ := s.FindId(emailVerifyHash).Count()
if c > 0 {
return errors.New("invalid emailVerifyHash")
}
return b.emailSessions(m).Insert(&emailSession{"", email, info, emailVerifyHash, csrfToken})
return s.Insert(&emailSession{"", email, info, emailVerifyHash, csrfToken})
}

func (b *backendMongo) GetEmailSession(verifyHash string) (*emailSession, error) {
m := b.Clone()
defer m.Close()
session := &emailSession{}
return session, b.emailSessions(m).FindId(verifyHash).One(session)
return session, b.emailSessions().FindId(verifyHash).One(session)
}

func (b *backendMongo) UpdateEmailSession(verifyHash, userID string) error {
m := b.Clone()
defer m.Close()
return b.emailSessions(m).UpdateId(verifyHash, bson.M{"$set": bson.M{"userID": userID}})
return b.emailSessions().UpdateId(verifyHash, bson.M{"$set": bson.M{"userID": userID}})
}
func (b *backendMongo) DeleteEmailSession(verifyHash string) error {
m := b.Clone()
defer m.Close()
return b.emailSessions(m).RemoveId(verifyHash)
return b.emailSessions().RemoveId(verifyHash)
}
func (b *backendMongo) CreateSession(userID, email string, info map[string]interface{}, sessionHash, csrfToken string, renewTimeUTC, expireTimeUTC time.Time) (*LoginSession, error) {
m := b.Clone()
defer m.Close()
s := LoginSession{userID, email, info, sessionHash, csrfToken, renewTimeUTC, expireTimeUTC}
return &s, b.loginSessions(m).Insert(s)
return &s, b.loginSessions().Insert(s)
}

func (b *backendMongo) CreateRememberMe(userID, email, selector, tokenHash string, renewTimeUTC, expireTimeUTC time.Time) (*rememberMeSession, error) {
m := b.Clone()
defer m.Close()
r := rememberMeSession{userID, email, selector, tokenHash, renewTimeUTC, expireTimeUTC}
return &r, b.rememberMeSessions(m).Insert(&r)
return &r, b.rememberMeSessions().Insert(&r)
}

func (b *backendMongo) GetSession(sessionHash string) (*LoginSession, error) {
m := b.Clone()
defer m.Close()
session := &LoginSession{}
return session, b.loginSessions(m).FindId(sessionHash).One(session)
return session, b.loginSessions().FindId(sessionHash).One(session)
}

func (b *backendMongo) UpdateSession(sessionHash string, renewTimeUTC, expireTimeUTC time.Time) error {
m := b.Clone()
defer m.Close()
return b.loginSessions(m).UpdateId(sessionHash, bson.M{"$set": bson.M{"expireTimeUTC": expireTimeUTC, "renewTimeUTC": renewTimeUTC}})
return b.loginSessions().UpdateId(sessionHash, bson.M{"$set": bson.M{"expireTimeUTC": expireTimeUTC, "renewTimeUTC": renewTimeUTC}})
}

func (b *backendMongo) DeleteSession(sessionHash string) error {
m := b.Clone()
defer m.Close()
return b.loginSessions(m).RemoveId(sessionHash)
return b.loginSessions().RemoveId(sessionHash)
}
func (b *backendMongo) InvalidateSessions(email string) error {
return nil
}
func (b *backendMongo) GetRememberMe(selector string) (*rememberMeSession, error) {
m := b.Clone()
defer m.Close()
rememberMe := &rememberMeSession{}
return rememberMe, b.rememberMeSessions(m).FindId(selector).One(rememberMe)
return rememberMe, b.rememberMeSessions().FindId(selector).One(rememberMe)
}
func (b *backendMongo) UpdateRememberMe(selector string, renewTimeUTC time.Time) error {
m := b.Clone()
defer m.Close()
return b.rememberMeSessions(m).UpdateId(selector, bson.M{"$set": bson.M{"renewTimeUTC": renewTimeUTC}})
return b.rememberMeSessions().UpdateId(selector, bson.M{"$set": bson.M{"renewTimeUTC": renewTimeUTC}})
}
func (b *backendMongo) DeleteRememberMe(selector string) error {
m := b.Clone()
defer m.Close()
return b.rememberMeSessions(m).RemoveId(selector)
return b.rememberMeSessions().RemoveId(selector)
}

func (b *backendMongo) users(s mgo.Sessioner) mgo.Collectioner {
return s.DB("users").C("users")
func (b *backendMongo) users() mgo.Collectioner {
return b.m.Clone().DB("users").C("users")
}
func (b *backendMongo) emailSessions(s mgo.Sessioner) mgo.Collectioner {
return s.DB("users").C("emailSessions")
func (b *backendMongo) emailSessions() mgo.Collectioner {
return b.m.Clone().DB("users").C("emailSessions")
}
func (b *backendMongo) loginSessions(s mgo.Sessioner) mgo.Collectioner {
return s.DB("users").C("loginSessions")
func (b *backendMongo) loginSessions() mgo.Collectioner {
return b.m.Clone().DB("users").C("loginSessions")
}
func (b *backendMongo) rememberMeSessions(s mgo.Sessioner) mgo.Collectioner {
return s.DB("users").C("rememberMeSessions")
func (b *backendMongo) rememberMeSessions() mgo.Collectioner {
return b.m.Clone().DB("users").C("rememberMeSessions")
}

0 comments on commit 507e6cb

Please sign in to comment.