Merge branch 'develop' into r/workspace/authenticator

Signed-off-by: Luan <63563893+ReddixT@users.noreply.github.com>

Author: ReddixT

lumium-api/src/controllers/auth.ts

@@ -51,6 +51,10 @@ export const signUp = async (req: express.Request<UserAuthDTO>, res: express.Res
     if (exists) {
         return res.status(500).contentType("application/json").send({ status: "EMAIL_ALREADY_EXISTS", reason: "email already exists" });
     }
+    exists = await dataSource.getRepository(User).count({ where: { nickName: req.body.nickName?.toLowerCase() } }) != 0;
+    if (exists) {
+        return res.status(500).contentType("application/json").send({ status: "USERNAME_ALREADY_EXISTS", reason: "username is already taken" });
+    }
     let salt = crypto.randomBytes(64);
     const derivedKey = crypto.pbkdf2Sync(
         Buffer.from(req.body.password, 'utf8'),

lumium-space/pages/[workspaceId]/index.tsx

@@ -15,7 +15,7 @@ import {
 import React, { useState } from 'react'
 import { useApi } from '@hooks/api';
 import Router from 'next/router';
-import { AUTH_PASSWORD_RESET, AUTH_SIGNIN, AUTH_SIGNUP, ROOT, SPACES_NEW } from '@routes/space';
+import { AUTH_PASSWORD_RESET, AUTH_SIGNIN, AUTH_SIGNUP, ROOT, SPACES_OVERVIEW } from '@routes/space';
 import { useUserInfo } from '@hooks/api';
 import { ViewIcon, ViewOffIcon } from '@chakra-ui/icons';
 import { AuthBox } from '@components/auth/AuthBox';
@@ -40,7 +40,7 @@ const SignIn: React.FC = () => {
                     if (info?.recentWorkspace?.id) {
                         Router.push(ROOT + info?.recentWorkspace?.id);
                     } else {
-                        Router.push(SPACES_NEW);
+                        Router.push(SPACES_OVERVIEW);
                     };
                 });
             }

lumium-space/pages/auth/signin.tsx

@@ -17,7 +17,7 @@ import React, { useState } from 'react';
 import { useApi } from "@hooks/api";
 import Router from 'next/router';
 import { ViewIcon, ViewOffIcon } from '@chakra-ui/icons';
-import { AUTH_SIGNIN, AUTH_SIGNUP, SPACES_NEW } from '@routes/space';
+import { AUTH_SIGNIN, AUTH_SIGNUP, SPACES_OVERVIEW } from '@routes/space';
 import { AuthBox } from '@components/auth/AuthBox';
 import { useFormik } from 'formik';
 import { ReasonDTO } from '@types';
@@ -37,7 +37,7 @@ const SignUp: React.FC = () => {
             nickName: nickName
         }).then((res) => {
             if (res.status == 200) {
-                Router.push(SPACES_NEW);
+                Router.push(SPACES_OVERVIEW);
             }
         }, (err) => setError(err.response.data));
     };

lumium-space/pages/auth/signup.tsx

@@ -1,6 +1,6 @@
 import { useApi, useUserInfo } from "@hooks/api";
 import { SECURE_PONG } from "@routes/api/v1";
-import { AUTH_SIGNIN, ROOT, SPACES_NEW } from "@routes/space";
+import { AUTH_SIGNIN, ROOT, SPACES_OVERVIEW } from "@routes/space";
 import Router from "next/router";
 import { useEffect } from "react";
 
@@ -15,14 +15,14 @@ const Spaces: React.FC = () => {
                     if (info?.recentWorkspace) {
                         Router.push(ROOT + info?.recentWorkspace.id);
                     } else {
-                        Router.push(SPACES_NEW);
+                        Router.push(SPACES_OVERVIEW);
                     };
                 });
             } else {
                 Router.push(AUTH_SIGNIN);
             }
         });
-    }, []);
+    }, [api, refetchUserInfo]);
 
     return null;
 }

lumium-space/pages/spaces/[[...path]].tsx

