hlfw.ca

Info  •  Files  •  Log  •  Branches

Remove references to db

--- a/go.sum

+++ b/go.sum

@@ -7,8 +7,8 @@

 github.com/olmaxmedical/database v0.0.1/go.mod h1:/5Tl6/p0jpvLpj4GaoFki3wRG/3b+ipNNhM5Dyi6Zf8=

 github.com/olmaxmedical/email v0.0.1 h1:bhOERmPiUmFJqC133s+FFXucSI3dNnfDKsboDYFEbkc=

 github.com/olmaxmedical/email v0.0.1/go.mod h1:bz6en9uc6h9fyu3MW2jTwYW19ZclQ22JkcIxsl3/epc=

-github.com/olmaxmedical/router v0.0.1 h1:0oDsfSoW+lP8g3yzql5QLAQgV4cTy4s+gZH7aJNJex8=

-github.com/olmaxmedical/router v0.0.1/go.mod h1:AM2lewexrBtUWFURwB9exKGvdHRGbKMEb1GL3iHX4js=

+github.com/olmaxmedical/router v0.0.1 h1:x3fZ9u00xwKxLvPj8Au0QhIxpmxRv+q2lVMdBmyRQjM=

+github.com/olmaxmedical/router v0.0.1/go.mod h1:28e377pByZCQMBAdERDBhX4wYeTsJgc6U4yOEiz7MsA=

 github.com/olmaxmedical/session v0.0.1 h1:2xdSjpEg89+ClRFLPp/gR3lNxl4JjPAUd2Hsds++FFs=

 github.com/olmaxmedical/session v0.0.1/go.mod h1:XOVyHL+cKa5t2fLDIJtFxwEzJOa3r1hUkwlL4aybdqA=

 github.com/pariz/gountries v0.0.0-20191029140926-233bc78cf5b5 h1:842t0ixg/A4my8/Q3oDNdHIsKYIx02NDlWVEhaiBToo=

--- a/password.go

+++ b/password.go

@@ -34,11 +34,11 @@

 	p := s.Printer()

 	user := r.PostFormValue("email")

 	pass := r.PostFormValue("pass")

-	if db.ValidateLogin(user, pass) {

+	if database.ValidateLogin(user, pass) {

 		us.Set("username", user)

 		us.Set("login", "true")

-		us.Set("role", db.UserRole(user))

-		us.Set("token", db.NewToken())

+		us.Set("role", database.UserRole(user))

+		us.Set("token", database.NewToken())

 		return nil

 	}

 	return errors.New(p.Sprint("Invalid login"))

@@ -54,9 +54,9 @@

 		return errors.New(p.Sprint("Passwords do not match"))

 	}

 	token := r.PostFormValue("token")

-	if !db.FindTempEntry(token) {

+	if !database.FindTempEntry(token) {

 		return errors.New(p.Sprint("Session expired"))

 	}

-	db.UpdateUserPassword(token, pass)

+	database.UpdateUserPassword(token, pass)

 	return nil

 }

--- a/tokens.go

+++ b/tokens.go

@@ -18,12 +18,12 @@

 }

 func validateToken(r *router.Request) error {

-	return db.ValidateToken(r.Request(), r.Session())

+	return database.ValidateToken(r.Request(), r.Session())

 }

 // TODO(halfwit) - database

 func newFormToken(r *router.Request) map[string]interface{} {

 	return map[string]interface{}{

-		"token": db.NewToken(),

+		"token": database.NewToken(),

 	}

 }