diff --git a/api/v1/auth/auth.go b/api/v1/auth/auth.go index cd819f48..68d21d91 100644 --- a/api/v1/auth/auth.go +++ b/api/v1/auth/auth.go @@ -33,11 +33,9 @@ const ( // 2. The access token has already expired, we refresh the token so that the ongoing request can pass through. CookieExpDuration = refreshTokenDuration - 1*time.Minute // AccessTokenCookieName is the cookie name of access token. - AccessTokenCookieName = "access-token" + AccessTokenCookieName = "memos.access-token" // RefreshTokenCookieName is the cookie name of refresh token. - RefreshTokenCookieName = "refresh-token" - // UserIDCookieName is the cookie name of user ID. - UserIDCookieName = "user" + RefreshTokenCookieName = "memos.refresh-token" ) type claimsMessage struct { diff --git a/api/v1/system.go b/api/v1/system.go index 67dd0f88..4d6b2da9 100644 --- a/api/v1/system.go +++ b/api/v1/system.go @@ -73,7 +73,7 @@ func (s *APIV1Service) registerSystemRoutes(g *echo.Group) { return echo.NewHTTPError(http.StatusInternalServerError, "Failed to find host user").SetInternal(err) } if hostUser != nil { - systemStatus.Host = converUserFromStore(hostUser) + systemStatus.Host = convertUserFromStore(hostUser) // data desensitize systemStatus.Host.OpenID = "" systemStatus.Host.Email = "" diff --git a/api/v1/user.go b/api/v1/user.go index 623be1c5..bb04e090 100644 --- a/api/v1/user.go +++ b/api/v1/user.go @@ -177,7 +177,7 @@ func (s *APIV1Service) registerUserRoutes(g *echo.Group) { return echo.NewHTTPError(http.StatusInternalServerError, "Failed to create user").SetInternal(err) } - userMessage := converUserFromStore(user) + userMessage := convertUserFromStore(user) if err := s.createUserCreateActivity(c, userMessage); err != nil { return echo.NewHTTPError(http.StatusInternalServerError, "Failed to create activity").SetInternal(err) } @@ -193,7 +193,7 @@ func (s *APIV1Service) registerUserRoutes(g *echo.Group) { userMessageList := make([]*User, 0, len(list)) for _, user := range list { - userMessage := converUserFromStore(user) + userMessage := convertUserFromStore(user) // data desensitize userMessage.OpenID = "" userMessage.Email = "" @@ -228,7 +228,7 @@ func (s *APIV1Service) registerUserRoutes(g *echo.Group) { for _, userSetting := range list { userSettingList = append(userSettingList, convertUserSettingFromStore(userSetting)) } - userMessage := converUserFromStore(user) + userMessage := convertUserFromStore(user) userMessage.UserSettingList = userSettingList return c.JSON(http.StatusOK, userMessage) }) @@ -248,7 +248,7 @@ func (s *APIV1Service) registerUserRoutes(g *echo.Group) { return echo.NewHTTPError(http.StatusNotFound, "User not found") } - userMessage := converUserFromStore(user) + userMessage := convertUserFromStore(user) // data desensitize userMessage.OpenID = "" userMessage.Email = "" @@ -334,7 +334,7 @@ func (s *APIV1Service) registerUserRoutes(g *echo.Group) { for _, userSetting := range list { userSettingList = append(userSettingList, convertUserSettingFromStore(userSetting)) } - userMessage := converUserFromStore(user) + userMessage := convertUserFromStore(user) userMessage.UserSettingList = userSettingList return c.JSON(http.StatusOK, userMessage) }) @@ -395,7 +395,7 @@ func (s *APIV1Service) createUserCreateActivity(c echo.Context, user *User) erro return err } -func converUserFromStore(user *store.User) *User { +func convertUserFromStore(user *store.User) *User { return &User{ ID: user.ID, RowStatus: RowStatus(user.RowStatus), diff --git a/test/server/server.go b/test/server/server.go index d2c1b217..ae48f7d9 100644 --- a/test/server/server.go +++ b/test/server/server.go @@ -11,6 +11,7 @@ import ( "time" "github.com/pkg/errors" + "github.com/usememos/memos/api/v1/auth" "github.com/usememos/memos/server" "github.com/usememos/memos/server/profile" "github.com/usememos/memos/store" @@ -132,7 +133,7 @@ func (s *TestingServer) request(method, uri string, body io.Reader, params, head h := resp.Header.Get("Set-Cookie") parts := strings.Split(h, "; ") for _, p := range parts { - if strings.HasPrefix(p, "access-token=") { + if strings.HasPrefix(p, fmt.Sprintf("%s=", auth.AccessTokenCookieName)) { cookie = p break } diff --git a/web/src/components/DemoBanner.tsx b/web/src/components/DemoBanner.tsx index 4f44bc9a..0606906e 100644 --- a/web/src/components/DemoBanner.tsx +++ b/web/src/components/DemoBanner.tsx @@ -23,7 +23,7 @@ const DemoBanner: React.FC = () => { if (!state.show) return null; return ( -
+
✨ A lightweight, self-hosted memo hub. Open Source and Free forever. ✨ diff --git a/web/src/pages/Auth.tsx b/web/src/pages/Auth.tsx index da63d78d..0d88ef6c 100644 --- a/web/src/pages/Auth.tsx +++ b/web/src/pages/Auth.tsx @@ -17,8 +17,8 @@ const Auth = () => { const actionBtnLoadingState = useLoading(false); const { appearance, locale, systemStatus } = globalStore.state; const mode = systemStatus.profile.mode; - const [username, setUsername] = useState(mode === "demo" ? "demohero" : ""); - const [password, setPassword] = useState(mode === "demo" ? "secret" : ""); + const [username, setUsername] = useState(""); + const [password, setPassword] = useState(""); const [identityProviderList, setIdentityProviderList] = useState([]); useEffect(() => { @@ -30,6 +30,13 @@ const Auth = () => { fetchIdentityProviderList(); }, []); + useEffect(() => { + if (mode === "demo") { + setUsername("demohero"); + setPassword("secret"); + } + }, [mode]); + const handleUsernameInputChanged = (e: React.ChangeEvent) => { const text = e.target.value as string; setUsername(text); @@ -51,13 +58,13 @@ const Auth = () => { const handleFormSubmit = (e: React.FormEvent) => { e.preventDefault(); if (systemStatus?.host) { - handleSignInBtnClick(); + handleSignInButtonClick(); } else { - handleSignUpBtnsClick(); + handleSignUpButtonClick(); } }; - const handleSignInBtnClick = async () => { + const handleSignInButtonClick = async () => { if (username === "" || password === "") { return; } @@ -82,7 +89,7 @@ const Auth = () => { actionBtnLoadingState.setFinish(); }; - const handleSignUpBtnsClick = async () => { + const handleSignUpButtonClick = async () => { if (username === "" || password === "") { return; } @@ -170,40 +177,26 @@ const Auth = () => {
- {systemStatus?.host ? ( - <> - {actionBtnLoadingState.isLoading && } - {systemStatus?.allowSignUp && ( - <> - - / - - )} - - - ) : ( + {actionBtnLoadingState.isLoading && } + {systemStatus?.allowSignUp && ( <> + / )} +
{identityProviderList.length > 0 && (