diff --git a/api/v1/jwt.go b/api/v1/jwt.go index 68a8893e..7aa940d3 100644 --- a/api/v1/jwt.go +++ b/api/v1/jwt.go @@ -60,7 +60,7 @@ func JWTMiddleware(server *APIV1Service, next echo.HandlerFunc, secret string) e } // Skip validation for server status endpoints. - if util.HasPrefixes(path, "/api/v1/ping", "/api/v1/idp", "/api/v1/status", "/api/v1/user") && path != "/api/v1/user/me" && method == http.MethodGet { + if util.HasPrefixes(path, "/api/v1/ping", "/api/v1/idp", "/api/v1/status", "/api/v1/user") && path != "/api/v1/user/me" && path != "/api/v1/user" && method == http.MethodGet { return next(c) } diff --git a/server/server.go b/server/server.go index 256cb0c1..12a87d42 100644 --- a/server/server.go +++ b/server/server.go @@ -61,8 +61,6 @@ func NewServer(ctx context.Context, profile *profile.Profile, store *store.Store `"status":${status},"error":"${error}"}` + "\n", })) - e.Use(middleware.Gzip()) - e.Use(middleware.CORSWithConfig(middleware.CORSConfig{ Skipper: grpcRequestSkipper, AllowOrigins: []string{"*"}, diff --git a/web/src/components/Settings/AccessTokenSection.tsx b/web/src/components/Settings/AccessTokenSection.tsx index a8c72dde..2e09c2a3 100644 --- a/web/src/components/Settings/AccessTokenSection.tsx +++ b/web/src/components/Settings/AccessTokenSection.tsx @@ -4,7 +4,7 @@ import { useEffect, useState } from "react"; import { toast } from "react-hot-toast"; import { userServiceClient } from "@/grpcweb"; import useCurrentUser from "@/hooks/useCurrentUser"; -import { extractUsernameFromName } from "@/store/v1"; +import { UserNamePrefix, extractUsernameFromName } from "@/store/v1"; import { UserAccessToken } from "@/types/proto/api/v2/user_service"; import { useTranslate } from "@/utils/i18n"; import showCreateAccessTokenDialog from "../CreateAccessTokenDialog"; @@ -13,7 +13,7 @@ import Icon from "../Icon"; import LearnMore from "../LearnMore"; const listAccessTokens = async (username: string) => { - const { accessTokens } = await userServiceClient.listUserAccessTokens({ name: `${UserAccessToken}${username}` }); + const { accessTokens } = await userServiceClient.listUserAccessTokens({ name: `${UserNamePrefix}${username}` }); return accessTokens; };