update
This commit is contained in:
@@ -7,6 +7,7 @@ import (
|
||||
|
||||
"management/internal/erpserver/model/form"
|
||||
v1 "management/internal/erpserver/service/v1"
|
||||
authv1 "management/internal/erpserver/service/v1/auth"
|
||||
"management/internal/erpserver/templ/auth"
|
||||
"management/internal/pkg/binding"
|
||||
"management/internal/pkg/mid"
|
||||
@@ -22,6 +23,7 @@ type app struct {
|
||||
render render.Renderer
|
||||
captchaService v1.CaptchaService
|
||||
userService v1.UserService
|
||||
authService *authv1.Auth
|
||||
}
|
||||
|
||||
func newApp(
|
||||
@@ -30,6 +32,7 @@ func newApp(
|
||||
render render.Renderer,
|
||||
captchaService v1.CaptchaService,
|
||||
userService v1.UserService,
|
||||
authService *authv1.Auth,
|
||||
) *app {
|
||||
return &app{
|
||||
log: log,
|
||||
@@ -37,6 +40,7 @@ func newApp(
|
||||
render: render,
|
||||
captchaService: captchaService,
|
||||
userService: userService,
|
||||
authService: authService,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -75,13 +79,16 @@ func (a *app) login(w http.ResponseWriter, r *http.Request) {
|
||||
}
|
||||
|
||||
req = req.SetAttributes(r)
|
||||
err := a.userService.Login(ctx, &req)
|
||||
//err := a.userService.Login(ctx, &req)
|
||||
risk, err := a.authService.Authenticate(ctx, req)
|
||||
if err != nil {
|
||||
log.Println(err)
|
||||
a.render.JSONErr(w, err.Error())
|
||||
return
|
||||
}
|
||||
|
||||
log.Println(risk)
|
||||
|
||||
a.render.JSONOk(w, "login successfully")
|
||||
default:
|
||||
http.Error(w, "Method Not Allowed", http.StatusMethodNotAllowed)
|
||||
|
||||
@@ -2,6 +2,7 @@ package auth
|
||||
|
||||
import (
|
||||
v1 "management/internal/erpserver/service/v1"
|
||||
"management/internal/erpserver/service/v1/auth"
|
||||
"management/internal/pkg/mid"
|
||||
"management/internal/pkg/render"
|
||||
"management/internal/pkg/session"
|
||||
@@ -15,12 +16,13 @@ type Config struct {
|
||||
Sm session.Manager
|
||||
Render render.Renderer
|
||||
CaptchaService v1.CaptchaService
|
||||
AuthService *auth.Auth
|
||||
UserService v1.UserService
|
||||
MenuService v1.MenuService
|
||||
}
|
||||
|
||||
func Routes(r chi.Router, cfg Config) {
|
||||
app := newApp(cfg.Log, cfg.Sm, cfg.Render, cfg.CaptchaService, cfg.UserService)
|
||||
app := newApp(cfg.Log, cfg.Sm, cfg.Render, cfg.CaptchaService, cfg.UserService, cfg.AuthService)
|
||||
|
||||
r.Get("/", app.login)
|
||||
r.Post("/login", app.login)
|
||||
|
||||
Reference in New Issue
Block a user