Remnants/AdministrationItDepartmens
1
0
Fork 0
mirror of https://gitlab.com/MoonTestUse1/AdministrationItDepartmens.git synced 2025-08-14 00:25:46 +02:00
Code Activity

фикс авторизации

Browse Source
This commit is contained in:
MoonTestUse1
2025-01-03 20:34:37 +06:00
parent 3ca0f9b247
commit 921cc4421f
4 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
backend/app/routers/auth.py
View File

@@ -11,9 +11,9 @@ from ..utils.auth import verify_password
from ..utils.jwt import create_and_save_token from ..utils.jwt import create_and_save_token
router = APIRouter() router = APIRouter()
oauth2_scheme = OAuth2PasswordBearer(tokenUrl="token") oauth2_scheme = OAuth2PasswordBearer(tokenUrl="login")
@router.post("/token", response_model=Token) @router.post("/login", response_model=Token)
async def login_for_access_token( async def login_for_access_token(
form_data: OAuth2PasswordRequestForm = Depends(), form_data: OAuth2PasswordRequestForm = Depends(),
db: Session = Depends(get_db) db: Session = Depends(get_db)
@@ -35,7 +35,7 @@ async def login_for_access_token(
"token_type": "bearer" "token_type": "bearer"
} }
@router.post("/admin/token", response_model=Token) @router.post("/admin/login", response_model=Token)
async def admin_login( async def admin_login(
form_data: OAuth2PasswordRequestForm = Depends(), form_data: OAuth2PasswordRequestForm = Depends(),
db: Session = Depends(get_db) db: Session = Depends(get_db)

20
frontend/src/stores/auth.ts
View File

@@ -18,12 +18,13 @@ export const useAuthStore = defineStore('auth', () => {
async function login(lastName: string, password: string): Promise<boolean> { async function login(lastName: string, password: string): Promise<boolean> {
try { try {
const formData = new FormData();
formData.append('username', lastName);
formData.append('password', password);
const response = await fetch('/api/auth/login', { const response = await fetch('/api/auth/login', {
method: 'POST', method: 'POST',
headers: { body: formData
'Content-Type': 'application/json',
},
body: JSON.stringify({ lastName, password }),
}); });
if (!response.ok) { if (!response.ok) {
@@ -41,12 +42,13 @@ export const useAuthStore = defineStore('auth', () => {
async function adminLogin(username: string, password: string): Promise<boolean> { async function adminLogin(username: string, password: string): Promise<boolean> {
try { try {
const response = await fetch('/api/auth/admin', { const formData = new FormData();
formData.append('username', username);
formData.append('password', password);
const response = await fetch('/api/auth/admin/login', {
method: 'POST', method: 'POST',
headers: { body: formData
'Content-Type': 'application/json',
},
body: JSON.stringify({ username, password }),
}); });
if (!response.ok) { if (!response.ok) {

9
frontend/src/views/LoginView.vue
View File

@@ -97,10 +97,11 @@ const handleLogin = async () => {
try { try {
console.log('Отправка запроса на авторизацию...') console.log('Отправка запроса на авторизацию...')
const response = await axios.post('/api/auth/login', { const formData = new FormData()
last_name: lastName.value, formData.append('username', lastName.value)
password: password.value formData.append('password', password.value)
})
const response = await axios.post('/api/auth/login', formData)
console.log('Ответ от сервера:', response.data) console.log('Ответ от сервера:', response.data)
// Сохраняем данные сотрудника и токен // Сохраняем данные сотрудника и токен

9
frontend/src/views/admin/AdminLoginView.vue
View File

@@ -60,10 +60,11 @@ export default {
this.isLoading = true this.isLoading = true
try { try {
const response = await axios.post('/api/auth/admin/login', { const formData = new FormData()
username: this.username, formData.append('username', this.username)
password: this.password formData.append('password', this.password)
})
const response = await axios.post('/api/auth/admin/login', formData)
localStorage.setItem('admin_token', response.data.access_token) localStorage.setItem('admin_token', response.data.access_token)
this.$router.push('/admin/dashboard') this.$router.push('/admin/dashboard')