Skip to content

feat: finally correct auth #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
weebatt merged 1 commit into from
Jun 2, 2025
Merged

feat: finally correct auth #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions auth-service/internal/handlers/handlers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,12 @@ import (
"auth-service/pkg/logger"
"context"
"database/sql"
"github.com/golang-jwt/jwt/v5"
"github.com/labstack/echo/v4"
"net/http"
"strings"
"time"

"github.com/golang-jwt/jwt/v5"
"github.com/labstack/echo/v4"
)

type AuthHandler struct {
Expand Down
1 change: 1 addition & 0 deletions frontend/dist/assets/index-BDHvTP9z.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

33 changes: 33 additions & 0 deletions frontend/dist/assets/index-DwHhpmZH.js
View file
Open in desktop

Large diffs are not rendered by default.

Binary file added frontend/dist/favicon.ico
View file
Open in desktop
Binary file not shown.
14 changes: 14 additions & 0 deletions frontend/dist/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<!DOCTYPE html>
<html lang="">
<head>
<meta charset="UTF-8">
<link rel="icon" href="/favicon.ico">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Vite App</title>
<script type="module" crossorigin src="/assets/index-DwHhpmZH.js"></script>
<link rel="stylesheet" crossorigin href="/assets/index-BDHvTP9z.css">
</head>
<body>
<div id="app"></div>
</body>
</html>
15 changes: 6 additions & 9 deletions frontend/src/services/authService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const authService = {

if (!response.ok) {
const err = await response.json();
throw new Error(err.error || 'Ошибка входа');
throw new Error(err.error);
}

const data = await response.json();
Expand Down Expand Up @@ -40,20 +40,17 @@ const authService = {

if (!response.ok) {
const err = await response.json();
throw new Error(err.error || 'Ошибка регистрации');
throw new Error(err.error);
}

const data = await response.json();
console.log('Register response data:', data);

const user = data.user ?? data.data?.user;
const token = data.token ?? data.data?.token;
const message = data.message ?? data.data?.message;
const user_id = data.user_id ?? data.data?.user_id;
const ok = response.ok;

if (!token) {
throw new Error('Response missing user or token');
}

return { user, token };
return { message, user_id, ok };
}
};

Expand Down
23 changes: 5 additions & 18 deletions frontend/src/store/auth.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,18 +68,15 @@ const actions = {
const response = await authService.register(name, email, password);
console.log('Register response:', response);

if (!response || !response.token) {
throw new Error('Invalid response from server: missing user or token');
if (!response.ok) {
throw new Error('Invalid response from server');
}

state.user = response.user;
state.token = response.token;
state.isAuthenticated = true;

localStorage.setItem('token', response.token);
state.message = response.message;
state.user_id = response.user_id;

router.push('/');
return response.user;
return response.message;
} catch (error) {
console.error('Register error:', error);
state.error = error.message || 'Registration failed';
Expand All @@ -89,16 +86,6 @@ const actions = {
}
},

// logout() {
// state.user = null;
// state.token = null;
// state.isAuthenticated = false;
// localStorage.removeItem('user');
// localStorage.removeItem('token');
// localStorage.removeItem('rememberMe');
// router.push('/login');
// },

clearError() {
state.error = null;
}
Expand Down
Loading