Skip to content
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

Jump to bottom

fix: 닉네임 중복 프론트 임시 처리 제거 #285

Merged
merged 3 commits into from
Aug 21, 2023
Merged

fix: 닉네임 중복 프론트 임시 처리 제거 #285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
130bad6
fix: 닉네임 중복 프론트 임시 처리 제거
ww8007 Aug 21, 2023
21bcecf
fix: 닉네임 중복 프론트 임시 처리 제거
ww8007 Aug 21, 2023
6c220df
fix: ios 이름 중복 입력 로직 수정
ww8007 Aug 21, 2023
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
14 changes: 13 additions & 1 deletion src/RNListener.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@ import { useGETUserProfile } from './auth/api/profile';
import useBookmarkStore from './store/bookmark';
import useWebview from './common/service/hooks/useWebview';
import { useEffect } from 'react';
import { useNavigate } from 'react-router-dom';
import { navigatePath } from './constants/navigatePath';

const RNListener = () => {
const { memberId, login } = useAuthStore();
const { memberId, login, userInfo } = useAuthStore();
const { initializeUrlAndTitle } = useBookmarkStore();

const { postMessage } = useWebview();
Expand All @@ -15,6 +17,16 @@ const RNListener = () => {
postMessage('login', null);
}, []);

const router = useNavigate();

useEffect(() => {
if (userInfo) {
if (userInfo.name.slice(0, 3) + '-+@' === userInfo.nickname) {
router(navigatePath.USER);
}
}
}, [userInfo]);

useBridgeCallback(({ message, params }) => {
if (message === 'login') {
if (params?.memberId && params?.token) {
Expand Down
1 change: 0 additions & 1 deletion src/auth/api/profile.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ export const useGETUserProfile = (params: GetAPIRequest) => {
profileEmoji: data.profileEmoji ?? '🐶',
}));
if (data.nickname === '') router(navigatePath.USER);
if (data.nickname.includes('oxo')) router(navigatePath.USER);
},
onError: (e) => console.log(e),
cacheTime: 10 * 60 * 1000,
Expand Down
51 changes: 14 additions & 37 deletions src/pages/UserInfoPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,24 +19,6 @@ const UserInfoPage = ({ mode }: UserCreatePageProps) => {
const { emoji, isEmojiBSOpen, onChangeEmoji, setEmojiBSOpen, closeEmojiBS } =
useChangeEmoji();

// TODO : 백엔드 수정 후 수정
const { mutate } = usePutUserInfoQuery({ mode: 'CREATE', memberId });

useEffect(() => {
if (userInfo) {
if (userInfo.nickname === '' && memberId) {
mutate({
putData: {
name: userInfo.name || '피클리123',
nickname: 'oxo' + generateRandomString(4),
profileEmoji: userInfo.profileEmoji ?? '🐶',
},
memberId,
});
}
}
}, [userInfo, memberId]);

// TODO : 이게 최선의 방법인지 고민해보기
const [initialValues, setInitialValues] = useState({
name: '',
Expand All @@ -49,16 +31,15 @@ const UserInfoPage = ({ mode }: UserCreatePageProps) => {
useEffect(() => {
if (userInfo) {
const { name, nickname, profileEmoji } = userInfo;
// TODO : 백엔드 수정 후 수정
const changeName = name.includes('피클리123') ? '' : name;
const changeNickName = nickname.includes('oxo') ? '' : nickname;

onChangeName(changeName);
onChangeNickname(changeNickName);
if (nickname === name.slice(0, 3) + '-+@') onChangeNickname('');
else onChangeNickname(nickname);

onChangeName(name);
onChangeEmoji(profileEmoji);
setInitialValues({
name: changeName,
nickname: changeNickName,
name,
nickname,
emoji: profileEmoji,
});
}
Expand All @@ -70,6 +51,12 @@ const UserInfoPage = ({ mode }: UserCreatePageProps) => {
nickname: initialNickname,
emoji: initialEmoji,
} = initialValues;

if (nickname.length === 0) {
setDisabled(true);
return;
}

if (
name === initialName &&
nickname === initialNickname &&
Expand All @@ -81,6 +68,8 @@ const UserInfoPage = ({ mode }: UserCreatePageProps) => {
setDisabled(false);
}, [name, nickname, emoji, initialValues]);

const { mutate } = usePutUserInfoQuery({ mode: 'CREATE', memberId });

const onSubmitUserInfo: FormEventHandler<HTMLFormElement> = (e) => {
e.preventDefault();
mutate({
Expand Down Expand Up @@ -112,15 +101,3 @@ const UserInfoPage = ({ mode }: UserCreatePageProps) => {
};

export default UserInfoPage;

// TODO : 백엔드 수정 후 수정
const generateRandomString = (num: number) => {
const characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
let result = '';
const charactersLength = characters.length;
for (let i = 0; i < num; i++) {
result += characters.charAt(Math.floor(Math.random() * charactersLength));
}

return result;
};
Loading