edit the code b00tc4mp#140

staff/adrian-martin/socialcode/api/data/index.js

@@ -1,12 +1,6 @@
 import fs from 'fs'
 import { SystemError } from '../error.js'
 
-// import { fileURLToPath } from "url";
-// import path from "path" 
-
-// const __filename = fileURLToPath(import.meta.url);
-// const __dirname = path.dirname(__filename);
-
 const data = {}
 
 data.findUser = (condition, callback) => {
@@ -28,9 +22,7 @@ data.findUser = (condition, callback) => {
 }
 
 data.insertUser = (user, callback) => {
-    // const filepath = path.resolve(__dirname, "./users.json")
 
-
     fs.readFile('./data/users.json', 'utf8', (error, json) => {
         if (error) {
             callback(new SystemError(error.message))
@@ -46,7 +38,7 @@ data.insertUser = (user, callback) => {
 
         const newJson = JSON.stringify(users)
 
-        fs.writeFile(filepath, newJson, error => {
+        fs.writeFile('./data/users.json', newJson, error => {
             if (error) {
                 callback(new SystemError(error.message))
 

staff/adrian-martin/socialcode/api/data/users.json

@@ -12,5 +12,12 @@
         "email": "[email protected]",
         "username": "AdrianGon",
         "password": "321321321"
+    },
+    {
+        "name": "Inaki",
+        "surname": "Barrera",
+        "email": "[email protected]",
+        "username": "Brutalito",
+        "password": "123123123"
     }
 ]

staff/adrian-martin/socialcode/api/index.js

@@ -41,14 +41,31 @@ api.post('/users/auth', jsonBodyParser, (req, res) => {
 
                 return
             }
-
+            console.log(`User ${username} authenticated`)
             res.status(200).send()
         })
     } catch (error) {
         res.status(500).json({error: error.constructor.name, message: error.message})
     } 
 })
 
+// api.post('/home', jsonBodyParser, (req, res) => {
+//     const {username} = req.body
+
+//     try {
+//         logic.findUser(username, error => {
+//             if (error) {
+//                 res.status(500).json({error: error.constructor.name, message: error.message})
+
+//                 return
+//             }
+//             res.status(200).send()
+//         })
+//     } catch (error) {
+//         res.status(500).json({error: error.constructor.name, message: error.message})
+//     } 
+// })
+
 
 api.get('/posts', (req, res) => {
 

staff/adrian-martin/socialcode/api/logic/index.js

@@ -85,7 +85,7 @@ logic.authenticateUser = (username, password, callback) => {
 
             return
         }
-        callback(null)
+        callback(null, user.username)
     })
 }
 

staff/adrian-martin/socialcode/app/logic.js → staff/adrian-martin/socialcode/api/public/app/logic.js

@@ -5,7 +5,7 @@ const USERNAME_REGEX = /^[a-zA-Z0-9-_]+$/ //  /^[\w-]+$/
 const PASSWORD_REGEX = /^[a-zA-Z0-9-_$%&=\[\]\{\}\<\>\(\)]{8,}$/
 const NAME_REGEX = /^[a-zA-Z=\[\]\{\}\<\>\(\)]{1,}$/
 
-logic.registerUser = (name, surname, email, username, password, passwordRepeat, calback) => {
+logic.registerUser = (name, surname, email, username, password, passwordRepeat, callback) => {
     if (!NAME_REGEX.test(name))
         throw new ContentError('name is not valid')
 
@@ -28,7 +28,7 @@ logic.registerUser = (name, surname, email, username, password, passwordRepeat,
 
     xhr.onload = () => {
         if (xhr.status === 201) {
-            calback(null)
+            callback(null)
 
             return
         }
@@ -37,12 +37,12 @@ logic.registerUser = (name, surname, email, username, password, passwordRepeat,
 
         const constructor = errors[error]
 
-        calback(new constructor(message))
+        callback(new constructor(message))
     }
 
     xhr.open('POST', 'http://localhost:8080/users')
 
-    const body = { name, surname, email, username, password, passwordRepeat}
+    const body = { name, surname, email, username, password, passwordRepeat }
 
     const json = JSON.stringify(body)
 
@@ -51,7 +51,7 @@ logic.registerUser = (name, surname, email, username, password, passwordRepeat,
 
 }
 
-logic.loginUser = (username, password, calback) => {
+logic.loginUser = (username, password, callback) => {
     if (!USERNAME_REGEX.test(username))
         throw new ContentError('username is not valid')
 
@@ -65,7 +65,7 @@ logic.loginUser = (username, password, calback) => {
         if (xhr.status === 200) {
             sessionStorage.username = username
 
-            calback(null)
+            callback(null)
 
             return
         }
@@ -74,12 +74,12 @@ logic.loginUser = (username, password, calback) => {
 
         const constructor = errors[error]
 
-        calback(new constructor(message))
+        callback(new constructor(message))
     }
 
     xhr.open('POST', 'http://localhost:8080/users/auth')
 
-    const body = {username, password}
+    const body = { username, password }
 
     const json = JSON.stringify(body)
 
@@ -93,10 +93,35 @@ logic.logoutUser = () => {
     delete sessionStorage.username
 }
 
-logic.getUsername = () => {
-    const user = data.findUser(user => user.username === sessionStorage.username)
+logic.getUsername = (username, callback) => {
+    data.findUser((user) => {
 
-    return user.name
+        const xhr = new XMLHttpRequest
+
+        xhr.onload = () => {
+            if (xhr.status === 200) {
+                sessionStorage.username = username
+
+                callback(null)
+
+                return
+            }
+
+            const { error, message } = JSON.parse(xhr.response)
+
+            const constructor = errors[error]
+
+            callback(new constructor(message))
+        }
+        xhr.open('POST', 'http://localhost:8080/users/auth')
+
+        const body = { username }
+
+        const json = JSON.stringify(body)
+
+        xhr.setRequestHeader('Content-Type', 'application/json')
+        xhr.send(json)
+    })
 }
 
 logic.getAllPosts = () => {

staff/adrian-martin/socialcode/app/login/loginForm.js → staff/adrian-martin/socialcode/api/public/app/login/loginForm.js

@@ -47,9 +47,9 @@ class LoginForm extends FormWithFeedback{
     }
 
         getUsername() {
-            // const usernameField = this.children[0]
+            const usernameField = this.children[0]
 
-            // return usernameField.getValue()
+            return usernameField.getValue()
         }
 
         getPassword() {