add register user
This commit is contained in:
1 parent
7dfe981b53
commit
3026f89f2e
16 files changed
+275
-67
No files matched your search
@@ -31,6 +31,8 @@ func (r *RestServer) HandleHello() http.HandlerFunc {
|
||||
}
|
||||
w.Header().Set("Access-Control-Allow-Origin", "*")
|
||||
w.Header().Set("Access-Control-Allow-Headers", "Content-Type")
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
w.WriteHeader(http.StatusNotFound)
|
||||
io.WriteString(w, strconv.Itoa(*cout))
|
||||
}
|
||||
}
|
||||
@@ -62,21 +64,33 @@ func (r *RestServer) HendleFindAll() http.HandlerFunc {
|
||||
|
||||
func (r *RestServer) HeandleFilmsFindName() http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, res *http.Request) {
|
||||
|
||||
w.Header().Set("Access-Control-Allow-Origin", "*")
|
||||
w.Header().Set("Access-Control-Allow-Headers", "Content-Type")
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
name := mux.Vars(res)["name"]
|
||||
films, err := r.db.Films().FindByName(name)
|
||||
if err != nil {
|
||||
r.logger.Errorln(err)
|
||||
}
|
||||
jsonData, err := json.Marshal(films)
|
||||
if err != nil {
|
||||
r.logger.Errorln(err)
|
||||
if *films != nil {
|
||||
jsonData, err := json.Marshal(films)
|
||||
if err != nil {
|
||||
r.logger.Errorln(err)
|
||||
}
|
||||
io.WriteString(w, string(jsonData))
|
||||
} else {
|
||||
io.WriteString(w, string(`[]`))
|
||||
}
|
||||
io.WriteString(w, string(jsonData))
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
func (r *RestServer) HeandleFilmsSortGenres() http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, res *http.Request) {
|
||||
w.Header().Set("Access-Control-Allow-Origin", "*")
|
||||
w.Header().Set("Access-Control-Allow-Headers", "Content-Type")
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
name := mux.Vars(res)["name"]
|
||||
films, err := r.db.Films().SortByGanres(name)
|
||||
if err != nil {
|
||||
@@ -92,6 +106,9 @@ func (r *RestServer) HeandleFilmsSortGenres() http.HandlerFunc {
|
||||
|
||||
func (r *RestServer) HendleFindID() http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, res *http.Request) {
|
||||
w.Header().Set("Access-Control-Allow-Origin", "*")
|
||||
w.Header().Set("Access-Control-Allow-Headers", "Content-Type")
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
id := mux.Vars(res)["id"]
|
||||
fmt.Println(mux.Vars(res))
|
||||
film, err := r.db.Films().FindById(id)
|
||||
@@ -102,14 +119,16 @@ func (r *RestServer) HendleFindID() http.HandlerFunc {
|
||||
if err != nil {
|
||||
r.logger.Errorln(err)
|
||||
}
|
||||
w.Header().Set("Access-Control-Allow-Origin", "*")
|
||||
w.Header().Set("Access-Control-Allow-Headers", "Content-Type")
|
||||
|
||||
io.WriteString(w, string(jsonData))
|
||||
}
|
||||
}
|
||||
|
||||
func (r *RestServer) HendlePagination() http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, res *http.Request) {
|
||||
w.Header().Set("Access-Control-Allow-Origin", "*")
|
||||
w.Header().Set("Access-Control-Allow-Headers", "Content-Type")
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
id := mux.Vars(res)["page"]
|
||||
films, err := r.db.Films().Pagination(id)
|
||||
if err != nil {
|
||||
@@ -119,8 +138,6 @@ func (r *RestServer) HendlePagination() http.HandlerFunc {
|
||||
if err != nil {
|
||||
r.logger.Errorln(err)
|
||||
}
|
||||
w.Header().Set("Access-Control-Allow-Origin", "*")
|
||||
w.Header().Set("Access-Control-Allow-Headers", "Content-Type")
|
||||
io.WriteString(w, string(jsondata))
|
||||
|
||||
}
|
||||
@@ -128,6 +145,9 @@ func (r *RestServer) HendlePagination() http.HandlerFunc {
|
||||
|
||||
func (r *RestServer) HeadleGetLastItem() http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, res *http.Request) {
|
||||
w.Header().Set("Access-Control-Allow-Origin", "*")
|
||||
w.Header().Set("Access-Control-Allow-Headers", "Content-Type")
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
films, err := r.db.Films().LastItem()
|
||||
if err != nil {
|
||||
r.logger.Errorln(err)
|
||||
@@ -136,8 +156,6 @@ func (r *RestServer) HeadleGetLastItem() http.HandlerFunc {
|
||||
if err != nil {
|
||||
r.logger.Errorln(err)
|
||||
}
|
||||
w.Header().Set("Access-Control-Allow-Origin", "*")
|
||||
w.Header().Set("Access-Control-Allow-Headers", "Content-Type")
|
||||
io.WriteString(w, string(jsondata))
|
||||
}
|
||||
}
|
||||
@@ -8,6 +8,13 @@ import (
|
||||
"github.com/sirupsen/logrus"
|
||||
)
|
||||
|
||||
const (
|
||||
ContextKeyUser = iota
|
||||
defaultPermLvl = 1
|
||||
writerPermLvl = 2
|
||||
adminPermLvl = 3
|
||||
)
|
||||
|
||||
type RestServer struct {
|
||||
config *Config
|
||||
logger *logrus.Logger
|
||||
|
||||
@@ -23,14 +23,15 @@ func (r *RestServer) configureRouterSiries() {
|
||||
func (r *RestServer) HandleHelloSiries() http.HandlerFunc {
|
||||
|
||||
return func(w http.ResponseWriter, res *http.Request) {
|
||||
w.Header().Set("Access-Control-Allow-Origin", "*")
|
||||
w.Header().Set("Access-Control-Allow-Headers", "Content-Type")
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
id := res.URL.Query().Get("id")
|
||||
fmt.Println(id)
|
||||
cout, err := r.db.Siries().GetCountFilms()
|
||||
if err != nil {
|
||||
r.logger.Errorln(err)
|
||||
}
|
||||
w.Header().Set("Access-Control-Allow-Origin", "*")
|
||||
w.Header().Set("Access-Control-Allow-Headers", "Content-Type")
|
||||
io.WriteString(w, strconv.Itoa(*cout))
|
||||
}
|
||||
}
|
||||
@@ -62,21 +63,32 @@ func (r *RestServer) HendleFindAllSiries() http.HandlerFunc {
|
||||
|
||||
func (r *RestServer) HeandleSiriesFindName() http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, res *http.Request) {
|
||||
w.Header().Set("Access-Control-Allow-Origin", "*")
|
||||
w.Header().Set("Access-Control-Allow-Headers", "Content-Type")
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
name := mux.Vars(res)["name"]
|
||||
siries, err := r.db.Siries().FindByName(name)
|
||||
if err != nil {
|
||||
r.logger.Errorln(err)
|
||||
}
|
||||
jsonData, err := json.Marshal(siries)
|
||||
if err != nil {
|
||||
r.logger.Errorln(err)
|
||||
if *siries != nil {
|
||||
jsonData, err := json.Marshal(siries)
|
||||
if err != nil {
|
||||
r.logger.Errorln(err)
|
||||
}
|
||||
io.WriteString(w, string(jsonData))
|
||||
} else {
|
||||
io.WriteString(w, string(`[]`))
|
||||
}
|
||||
io.WriteString(w, string(jsonData))
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
func (r *RestServer) HeandleSiriesSortGenres() http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, res *http.Request) {
|
||||
w.Header().Set("Access-Control-Allow-Origin", "*")
|
||||
w.Header().Set("Access-Control-Allow-Headers", "Content-Type")
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
name := mux.Vars(res)["name"]
|
||||
siries, err := r.db.Siries().SortByGanres(name)
|
||||
if err != nil {
|
||||
@@ -92,6 +104,9 @@ func (r *RestServer) HeandleSiriesSortGenres() http.HandlerFunc {
|
||||
|
||||
func (r *RestServer) HendleFindIDSiries() http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, res *http.Request) {
|
||||
w.Header().Set("Access-Control-Allow-Origin", "*")
|
||||
w.Header().Set("Access-Control-Allow-Headers", "Content-Type")
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
id := mux.Vars(res)["id"]
|
||||
fmt.Println(mux.Vars(res))
|
||||
siries, err := r.db.Siries().FindById(id)
|
||||
@@ -102,14 +117,15 @@ func (r *RestServer) HendleFindIDSiries() http.HandlerFunc {
|
||||
if err != nil {
|
||||
r.logger.Errorln(err)
|
||||
}
|
||||
w.Header().Set("Access-Control-Allow-Origin", "*")
|
||||
w.Header().Set("Access-Control-Allow-Headers", "Content-Type")
|
||||
io.WriteString(w, string(jsonData))
|
||||
}
|
||||
}
|
||||
|
||||
func (r *RestServer) HendlePaginationSiries() http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, res *http.Request) {
|
||||
w.Header().Set("Access-Control-Allow-Origin", "*")
|
||||
w.Header().Set("Access-Control-Allow-Headers", "Content-Type")
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
id := mux.Vars(res)["page"]
|
||||
siries, err := r.db.Siries().Pagination(id)
|
||||
if err != nil {
|
||||
@@ -119,8 +135,6 @@ func (r *RestServer) HendlePaginationSiries() http.HandlerFunc {
|
||||
if err != nil {
|
||||
r.logger.Errorln(err)
|
||||
}
|
||||
w.Header().Set("Access-Control-Allow-Origin", "*")
|
||||
w.Header().Set("Access-Control-Allow-Headers", "Content-Type")
|
||||
io.WriteString(w, string(jsondata))
|
||||
|
||||
}
|
||||
@@ -128,6 +142,9 @@ func (r *RestServer) HendlePaginationSiries() http.HandlerFunc {
|
||||
|
||||
func (r *RestServer) HeadleGetLastItemSiries() http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, res *http.Request) {
|
||||
w.Header().Set("Access-Control-Allow-Origin", "*")
|
||||
w.Header().Set("Access-Control-Allow-Headers", "Content-Type")
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
siries, err := r.db.Siries().LastItem()
|
||||
if err != nil {
|
||||
r.logger.Errorln(err)
|
||||
@@ -136,8 +153,6 @@ func (r *RestServer) HeadleGetLastItemSiries() http.HandlerFunc {
|
||||
if err != nil {
|
||||
r.logger.Errorln(err)
|
||||
}
|
||||
w.Header().Set("Access-Control-Allow-Origin", "*")
|
||||
w.Header().Set("Access-Control-Allow-Headers", "Content-Type")
|
||||
io.WriteString(w, string(jsondata))
|
||||
}
|
||||
}
|
||||
@@ -1,36 +1,49 @@
|
||||
package restserver
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"io"
|
||||
"net/http"
|
||||
|
||||
"git.ukamnya.ru/stulyaganov/RestApiv2/internal/bd/model"
|
||||
"git.ukamnya.ru/stulyaganov/RestApiv2/pkg/utils/password"
|
||||
)
|
||||
|
||||
func (r *RestServer) configureRouterUser() {
|
||||
r.router.HandleFunc("/api/register", r.HandleFuncRegUser()).Methods("POST")
|
||||
r.router.HandleFunc("/api/register", r.chekUserRegistr(r.HandleFuncRegUser())).Methods("POST")
|
||||
r.router.HandleFunc("/api/login", r.HandleFuncLoginUser()).Methods("POST")
|
||||
r.router.HandleFunc("/api/logout", r.HandleFuncLogOutUser()).Methods("POST")
|
||||
}
|
||||
|
||||
func (r *RestServer) HandleFuncRegUser() http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, res *http.Request) {
|
||||
user := model.User{}
|
||||
err := res.ParseForm()
|
||||
users := res.Context().Value(ContextKeyUser).(*model.User)
|
||||
|
||||
hash, err := password.HashPassword(users.Password)
|
||||
|
||||
if err != nil {
|
||||
r.logger.Error(err)
|
||||
}
|
||||
user.Id = 1
|
||||
user.Login = res.Form.Get("user")
|
||||
user.Password = res.Form.Get("password")
|
||||
user.Email = res.Form.Get("email")
|
||||
user.PermisionLVL = 1
|
||||
user.Token = "dasf2!23sfafaQWerq"
|
||||
|
||||
RetUser, err := r.db.User().Create(&user)
|
||||
users.Password = string(*hash)
|
||||
err = r.db.User().Create(users)
|
||||
if err != nil {
|
||||
r.logger.Errorln(err)
|
||||
}
|
||||
if RetUser != nil {
|
||||
r.logger.Infoln("Create new user with id = ", RetUser.Id, " and with permissionLvl = ", RetUser.Id)
|
||||
r.logger.Error(err)
|
||||
} else {
|
||||
io.WriteString(w, `{"data":"Пользователь создан"}`)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
func (r *RestServer) HandleFuncLoginUser() http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, res *http.Request) {
|
||||
fmt.Println("login")
|
||||
}
|
||||
}
|
||||
|
||||
func (r *RestServer) HandleFuncLogOutUser() http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, res *http.Request) {
|
||||
fmt.Println("login")
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,49 @@
|
||||
package restserver
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"io"
|
||||
"net/http"
|
||||
|
||||
"git.ukamnya.ru/stulyaganov/RestApiv2/internal/bd/model"
|
||||
"git.ukamnya.ru/stulyaganov/RestApiv2/pkg/utils/validator"
|
||||
)
|
||||
|
||||
func (r *RestServer) chekUserRegistr(next http.HandlerFunc) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, res *http.Request) {
|
||||
w.Header().Set("Access-Control-Allow-Origin", "*")
|
||||
w.Header().Set("Access-Control-Allow-Headers", "Content-Type")
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
users := &model.User{}
|
||||
valid := validator.NewValidator(8, 32, 1)
|
||||
err := json.NewDecoder(res.Body).Decode(users)
|
||||
if err != nil {
|
||||
r.logger.Error(err)
|
||||
}
|
||||
user, err := r.db.User().FindByLogin(users.Login)
|
||||
if err != nil {
|
||||
r.logger.Error(err)
|
||||
}
|
||||
if user.Login != "" {
|
||||
io.WriteString(w, `{"data":"Такой Логин уже занят попробуйте придумать другой"}`)
|
||||
return
|
||||
}
|
||||
user, err = r.db.User().FindByEmail(users.Email)
|
||||
if err != nil {
|
||||
r.logger.Error(err)
|
||||
return
|
||||
}
|
||||
if user.Email != "" {
|
||||
io.WriteString(w, `{"data":"Такой email уже используется другим пользователем"}`)
|
||||
return
|
||||
}
|
||||
_, err = valid.CheckValid(users.Password)
|
||||
if err != nil {
|
||||
io.WriteString(w, fmt.Sprintf(`{"data":"%s"}`, err))
|
||||
return
|
||||
}
|
||||
next(w, res.WithContext(context.WithValue(res.Context(), ContextKeyUser, users)))
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user