mirror of
https://github.com/usememos/memos.git
synced 2025-06-05 22:09:59 +02:00
fix: invalid username checks
This commit is contained in:
@ -20,6 +20,10 @@ import (
|
|||||||
"github.com/usememos/memos/store"
|
"github.com/usememos/memos/store"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
var (
|
||||||
|
usernameMatcher = regexp.MustCompile("^[a-z]([a-z0-9-]{2,30}[a-z0-9])?$")
|
||||||
|
)
|
||||||
|
|
||||||
type SignIn struct {
|
type SignIn struct {
|
||||||
Username string `json:"username"`
|
Username string `json:"username"`
|
||||||
Password string `json:"password"`
|
Password string `json:"password"`
|
||||||
@ -279,6 +283,9 @@ func (s *APIV1Service) SignUp(c echo.Context) error {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return echo.NewHTTPError(http.StatusBadRequest, "Failed to find users").SetInternal(err)
|
return echo.NewHTTPError(http.StatusBadRequest, "Failed to find users").SetInternal(err)
|
||||||
}
|
}
|
||||||
|
if !usernameMatcher.MatchString(signup.Username) {
|
||||||
|
return echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("Invalid username %s", signup.Username)).SetInternal(err)
|
||||||
|
}
|
||||||
|
|
||||||
userCreate := &store.User{
|
userCreate := &store.User{
|
||||||
Username: signup.Username,
|
Username: signup.Username,
|
||||||
|
@ -140,6 +140,9 @@ func (s *APIV1Service) CreateUser(c echo.Context) error {
|
|||||||
if err := userCreate.Validate(); err != nil {
|
if err := userCreate.Validate(); err != nil {
|
||||||
return echo.NewHTTPError(http.StatusBadRequest, "Invalid user create format").SetInternal(err)
|
return echo.NewHTTPError(http.StatusBadRequest, "Invalid user create format").SetInternal(err)
|
||||||
}
|
}
|
||||||
|
if !usernameMatcher.MatchString(userCreate.Username) {
|
||||||
|
return echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("Invalid username %s", userCreate.Username)).SetInternal(err)
|
||||||
|
}
|
||||||
// Disallow host user to be created.
|
// Disallow host user to be created.
|
||||||
if userCreate.Role == RoleHost {
|
if userCreate.Role == RoleHost {
|
||||||
return echo.NewHTTPError(http.StatusForbidden, "Could not create host user")
|
return echo.NewHTTPError(http.StatusForbidden, "Could not create host user")
|
||||||
@ -362,6 +365,9 @@ func (s *APIV1Service) UpdateUser(c echo.Context) error {
|
|||||||
userUpdate.RowStatus = &rowStatus
|
userUpdate.RowStatus = &rowStatus
|
||||||
}
|
}
|
||||||
if request.Username != nil {
|
if request.Username != nil {
|
||||||
|
if !usernameMatcher.MatchString(*request.Username) {
|
||||||
|
return echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("Invalid username %s", *request.Username)).SetInternal(err)
|
||||||
|
}
|
||||||
userUpdate.Username = request.Username
|
userUpdate.Username = request.Username
|
||||||
}
|
}
|
||||||
if request.Email != nil {
|
if request.Email != nil {
|
||||||
|
@ -3,6 +3,7 @@ package v2
|
|||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"net/http"
|
"net/http"
|
||||||
|
"regexp"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/golang-jwt/jwt/v4"
|
"github.com/golang-jwt/jwt/v4"
|
||||||
@ -20,6 +21,10 @@ import (
|
|||||||
"github.com/usememos/memos/store"
|
"github.com/usememos/memos/store"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
var (
|
||||||
|
usernameMatcher = regexp.MustCompile("^[a-z]([a-z0-9-]{2,30}[a-z0-9])?$")
|
||||||
|
)
|
||||||
|
|
||||||
type UserService struct {
|
type UserService struct {
|
||||||
apiv2pb.UnimplementedUserServiceServer
|
apiv2pb.UnimplementedUserServiceServer
|
||||||
|
|
||||||
@ -72,6 +77,9 @@ func (s *UserService) UpdateUser(ctx context.Context, request *apiv2pb.UpdateUse
|
|||||||
}
|
}
|
||||||
for _, path := range request.UpdateMask {
|
for _, path := range request.UpdateMask {
|
||||||
if path == "username" {
|
if path == "username" {
|
||||||
|
if !usernameMatcher.MatchString(request.User.Username) {
|
||||||
|
return nil, status.Errorf(codes.InvalidArgument, "invalid username: %s", request.User.Username)
|
||||||
|
}
|
||||||
update.Username = &request.User.Username
|
update.Username = &request.User.Username
|
||||||
} else if path == "nickname" {
|
} else if path == "nickname" {
|
||||||
update.Nickname = &request.User.Nickname
|
update.Nickname = &request.User.Nickname
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
import { Button, Input, Radio, RadioGroup } from "@mui/joy";
|
import { Button, Input, Radio, RadioGroup } from "@mui/joy";
|
||||||
import axios from "axios";
|
|
||||||
import React, { useState } from "react";
|
import React, { useState } from "react";
|
||||||
import { toast } from "react-hot-toast";
|
import { toast } from "react-hot-toast";
|
||||||
|
import { userServiceClient } from "@/grpcweb";
|
||||||
import useCurrentUser from "@/hooks/useCurrentUser";
|
import useCurrentUser from "@/hooks/useCurrentUser";
|
||||||
import useLoading from "@/hooks/useLoading";
|
import useLoading from "@/hooks/useLoading";
|
||||||
import { useTranslate } from "@/utils/i18n";
|
import { useTranslate } from "@/utils/i18n";
|
||||||
@ -68,9 +68,12 @@ const CreateAccessTokenDialog: React.FC<Props> = (props: Props) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
await axios.post(`/api/v2/users/${currentUser.id}/access_tokens`, {
|
await userServiceClient.createUserAccessToken({
|
||||||
description: state.description,
|
username: currentUser.username,
|
||||||
expiresAt: new Date(Date.now() + state.expiration * 1000),
|
userAccessToken: {
|
||||||
|
description: state.description,
|
||||||
|
expiresAt: new Date(Date.now() + state.expiration * 1000),
|
||||||
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
onConfirm();
|
onConfirm();
|
||||||
|
@ -1,7 +1,8 @@
|
|||||||
import classNames from "classnames";
|
import classNames from "classnames";
|
||||||
import { useEffect } from "react";
|
import { useEffect } from "react";
|
||||||
import { NavLink, useLocation } from "react-router-dom";
|
import { NavLink, useLocation } from "react-router-dom";
|
||||||
import { useLayoutStore, useUserStore } from "@/store/module";
|
import useCurrentUser from "@/hooks/useCurrentUser";
|
||||||
|
import { useLayoutStore } from "@/store/module";
|
||||||
import { useTranslate } from "@/utils/i18n";
|
import { useTranslate } from "@/utils/i18n";
|
||||||
import { resolution } from "@/utils/layout";
|
import { resolution } from "@/utils/layout";
|
||||||
import Icon from "./Icon";
|
import Icon from "./Icon";
|
||||||
@ -17,10 +18,9 @@ interface NavLinkItem {
|
|||||||
const Header = () => {
|
const Header = () => {
|
||||||
const t = useTranslate();
|
const t = useTranslate();
|
||||||
const location = useLocation();
|
const location = useLocation();
|
||||||
const userStore = useUserStore();
|
|
||||||
const layoutStore = useLayoutStore();
|
const layoutStore = useLayoutStore();
|
||||||
const showHeader = layoutStore.state.showHeader;
|
const showHeader = layoutStore.state.showHeader;
|
||||||
const isVisitorMode = userStore.isVisitorMode() && !userStore.state.user;
|
const user = useCurrentUser();
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const handleWindowResize = () => {
|
const handleWindowResize = () => {
|
||||||
@ -77,7 +77,7 @@ const Header = () => {
|
|||||||
icon: <Icon.LogIn className="mr-3 w-6 h-auto opacity-70" />,
|
icon: <Icon.LogIn className="mr-3 w-6 h-auto opacity-70" />,
|
||||||
};
|
};
|
||||||
|
|
||||||
const navLinks: NavLinkItem[] = !isVisitorMode
|
const navLinks: NavLinkItem[] = user
|
||||||
? [homeNavLink, dailyReviewNavLink, resourcesNavLink, exploreNavLink, archivedNavLink, settingNavLink]
|
? [homeNavLink, dailyReviewNavLink, resourcesNavLink, exploreNavLink, archivedNavLink, settingNavLink]
|
||||||
: [exploreNavLink, authNavLink];
|
: [exploreNavLink, authNavLink];
|
||||||
|
|
||||||
|
@ -1,11 +1,10 @@
|
|||||||
import { useLayoutStore, useUserStore } from "../store/module";
|
import { useLayoutStore } from "../store/module";
|
||||||
import SearchBar from "./SearchBar";
|
import SearchBar from "./SearchBar";
|
||||||
import TagList from "./TagList";
|
import TagList from "./TagList";
|
||||||
import UsageHeatMap from "./UsageHeatMap";
|
import UsageHeatMap from "./UsageHeatMap";
|
||||||
|
|
||||||
const HomeSidebar = () => {
|
const HomeSidebar = () => {
|
||||||
const layoutStore = useLayoutStore();
|
const layoutStore = useLayoutStore();
|
||||||
const userStore = useUserStore();
|
|
||||||
const showHomeSidebar = layoutStore.state.showHomeSidebar;
|
const showHomeSidebar = layoutStore.state.showHomeSidebar;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
@ -29,11 +28,7 @@ const HomeSidebar = () => {
|
|||||||
<SearchBar />
|
<SearchBar />
|
||||||
</div>
|
</div>
|
||||||
<UsageHeatMap />
|
<UsageHeatMap />
|
||||||
{!userStore.isVisitorMode() && (
|
<TagList />
|
||||||
<>
|
|
||||||
<TagList />
|
|
||||||
</>
|
|
||||||
)}
|
|
||||||
</aside>
|
</aside>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
@ -5,6 +5,7 @@ import { useTranslation } from "react-i18next";
|
|||||||
import { Link } from "react-router-dom";
|
import { Link } from "react-router-dom";
|
||||||
import { UNKNOWN_ID } from "@/helpers/consts";
|
import { UNKNOWN_ID } from "@/helpers/consts";
|
||||||
import { getRelativeTimeString } from "@/helpers/datetime";
|
import { getRelativeTimeString } from "@/helpers/datetime";
|
||||||
|
import useCurrentUser from "@/hooks/useCurrentUser";
|
||||||
import { useFilterStore, useMemoStore, useUserStore } from "@/store/module";
|
import { useFilterStore, useMemoStore, useUserStore } from "@/store/module";
|
||||||
import { useUserV1Store } from "@/store/v1";
|
import { useUserV1Store } from "@/store/v1";
|
||||||
import { useTranslate } from "@/utils/i18n";
|
import { useTranslate } from "@/utils/i18n";
|
||||||
@ -28,16 +29,17 @@ interface Props {
|
|||||||
|
|
||||||
const Memo: React.FC<Props> = (props: Props) => {
|
const Memo: React.FC<Props> = (props: Props) => {
|
||||||
const { memo, lazyRendering } = props;
|
const { memo, lazyRendering } = props;
|
||||||
const { i18n } = useTranslation();
|
|
||||||
const t = useTranslate();
|
const t = useTranslate();
|
||||||
|
const { i18n } = useTranslation();
|
||||||
const filterStore = useFilterStore();
|
const filterStore = useFilterStore();
|
||||||
const userStore = useUserStore();
|
const userStore = useUserStore();
|
||||||
const memoStore = useMemoStore();
|
const memoStore = useMemoStore();
|
||||||
const userV1Store = useUserV1Store();
|
const userV1Store = useUserV1Store();
|
||||||
|
const user = useCurrentUser();
|
||||||
const [shouldRender, setShouldRender] = useState<boolean>(lazyRendering ? false : true);
|
const [shouldRender, setShouldRender] = useState<boolean>(lazyRendering ? false : true);
|
||||||
const [displayTime, setDisplayTime] = useState<string>(getRelativeTimeString(memo.displayTs));
|
const [displayTime, setDisplayTime] = useState<string>(getRelativeTimeString(memo.displayTs));
|
||||||
const memoContainerRef = useRef<HTMLDivElement>(null);
|
const memoContainerRef = useRef<HTMLDivElement>(null);
|
||||||
const readonly = userStore.isVisitorMode() || userStore.getCurrentUsername() !== memo.creatorUsername;
|
const readonly = memo.creatorUsername !== user?.username;
|
||||||
const creator = userV1Store.getUserByUsername(memo.creatorUsername);
|
const creator = userV1Store.getUserByUsername(memo.creatorUsername);
|
||||||
|
|
||||||
// Prepare memo creator.
|
// Prepare memo creator.
|
||||||
@ -227,7 +229,7 @@ const Memo: React.FC<Props> = (props: Props) => {
|
|||||||
<div className="w-full max-w-[calc(100%-20px)] flex flex-row justify-start items-center mr-1">
|
<div className="w-full max-w-[calc(100%-20px)] flex flex-row justify-start items-center mr-1">
|
||||||
{creator && (
|
{creator && (
|
||||||
<>
|
<>
|
||||||
<Link className="flex flex-row justify-start items-center" to={`/u/${memo.creatorUsername}`}>
|
<Link className="flex flex-row justify-start items-center" to={`/u/${encodeURIComponent(memo.creatorUsername)}`}>
|
||||||
<UserAvatar className="!w-5 !h-auto mr-1" avatarUrl={creator.avatarUrl} />
|
<UserAvatar className="!w-5 !h-auto mr-1" avatarUrl={creator.avatarUrl} />
|
||||||
<span className="text-sm text-gray-600 max-w-[8em] truncate dark:text-gray-400">{creator.nickname}</span>
|
<span className="text-sm text-gray-600 max-w-[8em] truncate dark:text-gray-400">{creator.nickname}</span>
|
||||||
</Link>
|
</Link>
|
||||||
|
@ -1,9 +1,11 @@
|
|||||||
import { useEffect, useRef, useState } from "react";
|
import { useEffect, useState } from "react";
|
||||||
import { toast } from "react-hot-toast";
|
import { toast } from "react-hot-toast";
|
||||||
|
import { useParams } from "react-router-dom";
|
||||||
import { DEFAULT_MEMO_LIMIT } from "@/helpers/consts";
|
import { DEFAULT_MEMO_LIMIT } from "@/helpers/consts";
|
||||||
import { getTimeStampByDate } from "@/helpers/datetime";
|
import { getTimeStampByDate } from "@/helpers/datetime";
|
||||||
|
import useCurrentUser from "@/hooks/useCurrentUser";
|
||||||
import { TAG_REG } from "@/labs/marked/parser";
|
import { TAG_REG } from "@/labs/marked/parser";
|
||||||
import { useFilterStore, useMemoStore, useUserStore } from "@/store/module";
|
import { useFilterStore, useMemoStore } from "@/store/module";
|
||||||
import { useTranslate } from "@/utils/i18n";
|
import { useTranslate } from "@/utils/i18n";
|
||||||
import Empty from "./Empty";
|
import Empty from "./Empty";
|
||||||
import Memo from "./Memo";
|
import Memo from "./Memo";
|
||||||
@ -11,17 +13,17 @@ import "@/less/memo-list.less";
|
|||||||
|
|
||||||
const MemoList: React.FC = () => {
|
const MemoList: React.FC = () => {
|
||||||
const t = useTranslate();
|
const t = useTranslate();
|
||||||
|
const params = useParams();
|
||||||
const memoStore = useMemoStore();
|
const memoStore = useMemoStore();
|
||||||
const userStore = useUserStore();
|
|
||||||
const filterStore = useFilterStore();
|
const filterStore = useFilterStore();
|
||||||
const filter = filterStore.state;
|
const filter = filterStore.state;
|
||||||
const { memos } = memoStore.state;
|
const { memos } = memoStore.state;
|
||||||
const [isFetching, setIsFetching] = useState<boolean>(true);
|
const [isFetching, setIsFetching] = useState<boolean>(true);
|
||||||
const [isComplete, setIsComplete] = useState<boolean>(false);
|
const [isComplete, setIsComplete] = useState<boolean>(false);
|
||||||
|
const user = useCurrentUser();
|
||||||
const currentUsername = userStore.getCurrentUsername();
|
|
||||||
const { tag: tagQuery, duration, text: textQuery, visibility } = filter;
|
const { tag: tagQuery, duration, text: textQuery, visibility } = filter;
|
||||||
const showMemoFilter = Boolean(tagQuery || (duration && duration.from < duration.to) || textQuery || visibility);
|
const showMemoFilter = Boolean(tagQuery || (duration && duration.from < duration.to) || textQuery || visibility);
|
||||||
|
const username = params.username || user?.username || "";
|
||||||
|
|
||||||
const shownMemos = (
|
const shownMemos = (
|
||||||
showMemoFilter
|
showMemoFilter
|
||||||
@ -61,7 +63,7 @@ const MemoList: React.FC = () => {
|
|||||||
return shouldShow;
|
return shouldShow;
|
||||||
})
|
})
|
||||||
: memos
|
: memos
|
||||||
).filter((memo) => memo.creatorUsername === currentUsername && memo.rowStatus === "NORMAL");
|
).filter((memo) => memo.creatorUsername === username && memo.rowStatus === "NORMAL");
|
||||||
|
|
||||||
const pinnedMemos = shownMemos.filter((m) => m.pinned);
|
const pinnedMemos = shownMemos.filter((m) => m.pinned);
|
||||||
const unpinnedMemos = shownMemos.filter((m) => !m.pinned);
|
const unpinnedMemos = shownMemos.filter((m) => !m.pinned);
|
||||||
@ -72,11 +74,9 @@ const MemoList: React.FC = () => {
|
|||||||
unpinnedMemos.sort(memoSort);
|
unpinnedMemos.sort(memoSort);
|
||||||
const sortedMemos = pinnedMemos.concat(unpinnedMemos).filter((m) => m.rowStatus === "NORMAL");
|
const sortedMemos = pinnedMemos.concat(unpinnedMemos).filter((m) => m.rowStatus === "NORMAL");
|
||||||
|
|
||||||
const statusRef = useRef<HTMLDivElement>(null);
|
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
memoStore
|
memoStore
|
||||||
.fetchMemos()
|
.fetchMemos(username)
|
||||||
.then((fetchedMemos) => {
|
.then((fetchedMemos) => {
|
||||||
if (fetchedMemos.length < DEFAULT_MEMO_LIMIT) {
|
if (fetchedMemos.length < DEFAULT_MEMO_LIMIT) {
|
||||||
setIsComplete(true);
|
setIsComplete(true);
|
||||||
@ -89,7 +89,7 @@ const MemoList: React.FC = () => {
|
|||||||
console.error(error);
|
console.error(error);
|
||||||
toast.error(error.response.data.message);
|
toast.error(error.response.data.message);
|
||||||
});
|
});
|
||||||
}, [currentUsername]);
|
}, [user?.username]);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const pageWrapper = document.body.querySelector(".page-wrapper");
|
const pageWrapper = document.body.querySelector(".page-wrapper");
|
||||||
@ -112,20 +112,12 @@ const MemoList: React.FC = () => {
|
|||||||
observer.unobserve(entry.target);
|
observer.unobserve(entry.target);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
if (statusRef?.current) {
|
}, [isFetching, isComplete, filter, sortedMemos.length]);
|
||||||
observer.observe(statusRef.current);
|
|
||||||
}
|
|
||||||
return () => {
|
|
||||||
if (statusRef?.current) {
|
|
||||||
observer.unobserve(statusRef.current);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}, [isFetching, isComplete, filter, sortedMemos.length, statusRef]);
|
|
||||||
|
|
||||||
const handleFetchMoreClick = async () => {
|
const handleFetchMoreClick = async () => {
|
||||||
try {
|
try {
|
||||||
setIsFetching(true);
|
setIsFetching(true);
|
||||||
const fetchedMemos = await memoStore.fetchMemos(DEFAULT_MEMO_LIMIT, memos.length);
|
const fetchedMemos = await memoStore.fetchMemos(username, DEFAULT_MEMO_LIMIT, memos.length);
|
||||||
if (fetchedMemos.length < DEFAULT_MEMO_LIMIT) {
|
if (fetchedMemos.length < DEFAULT_MEMO_LIMIT) {
|
||||||
setIsComplete(true);
|
setIsComplete(true);
|
||||||
} else {
|
} else {
|
||||||
@ -148,8 +140,8 @@ const MemoList: React.FC = () => {
|
|||||||
<p className="status-text">{t("memo.fetching-data")}</p>
|
<p className="status-text">{t("memo.fetching-data")}</p>
|
||||||
</div>
|
</div>
|
||||||
) : (
|
) : (
|
||||||
<div ref={statusRef} className="status-text-container">
|
<div className="status-text-container">
|
||||||
<p className="status-text">
|
<div className="status-text">
|
||||||
{isComplete ? (
|
{isComplete ? (
|
||||||
sortedMemos.length === 0 && (
|
sortedMemos.length === 0 && (
|
||||||
<div className="w-full mt-12 mb-8 flex flex-col justify-center items-center italic">
|
<div className="w-full mt-12 mb-8 flex flex-col justify-center items-center italic">
|
||||||
@ -164,7 +156,7 @@ const MemoList: React.FC = () => {
|
|||||||
</span>
|
</span>
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
</p>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
@ -1,10 +1,10 @@
|
|||||||
import { Button, IconButton } from "@mui/joy";
|
import { Button, IconButton } from "@mui/joy";
|
||||||
import axios from "axios";
|
|
||||||
import copy from "copy-to-clipboard";
|
import copy from "copy-to-clipboard";
|
||||||
import { useEffect, useState } from "react";
|
import { useEffect, useState } from "react";
|
||||||
import { toast } from "react-hot-toast";
|
import { toast } from "react-hot-toast";
|
||||||
|
import { userServiceClient } from "@/grpcweb";
|
||||||
import useCurrentUser from "@/hooks/useCurrentUser";
|
import useCurrentUser from "@/hooks/useCurrentUser";
|
||||||
import { ListUserAccessTokensResponse, UserAccessToken } from "@/types/proto/api/v2/user_service";
|
import { UserAccessToken } from "@/types/proto/api/v2/user_service";
|
||||||
import { useTranslate } from "@/utils/i18n";
|
import { useTranslate } from "@/utils/i18n";
|
||||||
import showCreateAccessTokenDialog from "../CreateAccessTokenDialog";
|
import showCreateAccessTokenDialog from "../CreateAccessTokenDialog";
|
||||||
import { showCommonDialog } from "../Dialog/CommonDialog";
|
import { showCommonDialog } from "../Dialog/CommonDialog";
|
||||||
@ -12,8 +12,8 @@ import Icon from "../Icon";
|
|||||||
import LearnMore from "../LearnMore";
|
import LearnMore from "../LearnMore";
|
||||||
|
|
||||||
const listAccessTokens = async (username: string) => {
|
const listAccessTokens = async (username: string) => {
|
||||||
const { data } = await axios.get<ListUserAccessTokensResponse>(`/api/v2/users/${username}/access_tokens`);
|
const { accessTokens } = await userServiceClient.listUserAccessTokens({ username: username });
|
||||||
return data.accessTokens;
|
return accessTokens;
|
||||||
};
|
};
|
||||||
|
|
||||||
const AccessTokenSection = () => {
|
const AccessTokenSection = () => {
|
||||||
@ -44,7 +44,7 @@ const AccessTokenSection = () => {
|
|||||||
style: "danger",
|
style: "danger",
|
||||||
dialogName: "delete-access-token-dialog",
|
dialogName: "delete-access-token-dialog",
|
||||||
onConfirm: async () => {
|
onConfirm: async () => {
|
||||||
await axios.delete(`/api/v2/users/${currentUser.id}/access_tokens/${accessToken}`);
|
await userServiceClient.deleteUserAccessToken({ username: currentUser.username, accessToken: accessToken });
|
||||||
setUserAccessTokens(userAccessTokens.filter((token) => token.accessToken !== accessToken));
|
setUserAccessTokens(userAccessTokens.filter((token) => token.accessToken !== accessToken));
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
@ -3,9 +3,10 @@ import { getMemoStats } from "@/helpers/api";
|
|||||||
import { DAILY_TIMESTAMP } from "@/helpers/consts";
|
import { DAILY_TIMESTAMP } from "@/helpers/consts";
|
||||||
import { getDateStampByDate, getDateString, getTimeStampByDate } from "@/helpers/datetime";
|
import { getDateStampByDate, getDateString, getTimeStampByDate } from "@/helpers/datetime";
|
||||||
import * as utils from "@/helpers/utils";
|
import * as utils from "@/helpers/utils";
|
||||||
|
import useCurrentUser from "@/hooks/useCurrentUser";
|
||||||
import { useUserV1Store } from "@/store/v1";
|
import { useUserV1Store } from "@/store/v1";
|
||||||
import { useTranslate } from "@/utils/i18n";
|
import { useTranslate } from "@/utils/i18n";
|
||||||
import { useFilterStore, useMemoStore, useUserStore } from "../store/module";
|
import { useFilterStore, useMemoStore } from "../store/module";
|
||||||
import "@/less/usage-heat-map.less";
|
import "@/less/usage-heat-map.less";
|
||||||
|
|
||||||
const tableConfig = {
|
const tableConfig = {
|
||||||
@ -32,8 +33,8 @@ interface DailyUsageStat {
|
|||||||
const UsageHeatMap = () => {
|
const UsageHeatMap = () => {
|
||||||
const t = useTranslate();
|
const t = useTranslate();
|
||||||
const filterStore = useFilterStore();
|
const filterStore = useFilterStore();
|
||||||
const userStore = useUserStore();
|
|
||||||
const userV1Store = useUserV1Store();
|
const userV1Store = useUserV1Store();
|
||||||
|
const user = useCurrentUser();
|
||||||
const memoStore = useMemoStore();
|
const memoStore = useMemoStore();
|
||||||
const todayTimeStamp = getDateStampByDate(Date.now());
|
const todayTimeStamp = getDateStampByDate(Date.now());
|
||||||
const todayDay = new Date(todayTimeStamp).getDay() + 1;
|
const todayDay = new Date(todayTimeStamp).getDay() + 1;
|
||||||
@ -46,23 +47,22 @@ const UsageHeatMap = () => {
|
|||||||
const [allStat, setAllStat] = useState<DailyUsageStat[]>(getInitialUsageStat(usedDaysAmount, beginDayTimestamp));
|
const [allStat, setAllStat] = useState<DailyUsageStat[]>(getInitialUsageStat(usedDaysAmount, beginDayTimestamp));
|
||||||
const [currentStat, setCurrentStat] = useState<DailyUsageStat | null>(null);
|
const [currentStat, setCurrentStat] = useState<DailyUsageStat | null>(null);
|
||||||
const containerElRef = useRef<HTMLDivElement>(null);
|
const containerElRef = useRef<HTMLDivElement>(null);
|
||||||
const currentUsername = userStore.getCurrentUsername();
|
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
userV1Store.getOrFetchUserByUsername(currentUsername).then((user) => {
|
userV1Store.getOrFetchUserByUsername(user.username).then((user) => {
|
||||||
if (!user) {
|
if (!user) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
setCreatedDays(Math.ceil((Date.now() - getTimeStampByDate(user.createTime)) / 1000 / 3600 / 24));
|
setCreatedDays(Math.ceil((Date.now() - getTimeStampByDate(user.createTime)) / 1000 / 3600 / 24));
|
||||||
});
|
});
|
||||||
}, [currentUsername]);
|
}, [user.username]);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (memos.length === 0) {
|
if (memos.length === 0) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
getMemoStats(currentUsername)
|
getMemoStats(user.username)
|
||||||
.then(({ data }) => {
|
.then(({ data }) => {
|
||||||
setMemoAmount(data.length);
|
setMemoAmount(data.length);
|
||||||
const newStat: DailyUsageStat[] = getInitialUsageStat(usedDaysAmount, beginDayTimestamp);
|
const newStat: DailyUsageStat[] = getInitialUsageStat(usedDaysAmount, beginDayTimestamp);
|
||||||
@ -81,7 +81,7 @@ const UsageHeatMap = () => {
|
|||||||
.catch((error) => {
|
.catch((error) => {
|
||||||
console.error(error);
|
console.error(error);
|
||||||
});
|
});
|
||||||
}, [memos.length, currentUsername]);
|
}, [memos.length, user.username]);
|
||||||
|
|
||||||
const handleUsageStatItemMouseEnter = useCallback((event: React.MouseEvent, item: DailyUsageStat) => {
|
const handleUsageStatItemMouseEnter = useCallback((event: React.MouseEvent, item: DailyUsageStat) => {
|
||||||
const tempDiv = document.createElement("div");
|
const tempDiv = document.createElement("div");
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
import { useEffect, useState } from "react";
|
|
||||||
import { useNavigate } from "react-router-dom";
|
import { useNavigate } from "react-router-dom";
|
||||||
|
import useCurrentUser from "@/hooks/useCurrentUser";
|
||||||
import { useGlobalStore, useUserStore } from "@/store/module";
|
import { useGlobalStore, useUserStore } from "@/store/module";
|
||||||
|
import { User_Role } from "@/types/proto/api/v2/user_service";
|
||||||
import { useTranslate } from "@/utils/i18n";
|
import { useTranslate } from "@/utils/i18n";
|
||||||
import showAboutSiteDialog from "./AboutSiteDialog";
|
import showAboutSiteDialog from "./AboutSiteDialog";
|
||||||
import Icon from "./Icon";
|
import Icon from "./Icon";
|
||||||
@ -13,17 +14,11 @@ const UserBanner = () => {
|
|||||||
const globalStore = useGlobalStore();
|
const globalStore = useGlobalStore();
|
||||||
const userStore = useUserStore();
|
const userStore = useUserStore();
|
||||||
const { systemStatus } = globalStore.state;
|
const { systemStatus } = globalStore.state;
|
||||||
const { user } = userStore.state;
|
const user = useCurrentUser();
|
||||||
const [username, setUsername] = useState("Memos");
|
const title = user ? user.nickname : systemStatus.customizedProfile.name || "memos";
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
if (user) {
|
|
||||||
setUsername(user.nickname || user.username);
|
|
||||||
}
|
|
||||||
}, [user]);
|
|
||||||
|
|
||||||
const handleMyAccountClick = () => {
|
const handleMyAccountClick = () => {
|
||||||
navigate(`/u/${user?.username}`);
|
navigate(`/u/${encodeURIComponent(user.username)}`);
|
||||||
};
|
};
|
||||||
|
|
||||||
const handleAboutBtnClick = () => {
|
const handleAboutBtnClick = () => {
|
||||||
@ -42,10 +37,8 @@ const UserBanner = () => {
|
|||||||
trigger={
|
trigger={
|
||||||
<div className="px-4 py-2 max-w-full flex flex-row justify-start items-center cursor-pointer rounded-lg hover:shadow hover:bg-white dark:hover:bg-zinc-700">
|
<div className="px-4 py-2 max-w-full flex flex-row justify-start items-center cursor-pointer rounded-lg hover:shadow hover:bg-white dark:hover:bg-zinc-700">
|
||||||
<UserAvatar className="shadow" avatarUrl={user?.avatarUrl} />
|
<UserAvatar className="shadow" avatarUrl={user?.avatarUrl} />
|
||||||
<span className="px-1 text-lg font-medium text-slate-800 dark:text-gray-200 shrink truncate">
|
<span className="px-1 text-lg font-medium text-slate-800 dark:text-gray-200 shrink truncate">{title}</span>
|
||||||
{user != undefined ? username : systemStatus.customizedProfile.name}
|
{user?.role === User_Role.HOST ? (
|
||||||
</span>
|
|
||||||
{user?.role === "HOST" ? (
|
|
||||||
<span className="text-xs px-1 bg-blue-600 dark:bg-blue-800 rounded text-white dark:text-gray-200 shadow">MOD</span>
|
<span className="text-xs px-1 bg-blue-600 dark:bg-blue-800 rounded text-white dark:text-gray-200 shadow">MOD</span>
|
||||||
) : null}
|
) : null}
|
||||||
</div>
|
</div>
|
||||||
|
@ -4,7 +4,7 @@ import { useEffect, useState } from "react";
|
|||||||
import { getMemoStats } from "@/helpers/api";
|
import { getMemoStats } from "@/helpers/api";
|
||||||
import { DAILY_TIMESTAMP } from "@/helpers/consts";
|
import { DAILY_TIMESTAMP } from "@/helpers/consts";
|
||||||
import { getDateStampByDate, isFutureDate } from "@/helpers/datetime";
|
import { getDateStampByDate, isFutureDate } from "@/helpers/datetime";
|
||||||
import { useUserStore } from "@/store/module";
|
import useCurrentUser from "@/hooks/useCurrentUser";
|
||||||
import { useTranslate } from "@/utils/i18n";
|
import { useTranslate } from "@/utils/i18n";
|
||||||
import Icon from "../Icon";
|
import Icon from "../Icon";
|
||||||
import "@/less/common/date-picker.less";
|
import "@/less/common/date-picker.less";
|
||||||
@ -21,14 +21,14 @@ const DatePicker: React.FC<DatePickerProps> = (props: DatePickerProps) => {
|
|||||||
const { className, isFutureDateDisabled, datestamp, handleDateStampChange } = props;
|
const { className, isFutureDateDisabled, datestamp, handleDateStampChange } = props;
|
||||||
const [currentDateStamp, setCurrentDateStamp] = useState<number>(getMonthFirstDayDateStamp(datestamp));
|
const [currentDateStamp, setCurrentDateStamp] = useState<number>(getMonthFirstDayDateStamp(datestamp));
|
||||||
const [countByDate, setCountByDate] = useState(new Map());
|
const [countByDate, setCountByDate] = useState(new Map());
|
||||||
const currentUsername = useUserStore().getCurrentUsername();
|
const user = useCurrentUser();
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
setCurrentDateStamp(getMonthFirstDayDateStamp(datestamp));
|
setCurrentDateStamp(getMonthFirstDayDateStamp(datestamp));
|
||||||
}, [datestamp]);
|
}, [datestamp]);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
getMemoStats(currentUsername).then(({ data }) => {
|
getMemoStats(user.username).then(({ data }) => {
|
||||||
const m = new Map();
|
const m = new Map();
|
||||||
for (const record of data) {
|
for (const record of data) {
|
||||||
const date = getDateStampByDate(record * 1000);
|
const date = getDateStampByDate(record * 1000);
|
||||||
@ -36,7 +36,7 @@ const DatePicker: React.FC<DatePickerProps> = (props: DatePickerProps) => {
|
|||||||
}
|
}
|
||||||
setCountByDate(m);
|
setCountByDate(m);
|
||||||
});
|
});
|
||||||
}, [currentUsername]);
|
}, [user.username]);
|
||||||
|
|
||||||
const firstDate = new Date(currentDateStamp);
|
const firstDate = new Date(currentDateStamp);
|
||||||
const firstDateDay = firstDate.getDay() === 0 ? 7 : firstDate.getDay();
|
const firstDateDay = firstDate.getDay() === 0 ? 7 : firstDate.getDay();
|
||||||
|
@ -1,6 +1,5 @@
|
|||||||
import axios from "axios";
|
import axios from "axios";
|
||||||
import { Resource } from "@/types/proto/api/v2/resource_service";
|
import { Resource } from "@/types/proto/api/v2/resource_service";
|
||||||
import { GetUserResponse } from "@/types/proto/api/v2/user_service";
|
|
||||||
|
|
||||||
export function getSystemStatus() {
|
export function getSystemStatus() {
|
||||||
return axios.get<SystemStatus>("/api/v1/status");
|
return axios.get<SystemStatus>("/api/v1/status");
|
||||||
@ -56,10 +55,6 @@ export function getUserList() {
|
|||||||
return axios.get<User[]>("/api/v1/user");
|
return axios.get<User[]>("/api/v1/user");
|
||||||
}
|
}
|
||||||
|
|
||||||
export function getUserByUsername(username: string) {
|
|
||||||
return axios.get<GetUserResponse>(`/api/v2/users/${username}`);
|
|
||||||
}
|
|
||||||
|
|
||||||
export function upsertUserSetting(upsert: UserSettingUpsert) {
|
export function upsertUserSetting(upsert: UserSettingUpsert) {
|
||||||
return axios.post<UserSetting>(`/api/v1/user/setting`, upsert);
|
return axios.post<UserSetting>(`/api/v1/user/setting`, upsert);
|
||||||
}
|
}
|
||||||
|
@ -5,7 +5,7 @@ import { useUserV1Store } from "@/store/v1";
|
|||||||
const useCurrentUser = () => {
|
const useCurrentUser = () => {
|
||||||
const userStore = useUserStore();
|
const userStore = useUserStore();
|
||||||
const userV1Store = useUserV1Store();
|
const userV1Store = useUserV1Store();
|
||||||
const currentUsername = userStore.getCurrentUsername();
|
const currentUsername = userStore.state.user?.username;
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (currentUsername) {
|
if (currentUsername) {
|
||||||
@ -13,7 +13,7 @@ const useCurrentUser = () => {
|
|||||||
}
|
}
|
||||||
}, [currentUsername]);
|
}, [currentUsername]);
|
||||||
|
|
||||||
return userV1Store.getUserByUsername(currentUsername);
|
return userV1Store.getUserByUsername(currentUsername || "");
|
||||||
};
|
};
|
||||||
|
|
||||||
export default useCurrentUser;
|
export default useCurrentUser;
|
||||||
|
@ -3,17 +3,14 @@ import MemoEditor from "@/components/MemoEditor";
|
|||||||
import MemoFilter from "@/components/MemoFilter";
|
import MemoFilter from "@/components/MemoFilter";
|
||||||
import MemoList from "@/components/MemoList";
|
import MemoList from "@/components/MemoList";
|
||||||
import MobileHeader from "@/components/MobileHeader";
|
import MobileHeader from "@/components/MobileHeader";
|
||||||
import { useUserStore } from "@/store/module";
|
|
||||||
|
|
||||||
const Home = () => {
|
const Home = () => {
|
||||||
const userStore = useUserStore();
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="w-full flex flex-row justify-start items-start">
|
<div className="w-full flex flex-row justify-start items-start">
|
||||||
<div className="flex-grow shrink w-auto px-4 sm:px-2 sm:pt-4">
|
<div className="flex-grow shrink w-auto px-4 sm:px-2 sm:pt-4">
|
||||||
<MobileHeader />
|
<MobileHeader />
|
||||||
<div className="w-full h-auto flex flex-col justify-start items-start bg-zinc-100 dark:bg-zinc-800 rounded-lg">
|
<div className="w-full h-auto flex flex-col justify-start items-start bg-zinc-100 dark:bg-zinc-800 rounded-lg">
|
||||||
{!userStore.isVisitorMode() && <MemoEditor className="mb-2" />}
|
<MemoEditor className="mb-2" />
|
||||||
<MemoFilter />
|
<MemoFilter />
|
||||||
</div>
|
</div>
|
||||||
<MemoList />
|
<MemoList />
|
||||||
|
@ -1,17 +1,17 @@
|
|||||||
import axios from "axios";
|
|
||||||
import { useEffect, useState } from "react";
|
import { useEffect, useState } from "react";
|
||||||
import { Link } from "react-router-dom";
|
import { Link } from "react-router-dom";
|
||||||
import Empty from "@/components/Empty";
|
import Empty from "@/components/Empty";
|
||||||
import Icon from "@/components/Icon";
|
import Icon from "@/components/Icon";
|
||||||
import MobileHeader from "@/components/MobileHeader";
|
import MobileHeader from "@/components/MobileHeader";
|
||||||
import ResourceIcon from "@/components/ResourceIcon";
|
import ResourceIcon from "@/components/ResourceIcon";
|
||||||
|
import { resourceServiceClient } from "@/grpcweb";
|
||||||
import useLoading from "@/hooks/useLoading";
|
import useLoading from "@/hooks/useLoading";
|
||||||
import { ListResourcesResponse, Resource } from "@/types/proto/api/v2/resource_service";
|
import { Resource } from "@/types/proto/api/v2/resource_service";
|
||||||
import { useTranslate } from "@/utils/i18n";
|
import { useTranslate } from "@/utils/i18n";
|
||||||
|
|
||||||
const fetchAllResources = async () => {
|
const fetchAllResources = async () => {
|
||||||
const { data } = await axios.get<ListResourcesResponse>("/api/v2/resources");
|
const { resources } = await resourceServiceClient.listResources({});
|
||||||
return data.resources;
|
return resources;
|
||||||
};
|
};
|
||||||
|
|
||||||
function groupResourcesByDate(resources: Resource[]) {
|
function groupResourcesByDate(resources: Resource[]) {
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
import { Option, Select } from "@mui/joy";
|
import { Option, Select } from "@mui/joy";
|
||||||
import { isEqual } from "lodash-es";
|
|
||||||
import { useState } from "react";
|
import { useState } from "react";
|
||||||
import BetaBadge from "@/components/BetaBadge";
|
import BetaBadge from "@/components/BetaBadge";
|
||||||
import Icon from "@/components/Icon";
|
import Icon from "@/components/Icon";
|
||||||
@ -11,6 +10,7 @@ import SSOSection from "@/components/Settings/SSOSection";
|
|||||||
import StorageSection from "@/components/Settings/StorageSection";
|
import StorageSection from "@/components/Settings/StorageSection";
|
||||||
import SystemSection from "@/components/Settings/SystemSection";
|
import SystemSection from "@/components/Settings/SystemSection";
|
||||||
import useCurrentUser from "@/hooks/useCurrentUser";
|
import useCurrentUser from "@/hooks/useCurrentUser";
|
||||||
|
import { User_Role } from "@/types/proto/api/v2/user_service";
|
||||||
import { useTranslate } from "@/utils/i18n";
|
import { useTranslate } from "@/utils/i18n";
|
||||||
import "@/less/setting.less";
|
import "@/less/setting.less";
|
||||||
|
|
||||||
@ -26,7 +26,7 @@ const Setting = () => {
|
|||||||
const [state, setState] = useState<State>({
|
const [state, setState] = useState<State>({
|
||||||
selectedSection: "my-account",
|
selectedSection: "my-account",
|
||||||
});
|
});
|
||||||
const isHost = isEqual(user.role, "HOST");
|
const isHost = user.role === User_Role.HOST;
|
||||||
|
|
||||||
const handleSectionSelectorItemClick = (settingSection: SettingSection) => {
|
const handleSectionSelectorItemClick = (settingSection: SettingSection) => {
|
||||||
setState({
|
setState({
|
||||||
|
@ -1,26 +1,30 @@
|
|||||||
import { useEffect, useState } from "react";
|
import { useEffect, useState } from "react";
|
||||||
import { toast } from "react-hot-toast";
|
import { toast } from "react-hot-toast";
|
||||||
|
import { useParams } from "react-router-dom";
|
||||||
import FloatingNavButton from "@/components/FloatingNavButton";
|
import FloatingNavButton from "@/components/FloatingNavButton";
|
||||||
import MemoFilter from "@/components/MemoFilter";
|
import MemoFilter from "@/components/MemoFilter";
|
||||||
import MemoList from "@/components/MemoList";
|
import MemoList from "@/components/MemoList";
|
||||||
import UserAvatar from "@/components/UserAvatar";
|
import UserAvatar from "@/components/UserAvatar";
|
||||||
import useLoading from "@/hooks/useLoading";
|
import useLoading from "@/hooks/useLoading";
|
||||||
import { useUserStore } from "@/store/module";
|
|
||||||
import { useUserV1Store } from "@/store/v1";
|
import { useUserV1Store } from "@/store/v1";
|
||||||
import { User } from "@/types/proto/api/v2/user_service";
|
import { User } from "@/types/proto/api/v2/user_service";
|
||||||
import { useTranslate } from "@/utils/i18n";
|
import { useTranslate } from "@/utils/i18n";
|
||||||
|
|
||||||
const UserProfile = () => {
|
const UserProfile = () => {
|
||||||
const t = useTranslate();
|
const t = useTranslate();
|
||||||
const userStore = useUserStore();
|
const params = useParams();
|
||||||
const userV1Store = useUserV1Store();
|
const userV1Store = useUserV1Store();
|
||||||
const loadingState = useLoading();
|
const loadingState = useLoading();
|
||||||
const [user, setUser] = useState<User>();
|
const [user, setUser] = useState<User>();
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const currentUsername = userStore.getCurrentUsername();
|
const username = params.username;
|
||||||
|
if (!username) {
|
||||||
|
throw new Error("username is required");
|
||||||
|
}
|
||||||
|
|
||||||
userV1Store
|
userV1Store
|
||||||
.getOrFetchUserByUsername(currentUsername)
|
.getOrFetchUserByUsername(username)
|
||||||
.then((user) => {
|
.then((user) => {
|
||||||
setUser(user);
|
setUser(user);
|
||||||
loadingState.setFinish();
|
loadingState.setFinish();
|
||||||
@ -29,7 +33,7 @@ const UserProfile = () => {
|
|||||||
console.error(error);
|
console.error(error);
|
||||||
toast.error(t("message.user-not-found"));
|
toast.error(t("message.user-not-found"));
|
||||||
});
|
});
|
||||||
}, [userStore.getCurrentUsername()]);
|
}, [params.username]);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
import axios from "axios";
|
import { systemServiceClient } from "@/grpcweb";
|
||||||
import * as api from "@/helpers/api";
|
import * as api from "@/helpers/api";
|
||||||
import storage from "@/helpers/storage";
|
import storage from "@/helpers/storage";
|
||||||
import i18n from "@/i18n";
|
import i18n from "@/i18n";
|
||||||
@ -75,11 +75,8 @@ export const useGlobalStore = () => {
|
|||||||
},
|
},
|
||||||
fetchSystemStatus: async () => {
|
fetchSystemStatus: async () => {
|
||||||
const { data: systemStatus } = await api.getSystemStatus();
|
const { data: systemStatus } = await api.getSystemStatus();
|
||||||
// TODO: update this when api v2 is ready.
|
const { systemInfo } = await systemServiceClient.getSystemInfo({});
|
||||||
const {
|
systemStatus.dbSize = systemInfo?.dbSize || 0;
|
||||||
data: { systemInfo },
|
|
||||||
} = await axios.get("/api/v2/system/info");
|
|
||||||
systemStatus.dbSize = Number(systemInfo.dbSize);
|
|
||||||
store.dispatch(setGlobalState({ systemStatus: systemStatus }));
|
store.dispatch(setGlobalState({ systemStatus: systemStatus }));
|
||||||
return systemStatus;
|
return systemStatus;
|
||||||
},
|
},
|
||||||
|
@ -4,7 +4,6 @@ import { DEFAULT_MEMO_LIMIT } from "@/helpers/consts";
|
|||||||
import store, { useAppSelector } from "../";
|
import store, { useAppSelector } from "../";
|
||||||
import { createMemo, deleteMemo, patchMemo, upsertMemos } from "../reducer/memo";
|
import { createMemo, deleteMemo, patchMemo, upsertMemos } from "../reducer/memo";
|
||||||
import { useMemoCacheStore } from "../v1";
|
import { useMemoCacheStore } from "../v1";
|
||||||
import { getUsernameFromPath, useUserStore } from "./";
|
|
||||||
|
|
||||||
export const convertResponseModelMemo = (memo: Memo): Memo => {
|
export const convertResponseModelMemo = (memo: Memo): Memo => {
|
||||||
return {
|
return {
|
||||||
@ -17,7 +16,6 @@ export const convertResponseModelMemo = (memo: Memo): Memo => {
|
|||||||
|
|
||||||
export const useMemoStore = () => {
|
export const useMemoStore = () => {
|
||||||
const state = useAppSelector((state) => state.memo);
|
const state = useAppSelector((state) => state.memo);
|
||||||
const userStore = useUserStore();
|
|
||||||
const memoCacheStore = useMemoCacheStore();
|
const memoCacheStore = useMemoCacheStore();
|
||||||
|
|
||||||
const fetchMemoById = async (memoId: MemoId) => {
|
const fetchMemoById = async (memoId: MemoId) => {
|
||||||
@ -33,14 +31,14 @@ export const useMemoStore = () => {
|
|||||||
getState: () => {
|
getState: () => {
|
||||||
return store.getState().memo;
|
return store.getState().memo;
|
||||||
},
|
},
|
||||||
fetchMemos: async (limit = DEFAULT_MEMO_LIMIT, offset = 0) => {
|
fetchMemos: async (username = "", limit = DEFAULT_MEMO_LIMIT, offset = 0) => {
|
||||||
const memoFind: MemoFind = {
|
const memoFind: MemoFind = {
|
||||||
rowStatus: "NORMAL",
|
rowStatus: "NORMAL",
|
||||||
limit,
|
limit,
|
||||||
offset,
|
offset,
|
||||||
};
|
};
|
||||||
if (userStore.isVisitorMode()) {
|
if (username) {
|
||||||
memoFind.creatorUsername = getUsernameFromPath();
|
memoFind.creatorUsername = username;
|
||||||
}
|
}
|
||||||
const { data } = await api.getMemoList(memoFind);
|
const { data } = await api.getMemoList(memoFind);
|
||||||
const fetchedMemos = data.map((m) => convertResponseModelMemo(m));
|
const fetchedMemos = data.map((m) => convertResponseModelMemo(m));
|
||||||
|
@ -1,6 +1,5 @@
|
|||||||
import { camelCase } from "lodash-es";
|
import { camelCase } from "lodash-es";
|
||||||
import * as api from "@/helpers/api";
|
import * as api from "@/helpers/api";
|
||||||
import { UNKNOWN_USERNAME } from "@/helpers/consts";
|
|
||||||
import storage from "@/helpers/storage";
|
import storage from "@/helpers/storage";
|
||||||
import { getSystemColorScheme } from "@/helpers/utils";
|
import { getSystemColorScheme } from "@/helpers/utils";
|
||||||
import store, { useAppSelector } from "..";
|
import store, { useAppSelector } from "..";
|
||||||
@ -86,38 +85,16 @@ const doSignOut = async () => {
|
|||||||
await api.signout();
|
await api.signout();
|
||||||
};
|
};
|
||||||
|
|
||||||
export const getUsernameFromPath = () => {
|
|
||||||
const pathname = window.location.pathname;
|
|
||||||
const usernameRegex = /^\/u\/(\w+).*/;
|
|
||||||
const result = pathname.match(usernameRegex);
|
|
||||||
if (result && result.length === 2) {
|
|
||||||
return String(result[1]);
|
|
||||||
}
|
|
||||||
return undefined;
|
|
||||||
};
|
|
||||||
|
|
||||||
export const useUserStore = () => {
|
export const useUserStore = () => {
|
||||||
const state = useAppSelector((state) => state.user);
|
const state = useAppSelector((state) => state.user);
|
||||||
|
|
||||||
const isVisitorMode = () => {
|
|
||||||
return state.user === undefined || getUsernameFromPath();
|
|
||||||
};
|
|
||||||
|
|
||||||
return {
|
return {
|
||||||
state,
|
state,
|
||||||
getState: () => {
|
getState: () => {
|
||||||
return store.getState().user;
|
return store.getState().user;
|
||||||
},
|
},
|
||||||
isVisitorMode,
|
|
||||||
doSignIn,
|
doSignIn,
|
||||||
doSignOut,
|
doSignOut,
|
||||||
getCurrentUsername: () => {
|
|
||||||
if (isVisitorMode()) {
|
|
||||||
return getUsernameFromPath() || UNKNOWN_USERNAME;
|
|
||||||
} else {
|
|
||||||
return state.user?.username || UNKNOWN_USERNAME;
|
|
||||||
}
|
|
||||||
},
|
|
||||||
upsertUserSetting: async (key: string, value: any) => {
|
upsertUserSetting: async (key: string, value: any) => {
|
||||||
await api.upsertUserSetting({
|
await api.upsertUserSetting({
|
||||||
key: key as any,
|
key: key as any,
|
||||||
@ -130,10 +107,10 @@ export const useUserStore = () => {
|
|||||||
store.dispatch(patchUser({ localSetting }));
|
store.dispatch(patchUser({ localSetting }));
|
||||||
},
|
},
|
||||||
patchUser: async (userPatch: UserPatch): Promise<void> => {
|
patchUser: async (userPatch: UserPatch): Promise<void> => {
|
||||||
const { data } = await api.patchUser(userPatch);
|
await api.patchUser(userPatch);
|
||||||
if (userPatch.id === store.getState().user.user?.id) {
|
// If the user is the current user and the username is changed, reload the page.
|
||||||
const user = convertResponseModelUser(data);
|
if (userPatch.id === store.getState().user.user?.id && userPatch.username) {
|
||||||
store.dispatch(patchUser(user));
|
window.location.reload();
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
deleteUser: async (userDelete: UserDelete) => {
|
deleteUser: async (userDelete: UserDelete) => {
|
||||||
|
@ -27,7 +27,7 @@ export default defineConfig({
|
|||||||
target: devProxyServer,
|
target: devProxyServer,
|
||||||
xfwd: true,
|
xfwd: true,
|
||||||
},
|
},
|
||||||
"/explore/rss.xml": {
|
"^/explore/rss.xml": {
|
||||||
target: devProxyServer,
|
target: devProxyServer,
|
||||||
xfwd: true,
|
xfwd: true,
|
||||||
},
|
},
|
||||||
|
Reference in New Issue
Block a user