mirror of
https://github.com/wgh136/nysoure.git
synced 2025-09-27 12:17:24 +00:00
Add user information retrieval endpoint and update token management
This commit is contained in:
@@ -63,12 +63,16 @@ class Network {
|
|||||||
if (!app.token) {
|
if (!app.token) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
const res = await this.getUserInfo(app.user!.username)
|
const res = await this.getMe()
|
||||||
if (!res.success && res.message.includes("Invalid token")) {
|
if (!res.success && res.message.includes("Invalid token")) {
|
||||||
app.token = null;
|
app.token = null;
|
||||||
app.user = null;
|
app.user = null;
|
||||||
app.saveData();
|
app.saveData();
|
||||||
window.location.reload();
|
window.location.reload();
|
||||||
|
} else {
|
||||||
|
app.user = res.data!;
|
||||||
|
app.token = res.data!.token;
|
||||||
|
app.saveData();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -105,6 +109,19 @@ class Network {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async getMe(): Promise<Response<UserWithToken>> {
|
||||||
|
try {
|
||||||
|
const response = await axios.get(`${this.apiBaseUrl}/user/me`)
|
||||||
|
return response.data
|
||||||
|
} catch (e: any) {
|
||||||
|
console.error(e)
|
||||||
|
return {
|
||||||
|
success: false,
|
||||||
|
message: e.toString(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
async getUserInfo(username: string): Promise<Response<User>> {
|
async getUserInfo(username: string): Promise<Response<User>> {
|
||||||
try {
|
try {
|
||||||
const response = await axios.get(`${this.apiBaseUrl}/user/info`, {
|
const response = await axios.get(`${this.apiBaseUrl}/user/info`, {
|
||||||
|
@@ -318,6 +318,23 @@ func handleSetUserBio(c fiber.Ctx) error {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// handleGetMe retrieves the current user's information and refreshes the token
|
||||||
|
func handleGetMe(c fiber.Ctx) error {
|
||||||
|
uid, ok := c.Locals("uid").(uint)
|
||||||
|
if !ok {
|
||||||
|
return model.NewUnAuthorizedError("Unauthorized")
|
||||||
|
}
|
||||||
|
user, err := service.GetMe(uid)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return c.Status(fiber.StatusOK).JSON(model.Response[model.UserViewWithToken]{
|
||||||
|
Success: true,
|
||||||
|
Data: user,
|
||||||
|
Message: "User information retrieved successfully",
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
func AddUserRoutes(r fiber.Router) {
|
func AddUserRoutes(r fiber.Router) {
|
||||||
u := r.Group("user")
|
u := r.Group("user")
|
||||||
u.Post("/register", handleUserRegister)
|
u.Post("/register", handleUserRegister)
|
||||||
@@ -333,4 +350,5 @@ func AddUserRoutes(r fiber.Router) {
|
|||||||
u.Get("/info", handleGetUserInfo)
|
u.Get("/info", handleGetUserInfo)
|
||||||
u.Post("/username", handleChangeUsername)
|
u.Post("/username", handleChangeUsername)
|
||||||
u.Post("/bio", handleSetUserBio)
|
u.Post("/bio", handleSetUserBio)
|
||||||
|
u.Get("/me", handleGetMe)
|
||||||
}
|
}
|
||||||
|
@@ -307,3 +307,15 @@ func SetUserBio(uid uint, bio string) (model.UserView, error) {
|
|||||||
}
|
}
|
||||||
return user.ToView(), nil
|
return user.ToView(), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func GetMe(uid uint) (model.UserViewWithToken, error) {
|
||||||
|
user, err := dao.GetUserByID(uid)
|
||||||
|
if err != nil {
|
||||||
|
return model.UserViewWithToken{}, err
|
||||||
|
}
|
||||||
|
token, err := utils.GenerateToken(user.ID)
|
||||||
|
if err != nil {
|
||||||
|
return model.UserViewWithToken{}, err
|
||||||
|
}
|
||||||
|
return user.ToView().WithToken(token), nil
|
||||||
|
}
|
||||||
|
Reference in New Issue
Block a user