Open-Set-Go v1.0.1 (#87)

* Feat : add meta data #65 Signed-off-by: bentshrimp <bent_shrimp@kookmin.ac.kr> * Bump @adobe/css-tools from 4.2.0 to 4.3.1 Bumps [@adobe/css-tools](https://github.com/adobe/css-tools) from 4.2.0 to 4.3.1. - [Changelog](https://github.com/adobe/css-tools/blob/main/History.md) - [Commits](https://github.com/adobe/css-tools/commits) --- updated-dependencies: - dependency-name: "@adobe/css-tools" dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> * Fix : Security Priblem occured by nth-check resolved at #71 Signed-off-by: ymw0407 <yunminwo1211@gmail.com> * Update : rename title from "Open Set Go" to "Open-Set-Go" #65 Signed-off-by: bentshrimp <bent_shrimp@kookmin.ac.kr> * Update : manifest.json updated with proper icon images #65 Signed-off-by: bentshrimp <bent_shrimp@kookmin.ac.kr> * Remove : unnecessary file, favicon.svg removed #65 Signed-off-by: bentshrimp <bent_shrimp@kookmin.ac.kr> * Fix : icon size setting fixed #65 Signed-off-by: bentshrimp <bent_shrimp@kookmin.ac.kr> * Chore : remove .vscode Signed-off-by: Yun Min Woo <yunminwo1211@gmail.com> * Add : _redirects for netlify CD Signed-off-by: Yun Min Woo <yunminwo1211@gmail.com> * Fix : Improving cookie handling tech #78 - need to improve handling cookie at refreshing main page * Fix : vulnerability alert resolved #77 - https://github.com/AgainIoT/Open-Set-Go_client/security/dependabot/3 Signed-off-by: bentshrimp <bent_shrimp@kookmin.ac.kr> * Fix : MainPage isLogin state works well #78 Signed-off-by: bentshrimp <bent_shrimp@kookmin.ac.kr> * Fix : changed unnecessary if-else into single return statement #78 Signed-off-by: bentshrimp <bent_shrimp@kookmin.ac.kr> * update staging branch (#81) * Fix : Improving cookie handling tech #78 - need to improve handling cookie at refreshing main page * Fix : vulnerability alert resolved #77 - https://github.com/AgainIoT/Open-Set-Go_client/security/dependabot/3 Signed-off-by: bentshrimp <bent_shrimp@kookmin.ac.kr> * Fix : MainPage isLogin state works well #78 Signed-off-by: bentshrimp <bent_shrimp@kookmin.ac.kr> * Fix : changed unnecessary if-else into single return statement #78 Signed-off-by: bentshrimp <bent_shrimp@kookmin.ac.kr> --------- Signed-off-by: bentshrimp <bent_shrimp@kookmin.ac.kr> Co-authored-by: ymw0407 <yunminwo1211@gmail.com> * Fix : remove user info in local storage #83 - correct the icon src - remove user info every time user revisit after automatic loggout Signed-off-by: bentshrimp <bent_shrimp@kookmin.ac.kr> * Add : add react script 'yarn start:win' & 'yarn start:linux' #85 * Feat : Security Policy Updated #87 Signed-off-by: Yun Min Woo <yunminwo1211@gmail.com> * Fix : blog -> docs, docs domain changed #88 * Fix : Logo.svg changed to logo.svg(typo error) Co-authored-by : bent_shrimp <bent_shrimp@kookmin.ac.kr> Signed-off-by: Yun Min Woo <yunminwo1211@gmail.com> * Fix : render profile image when only login #83 Signed-off-by: bentshrimp <bent_shrimp@kookmin.ac.kr> * Chore : remove unnecessary import #83 Signed-off-by: bentshrimp <bent_shrimp@kookmin.ac.kr> * Revert "Unexpected bugs fixed" * Fix : manage login state only in Header #83 Signed-off-by: bentshrimp <bent_shrimp@kookmin.ac.kr> * Chore : remove unused state variable #83 Signed-off-by: bentshrimp <bent_shrimp@kookmin.ac.kr> * Correct old docs url (#100) Fix : old docs url corrected #98 Signed-off-by: bentshrimp <bent_shrimp@kookmin.ac.kr> Co-authored-by: Yun Min Woo <yunminwo1211@gmail.com> --------- Signed-off-by: bentshrimp <bent_shrimp@kookmin.ac.kr> Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: ymw0407 <yunminwo1211@gmail.com> Signed-off-by: Yun Min Woo <yunminwo1211@gmail.com> Co-authored-by: bentshrimp <bent_shrimp@kookmin.ac.kr> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: bent_shrimp <39232867+bentshrimp@users.noreply.github.com>
AgainIoT · Oct 7, 2023 · bc30a25 · bc30a25
1 parent 3ec628e
commit bc30a25
Show file tree

Hide file tree

Showing 20 changed files with 110 additions and 250 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1,6 +1,6 @@
 # Welcome to Open-Set-Go contributing guide
 
-Thank you for investing your time in contributing to our Open-Set-Go project! Any contribution you make will be reflected on [Open-Set-Go.io](https://open-set-go.netlify.app/) & [README.md](https://github.com/AgainIoT/Open-Set-Go#contributors) ✨.
+Thank you for investing your time in contributing to our Open-Set-Go project! Any contribution you make will be reflected on [Open-Set-Go.io](https://docs.open-set-go.com) & [README.md](https://github.com/AgainIoT/Open-Set-Go#contributors) ✨.
 
 We are committed to fostering a contribution-friendly environment that encourages contributions and aims to evolve into an open-source community. Please have a lot of conversations on [our Discussion](https://github.com/AgainIoT/Open-Set-Go/discussions)!
 

diff --git a/README.md b/README.md
@@ -1,11 +1,11 @@
 # Open-Set-Go_client
 
 <p align="center">
-<a href="https://open-set-go.netlify.app/" target="blank"><img src="https://github.com/AgainIoT/Open-Set-Go/raw/main/.github/images/Open-Set-Go.png" width="200" alt="Open-Set-Go Logo" /></a>
+<a href="https://docs.open-set-go.com/" target="blank"><img src="https://github.com/AgainIoT/Open-Set-Go/raw/main/.github/images/Open-Set-Go.png" width="200" alt="Open-Set-Go Logo" /></a>
 </p>
 
 <p align="center">
-  Start Open-Source Projects easily, quickly and conveniently with <a href="https://open-set-go.netlify.app/" target="blank">Open-Set-Go</a>!
+  Start Open-Source Projects easily, quickly and conveniently with <a href="https://docs.open-set-go.com/" target="blank">Open-Set-Go</a>!
 </p>
 
 <p align="center">
@@ -119,7 +119,7 @@ Open-Set-Go makes it easy, fast and simple to start an Open-Source project, whil
 
 We are conducting documentation at Open-Set-Go.io. Please refer to the following. _You can see our technical blog & showcase on Open-Set-Go.io_
 
-- <a href="https://open-set-go.netlify.app/">Open-Set-Go.io</a>
+- <a href="https://docs.open-set-go.com/">Open-Set-Go.io</a>
 
 ## Contributing
 

diff --git a/SECURITY.md b/SECURITY.md
@@ -2,9 +2,14 @@
 
 ## Supported Versions
 
-Use this section to tell people about which versions of your project are
-currently being supported with security updates.
-
 | Version | Supported          |
 | ------- | ------------------ |
-| 0.0.x   | :white_check_mark: |
+| 0.0.x   | ❌ |
+| 1.0.0   | ❌ |
+| 1.0.1   | ☑️ |
+
+## Reporting a Vulnerability
+
+We strongly encourage you to report security vulnerabilities to
+our private security mailing list: yunminwo1211@gmail.com - first, before
+disclosing them in any public forums.
diff --git a/package.json b/package.json
@@ -15,15 +15,15 @@
     "@mui/material": "^5.14.8",
     "@mui/styled-engine-sc": "^5.14.8",
     "@mui/x-data-grid": "^6.12.0",
-    "@testing-library/jest-dom": "^5.17.0",
+    "@testing-library/jest-dom": "^6.1.3",
     "@testing-library/react": "^13.4.0",
     "@testing-library/user-event": "^13.5.0",
     "@uiw/react-markdown-preview": "^4.1.15",
     "@uiw/react-md-editor": "^3.23.5",
     "axios": "^1.5.0",
+    "env-cmd": "^10.1.0",
     "prop-types": "^15.8.1",
     "react": "^18.2.0",
-    "react-cookie": "^6.1.0",
     "react-dom": "^18.2.0",
     "react-modal": "^3.16.1",
     "react-query": "^3.39.3",
@@ -39,6 +39,9 @@
   },
   "scripts": {
     "start": "react-scripts start",
+    "start:win": "set HTTPS=true&&react-scripts start",
+    "start:linux": "HTTPS=true react-scripts start",
+    "start:dev": "env-cmd -f .env.development.local react-scripts start",
     "build": "react-scripts build",
     "test": "react-scripts test",
     "eject": "react-scripts eject",
@@ -71,5 +74,9 @@
     "eslint-plugin-react": "^7.33.1",
     "eslint-plugin-react-hooks": "^4.3.0",
     "prettier": "3.0.1"
+  },
+  "resolutions": {
+    "nth-check": "^2.1.1",
+    "postcss": "^8.4.31"
   }
 }
diff --git a/public/favicon.ico b/public/favicon.ico
diff --git a/public/index.html b/public/index.html
@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="utf-8" />
-    <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
+    <link rel="icon" href="%PUBLIC_URL%/logo.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="theme-color" content="#000000" />
     <meta
@@ -24,7 +24,7 @@
       work correctly both with client-side routing and a non-root public URL.
       Learn how to configure a non-root public URL by running `npm run build`.
     -->
-    <title>React App</title>
+    <title>Open-Set-Go</title>
   </head>
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>

diff --git a/public/logo.ico b/public/logo.ico
diff --git a/public/logo.svg b/public/logo.svg
diff --git a/public/logo192.png b/public/logo192.png
diff --git a/public/logo512.png b/public/logo512.png
diff --git a/public/manifest.json b/public/manifest.json
@@ -1,9 +1,9 @@
 {
-  "short_name": "React App",
-  "name": "Create React App Sample",
+  "short_name": "Open-Set-Go",
+  "name": "Open Set Go",
   "icons": [
     {
-      "src": "favicon.ico",
+      "src": "logo.svg",
       "sizes": "64x64 32x32 24x24 16x16",
       "type": "image/x-icon"
     },
@@ -13,7 +13,7 @@
       "sizes": "192x192"
     },
     {
-      "src": "logo512.png",
+      "src": "Logo512.png",
       "type": "image/png",
       "sizes": "512x512"
     }

diff --git a/src/components/main/Footer.js b/src/components/main/Footer.js
@@ -20,7 +20,7 @@ export default function Footer() {
       </InfoDiv>
       <VlineDiv />
       <GithubDiv>
-        <a href="https://open-set-go.netlify.app/">
+        <a href="https://docs.open-set-go.com/">
           <DocsP>DOCS</DocsP>
         </a>
         <a href="https://github.com/AgainIoT/Open-Set-Go">

diff --git a/src/components/main/Welcome.js b/src/components/main/Welcome.js
@@ -2,7 +2,7 @@ import Stack from "@mui/material/Stack";
 import { Button } from "@mui/material";
 import propTypes from "prop-types";
 import { useRecoilValue } from "recoil";
-import { token } from "../../recoil/authorize";
+import { isLogin } from "../../recoil/authorize";
 import { useNavigate } from "react-router-dom";
 import styled from "styled-components";
 import { COLOR } from "../../styles/color.js";
@@ -14,7 +14,7 @@ const handleLogin = () => {
   window.location.href = githubURL;
 };
 export const Welcome = (ref) => {
-  const accessToken = useRecoilValue(token);
+  const Logined = useRecoilValue(isLogin);
   const navigate = new useNavigate();
   return (
     <StWelcome>
@@ -31,7 +31,7 @@ export const Welcome = (ref) => {
         >
           learn more
         </LearnmoreBtn>
-        {accessToken ? (
+        {Logined === true ? (
           <LoginBtn variant="contained" onClick={() => navigate("/step1")}>
             get started
           </LoginBtn>
@@ -57,7 +57,11 @@ const StWelcome = styled.div`
   text-align: center;
   justify-content: center;
   height: 80vh;
-  background: linear-gradient(to bottom, ${COLOR.MAIN_HOVER}, ${COLOR.MAIN_BACKGROUND});
+  background: linear-gradient(
+    to bottom,
+    ${COLOR.MAIN_HOVER},
+    ${COLOR.MAIN_BACKGROUND}
+  );
 `;
 
 export const Title = styled.h1`

diff --git a/src/index.js b/src/index.js
@@ -2,7 +2,6 @@ import React from "react";
 import ReactDOM from "react-dom/client";
 import "./index.css";
 import App from "./App";
-import { CookiesProvider } from "react-cookie";
 import reportWebVitals from "./reportWebVitals";
 import { RecoilRoot, RecoilEnv } from "recoil";
 

diff --git a/src/layout/Header.js b/src/layout/Header.js
@@ -18,8 +18,9 @@ import MenuIcon from "@mui/icons-material/Menu";
 import LOGO from "../../src/assets/images/Logo.svg";
 import axios from "axios";
 import { useRecoilState, useSetRecoilState } from "recoil";
-import { avatar, id, name, token } from "../recoil/authorize";
+import { avatar, id, name, isLogin } from "../recoil/authorize";
 import styled from "styled-components";
+
 const ElevationScroll = (props) => {
   const { children, window } = props;
   // Note that you normally won't need to set the window ref as useScrollTrigger
@@ -42,17 +43,44 @@ ElevationScroll.propTypes = {
    */
   window: PropTypes.func,
 };
+
+async function checkTokenValid() {
+  const isTokenValid = await axios.get(
+    `${process.env.REACT_APP_SERVER_URL}/auth/checkToken`,
+    {
+      validateStatus: (status) => {
+        return status < 500;
+      },
+      withCredentials: true,
+    },
+  );
+  return isTokenValid.status < 400;
+}
+
 export const Header = (props) => {
   const [anchorElNav, setAnchorElNav] = useState(null);
   const [anchorElUser, setAnchorElUser] = useState(null);
   const [src, setSrc] = useRecoilState(avatar);
   const [userId, setUserId] = useRecoilState(id);
   const [userName, setUserName] = useRecoilState(name);
-  const setToken = useSetRecoilState(token);
+  const setIsLogin = useSetRecoilState(isLogin);
+
+  const checkIsLogin = async () => {
+    const loggedIn = await checkTokenValid();
+    if (loggedIn) {
+      setSrc(localStorage.avatar);
+      setUserId(localStorage.id);
+      setUserName(localStorage.name);
+    } else {
+      localStorage.removeItem("id");
+      localStorage.removeItem("name");
+      localStorage.removeItem("avatar");
+    }
+    setIsLogin(loggedIn);
+  };
+
   React.useEffect(() => {
-    setSrc(localStorage.avatar);
-    setUserId(localStorage.id);
-    setUserName(localStorage.name);
+    checkIsLogin();
   }, []);
   const handleOpenNavMenu = (event) => {
     setAnchorElNav(event.currentTarget);
@@ -76,7 +104,7 @@ export const Header = (props) => {
       "",
       { withCredentials: true },
     );
-    setToken("");
+    setIsLogin(false);
     localStorage.setItem("id", "guest");
     localStorage.setItem("name", "guest");
     localStorage.setItem("avatar", "");
@@ -160,7 +188,7 @@ export const Header = (props) => {
                 <MenuItem
                   key={"Docs"}
                   onClick={() =>
-                    handleOpenNewTab("https://open-set-go.netlify.app/")
+                    handleOpenNewTab("https://docs.open-set-go.com")
                   }
                 >
                   <Typography textAlign="center">Docs</Typography>
@@ -210,7 +238,7 @@ export const Header = (props) => {
               <MenuItemWrapper
                 key="docs"
                 onClick={() =>
-                  handleOpenNewTab("https://open-set-go.netlify.app/")
+                  handleOpenNewTab("https://docs.open-set-go.com")
                 }
               >
                 Docs

diff --git a/src/pages/Login.js b/src/pages/Login.js
@@ -4,8 +4,7 @@ import { Title } from "../components/main/Welcome";
 import { useNavigate } from "react-router-dom";
 import { useEffect } from "react";
 import { useSetRecoilState } from "recoil";
-import { avatar, id, name, token } from "../recoil/authorize";
-import { Cookies } from "react-cookie";
+import { avatar, id, isLogin, name } from "../recoil/authorize";
 import propTypes from "prop-types";
 
 let cnt = 0;
@@ -16,8 +15,7 @@ function LoginPage() {
   const setAvatar = useSetRecoilState(avatar);
   const navigate = useNavigate();
 
-  const cookies = new Cookies();
-  const setToken = useSetRecoilState(token);
+  const setIsLogin = useSetRecoilState(isLogin);
 
   const login = async () => {
     if (!cnt++) {
@@ -58,15 +56,13 @@ function LoginPage() {
     );
     if (200 > res.status || res.status >= 300) {
       alert("login failed");
+      setIsLogin(false);
     } else {
-      const accessToken = cookies.get("Authentication");
-      setToken(accessToken);
+      setIsLogin(true);
     }
   };
 
   useEffect(() => {
-    const accessToken = cookies.get("Authentication");
-    setToken(accessToken);
     login();
     navigate("/");
   }, []);

diff --git a/src/pages/MainPage.js b/src/pages/MainPage.js
@@ -3,21 +3,8 @@ import Footer from "../components/main/Footer";
 import Steps from "../components/main/Steps";
 import propTypes from "prop-types";
 import { Header } from "../layout/Header";
-import { Cookies } from "react-cookie";
-import { useEffect } from "react";
-import { useSetRecoilState } from "recoil";
-import { token } from "../recoil/authorize";
+
 function MainPage() {
-  const cookies = new Cookies();
-  const setAccessToken = useSetRecoilState(token);
-  useEffect(() => {
-    const accessToken = cookies.get("Authentication");
-    if (accessToken) {
-      setAccessToken(accessToken);
-    } else {
-      setAccessToken(null);
-    }
-  }, []);
   return (
     <>
       <Header burger={true} pages={["Steps"]} settings={["Logout"]} />

diff --git a/src/recoil/authorize.js b/src/recoil/authorize.js
@@ -1,8 +1,8 @@
 import { atom } from "recoil";
 
-export const token = atom({
-  key: "token",
-  default: null,
+export const isLogin = atom({
+  key: "isLogin",
+  default: false,
 });
 
 export const avatar = atom({