@@ -1,4 +1,4 @@
-import React, { useRef, useState } from 'react';
+import React, { useState } from 'react';
 import {
     Progress,
     ButtonGroup,
@@ -17,13 +17,16 @@ import { Authenticator } from '@components/security/Authenticator';
 import { ViewIcon, ViewOffIcon } from '@chakra-ui/icons';
 import { create_workspace } from 'lumium-renderer';
 import { useFormik } from 'formik';
+import { SPACES } from '@routes/space';
+import Router from 'next/router';
 
 const MultistepForm: React.FC = () => {
     const [showPassword, setShowPassword] = useState(false);
     const [downloadedKeys, setDownloadedKeys] = useState(false);
     const [credentialsMatchError, setCredentialsMatchError] = useState(false);
     const [step, setStep] = useState(1);
     const [progress, setProgress] = useState(50);
+
     const nextStep = () => {
         if (formik.values.password == formik.values.passwordConfirm) {
             setStep(step + 1);
@@ -36,15 +39,20 @@ const MultistepForm: React.FC = () => {
             setCredentialsMatchError(true);
         }
     };
+
     const handleEnter = (event) => {
         if (event.key == "Enter") {
             nextStep();
         };
     };
+
     const handleDownloadKeys = () => {
-        create_workspace(formik.values.password, formik.values.name);
-        setDownloadedKeys(true);
+        create_workspace(formik.values.password, formik.values.name).then(() => {
+            setDownloadedKeys(true);
+            Router.push(SPACES);
+        });
     };
+
     const formik = useFormik({
         initialValues: {
             name: "",
@@ -56,6 +64,7 @@ const MultistepForm: React.FC = () => {
         },
         validateOnChange: (false),
     });
+
     return (
         <Authenticator>
             <Flex
@@ -79,11 +88,11 @@ const MultistepForm: React.FC = () => {
                         step === 1 && (
                             <>
                                 <Heading w="100%" textAlign={'center'} fontWeight="normal" mb="2%">
-                                    Space Creation
+                                    Create a new workspace
                                 </Heading>
                                 <FormControl isRequired>
                                     <FormLabel fontWeight={'normal'}>
-                                        Your Space Name
+                                        Workspace Name
                                     </FormLabel>
                                     <Input
                                         name={"name"}
@@ -93,8 +102,8 @@ const MultistepForm: React.FC = () => {
                                         data-cy={"nameInput"}
                                     />
                                 </FormControl>
-                                <FormControl isRequired>
-                                    <FormLabel>Password</FormLabel>
+                                <FormControl isRequired mt="5">
+                                    <FormLabel>Master Workspace Password</FormLabel>
                                     <InputGroup>
                                         <Input
                                             name={"password"}
@@ -115,7 +124,7 @@ const MultistepForm: React.FC = () => {
                                         </InputRightElement>
                                     </InputGroup>
                                 </FormControl>
-                                <FormControl isRequired isInvalid={credentialsMatchError}>
+                                <FormControl isRequired isInvalid={credentialsMatchError} mt="5" >
                                     <FormLabel>Repeat Password</FormLabel>
                                     <Input
                                         name={"passwordConfirm"}
@@ -134,15 +143,30 @@ const MultistepForm: React.FC = () => {
                                     <Heading w="100%" textAlign={'center'} fontWeight="normal" mb="2%">
                                         Download Recovery Keys
                                     </Heading>
-                                    <Text w="100%" textAlign={'center'}>
+                                    <Heading textAlign={'center'}>
+                                        DISCLAIMER
+                                    </Heading>
+                                    <Text w="100%" mt={"5"}>
                                         Download your recovery keys and secure them in a safe location. These will be needed in case you forget your password.
                                     </Text>
-                                    <Flex w="100%" justifyContent="center">
-                                        <Button backgroundColor={"lightgreen"} onClick={handleDownloadKeys} data-cy={"downloadButton"}>Download Keys and Create Space</Button>
+                                    <Text w="100%" mt={"5"}>
+                                        If you do not have access to your password or your recovery codes, you will not be able to decrypt the content in your workspace. We at lumium will not be able to help you recover your data.
+                                    </Text>
+                                    <Text w="100%" mt={"5"}>
+                                        As your data is fully end-to-end encrypted, key management is your sole responsibility. You will be able to generate additional codes and invalidate existing codes later on.
+                                    </Text>
+                                    <Text w="100%" mt={"5"}>
+                                        As soon as you click the button below, your workspace will be created and you will be prompted to download your recovery keys. The downloaded file will be named `lumium_recovery_keys.txt` and will contain one key per line.
+                                    </Text>
+                                    <Text w="100%" mt={"5"}>
+                                        lumium cannot read your workspace content, except for some metadata (information like which users have access to which workspace, your workspace title, which page was created by which user, when was the last time a user has logged in etc.). We cannot read data like the titles/content of pages in your workspace.
+                                    </Text>
+                                    <Flex w="100%" mt={"5"} justifyContent="center">
+                                        <Button backgroundColor={"darkgreen"} onClick={handleDownloadKeys} data-cy={"downloadButton"}>I have read the above disclaimer and understand my own responsibility</Button>
                                     </Flex>
                                 </>
                         )}
-                    <ButtonGroup w="100%" mt="auto">
+                    <ButtonGroup w="100%" mt="5">
                         <Flex w="100%" justifyContent="space-between">
                             <Flex>
                                 <Button
@@ -159,6 +183,7 @@ const MultistepForm: React.FC = () => {
                                 >
                                     Back
                                 </Button>
+                                {step!=2 &&
                                 <Button
                                     w="7rem"
                                     type="submit"
@@ -167,19 +192,8 @@ const MultistepForm: React.FC = () => {
                                 >
                                     Next
                                 </Button>
+                                }
                             </Flex>
-                            {
-                                downloadedKeys && (
-                                    <Button
-                                        w="7rem"
-                                        colorScheme="red"
-                                        variant="solid"
-                                        data-cy={"submitButton"}
-                                    >
-                                        Submit
-                                    </Button>
-                                )
-                            }
                         </Flex>
                     </ButtonGroup>
                 </form>

lumium-space/pages/spaces/create.tsx

@@ -4,7 +4,7 @@ import {
     Flex,
 } from '@chakra-ui/react';
 import Router from 'next/router';
-import { SPACES_CREATE, SPACES_JOIN } from '@routes/space';
+import { SPACES_CREATE } from '@routes/space';
 import { Authenticator } from '@components/security/Authenticator';
 
 const CreateOrJoin: React.FC = () => {
@@ -21,10 +21,10 @@ const CreateOrJoin: React.FC = () => {
                     padding={"4%"}
                 >
                     <Text fontSize={'6xl'} fontWeight={800}>
-                        Create Space
+                        Create workspace
                     </Text>
                     <Text fontSize={'2xl'}>
-                        Create your own space now and add collaborators.
+                        Create your own workspace now and add collaborators.
                     </Text>
                     <Button
                         mt="auto"
@@ -46,43 +46,9 @@ const CreateOrJoin: React.FC = () => {
                         Start now
                     </Button>
                 </Flex>
-                <Flex
-                    m={"5%"}
-                    w={'30%'}
-                    boxShadow={'2xl'}
-                    rounded={'md'}
-                    overflow={'hidden'}
-                    flexDir="column"
-                    padding={"4%"}
-                >
-                    <Text fontSize={'6xl'} fontWeight={800}>
-                        Join Space
-                    </Text>
-                    <Text fontSize={'2xl'}>
-                        Join an existing collaborative Space with Spacekey and Spacepassword.
-                    </Text>
-                    <Button
-                        mt="auto"
-                        w={'full'}
-                        bg={'green.400'}
-                        color={'white'}
-                        rounded={'xl'}
-                        boxShadow={'0 5px 20px 0px rgb(72 187 120 / 43%)'}
-                        _hover={{
-                            bg: 'green.500',
-                        }}
-                        _focus={{
-                            bg: 'green.500',
-                        }}
-                        data-cy={"joinButton"}
-                        onClick={() => Router.push(SPACES_JOIN)}
-                    >
-                        Start now
-                    </Button>
-                </Flex>
             </Flex>
         </Authenticator>
     );
 };
 
-export default CreateOrJoin;
+export default CreateOrJoin;

lumium-space/pages/spaces/join.tsx

@@ -5,9 +5,8 @@ export const AUTH_SIGNIN = AUTH + '/signin';
 export const AUTH_SIGNUP = AUTH + '/signup';
 export const AUTH_PASSWORD_RESET = AUTH + '/reset-password';
 export const SPACES = ROOT + 'spaces';
-export const SPACES_NEW = SPACES + '/new';
+export const SPACES_OVERVIEW = SPACES + '/overview';
 export const SPACES_CREATE = SPACES + '/create';
-export const SPACES_JOIN = SPACES + '/join';
 export const WORKSPACE = ROOT + 'workspace';
 
 export const AUTH_USER = AUTH + '/user';