Skip to content

add signup #2131

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

Open
DohaData wants to merge 3 commits into
base: master
Choose a base branch
from
Open

add signup #2131

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
559244b
add signup
DohaData Jun 20, 2024
52ea70e
add trycatch
DohaData Jun 20, 2024
7e56357
finish lab
DohaData Jun 22, 2024
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
3 changes: 2 additions & 1 deletion .env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
PORT=3000
PORT=3000
SESS_SECRET=secret
33 changes: 22 additions & 11 deletions app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,35 +1,46 @@
// ℹ️ Gets access to environment variables/settings
// https://www.npmjs.com/package/dotenv
require('dotenv/config');
require("dotenv/config");

// ℹ️ Connects to the database
require('./db');
require("./db");

// Handles http requests (express is node js framework)
// https://www.npmjs.com/package/express
const express = require('express');
const express = require("express");

// Handles the handlebars
// https://www.npmjs.com/package/hbs
const hbs = require('hbs');
const hbs = require("hbs");

const app = express();

// ℹ️ This function is getting exported from the config folder. It runs most middlewares
require('./config')(app);
require("./config")(app);

require("./config/session.config")(app);

// default value for title local
const projectName = 'lab-express-basic-auth';
const capitalized = string => string[0].toUpperCase() + string.slice(1).toLowerCase();
const projectName = "lab-express-basic-auth";
const capitalized = (string) =>
string[0].toUpperCase() + string.slice(1).toLowerCase();

app.locals.title = `${capitalized(projectName)}- Generated with Ironlauncher`;

// 👇 Start handling routes here
const index = require('./routes/index');
app.use('/', index);
const index = require("./routes/index");
app.use("/", index);

const authRoutes = require("./routes/auth");
app.use("/", authRoutes);

const mainRoutes = require("./routes/main");
app.use("/", mainRoutes);

const privateRoutes = require("./routes/private");
app.use("/", privateRoutes);

// ❗ To handle errors. Routes that don't exist or errors that you handle in specific routes
require('./error-handling')(app);
require("./error-handling")(app);

module.exports = app;

34 changes: 34 additions & 0 deletions config/session.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
// require session
const session = require('express-session');

const MongoStore = require('connect-mongo');

// since we are going to USE this middleware in the app.js,
// let's export it and have it receive a parameter
module.exports = app => {
// <== app is just a placeholder here
// but will become a real "app" in the app.js
// when this file gets imported/required there

// required for the app when deployed to Heroku (in production)
app.set('trust proxy', 1);

// use session
app.use(
session({
secret: process.env.SESS_SECRET,
store: MongoStore.create({
mongoUrl: process.env.MONGODB_URI || 'mongodb://localhost/lab-express-basic-auth',
ttl: 60 * 60 * 24 // 1 day
}),
resave: true,
saveUninitialized: true,
cookie: {
sameSite: process.env.NODE_ENV === 'production' ? 'none' : 'lax',
secure: process.env.NODE_ENV === 'production',
httpOnly: true,
maxAge: 600000 // 60 * 1000 ms === 1 min
}
})
);
};
21 changes: 21 additions & 0 deletions middleware/isLoggedIn.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
// middleware/route-guard.js

// checks if the user is logged in when trying to access a specific page
const isLoggedIn = (req, res, next) => {
if (!req.session.currentUser) {
return res.redirect("/login");
}
next();
};

// if an already logged in user tries to access the login page it
// redirects the user to the home page
const isLoggedOut = (req, res, next) => {
if (req.session.currentUser) {
return res.redirect("/");
}
next();
};

module.exports = isLoggedIn;

12 changes: 12 additions & 0 deletions middleware/isLoggedOut.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
// middleware/route-guard.js

// if an already logged in user tries to access the login page it
// redirects the user to the home page
const isLoggedOut = (req, res, next) => {
if (req.session.currentUser) {
return res.redirect("/");
}
next();
};

module.exports = isLoggedOut;
2 changes: 1 addition & 1 deletion models/User.model.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const userSchema = new Schema({
type: String,
unique: true
},
password: String
passwordHash: String
});

const User = model("User", userSchema);
Expand Down
3 changes: 3 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,12 @@
"dev": "nodemon server.js"
},
"dependencies": {
"bcrypt": "^5.1.1",
"connect-mongo": "^5.1.0",
"cookie-parser": "^1.4.5",
"dotenv": "^8.2.0",
"express": "^4.17.1",
"express-session": "^1.18.0",
"hbs": "^4.1.1",
"mongoose": "^6.1.2",
"morgan": "^1.10.0",
Expand Down
Binary file added public/images/funny-cat.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/office-meme.gif
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 5 additions & 1 deletion public/stylesheets/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,9 @@ body {
}

a {
color: #00B7FF;
color: #00b7ff;
}

img {
width: 80vw;
}
96 changes: 96 additions & 0 deletions routes/auth.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
const express = require("express");
const bcrypt = require("bcrypt");
const User = require("../models/User.model");

const isLoggedIn = require("../middleware/isLoggedIn");
const isLoggedOut = require("../middleware/isLoggedOut");

const router = express.Router();

const saltRounds = 10;

/* GET home page */
router.get("/signup", isLoggedOut, (req, res, next) => {
res.render("auth/signup");
});

// auth.routes.js
// the imports, get and post route remain untouched for now

router.get("/userProfile", isLoggedIn, async (req, res) => {
try {
const user = await User.findOne({
username: req.session.currentUser.username,
});
res.render("auth/profile", user);
} catch (error) {
console.log(error);
res.redirect("/");
}
});

router.post("/signup", isLoggedOut, async (req, res, next) => {
// console.log("The form data: ", req.body);

const { username, email, password } = req.body;

const hashedPassword = await bcrypt

.genSalt(saltRounds)

.then((salt) => bcrypt.hash(password, salt))

.then((hashedPassword) => {
return hashedPassword;
})

.catch((error) => next(error));

try {
const user = await User.create({
username,
email,
passwordHash: hashedPassword,
});
req.session.currentUser = user;
res.redirect("/userProfile");
} catch (error) {
console.log(error);
res.redirect("/");
}
});

router.get("/login", isLoggedOut, (req, res, next) => {
res.render("auth/login");
});

router.post("/login", isLoggedOut, async (req, res, next) => {
const { username, password } = req.body;

try {
const user = await User.findOne({ username });

if (!user) {
res.render("auth/login", { error: "Invalid login" });
return;
}

if (bcrypt.compareSync(password, user.passwordHash)) {
req.session.currentUser = user;
res.redirect("/userProfile");
}
} catch (error) {
next(error);
}
});

router.post("/logout", isLoggedIn, (req, res, next) => {
req.session.destroy((err) => {
if (err) {
next(err);
}
});
res.redirect("/");
});

module.exports = router;
11 changes: 11 additions & 0 deletions routes/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
const express = require("express");

const router = express.Router();

const isLoggedIn = require("../middleware/isLoggedIn");

router.get("/main", isLoggedIn, (req, res, next) => {
res.render("main");
});

module.exports = router;
11 changes: 11 additions & 0 deletions routes/private.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
const express = require("express");

const router = express.Router();

const isLoggedIn = require("../middleware/isLoggedIn");

router.get("/private", isLoggedIn, (req, res, next) => {
res.render("private");
});

module.exports = router;
22 changes: 22 additions & 0 deletions views/auth/login.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{{!-- views/auth/login.hbs --}}

<div id="form">
<h2>Login</h2>

<form action="/login" method="POST">

<label> Username
<input type="username" name="username" placeholder="username" />
</label>

<label>Password
<input type="password" name="password" placeholder="********" />
</label>

<button type="submit">Login</button>

{{#if errorMessage}}
<p class="error">{{errorMessage}}</p>
{{/if}}
</form>
</div>
2 changes: 2 additions & 0 deletions views/auth/profile.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<p>This is your profile page my friend!</p>
<p>{{ username }}</p>
23 changes: 23 additions & 0 deletions views/auth/signup.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{{!-- views/auth/signup.hbs --}}

<div id="form">
<h2>Signup</h2>
<form action="/signup" method="POST">

<label> Username
<input type="text" name="username" placeholder="ironhacker" />
</label>

<label> Email
<input type="email" name="email" placeholder="rockstar@ironhack.com" />
</label>

<label> Password
<input type="password" name="password" placeholder="********" />
</label>

<button type="submit">Create account</button>

{{!-- error message will be added here --}}
</form>
</div>
7 changes: 7 additions & 0 deletions views/index.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,9 @@
<h1>{{title}}</h1>
<p>Welcome to {{title}}</p>

<a href="/main">Main</a>
<a href="/login">Login</a>
<a href="/signup">Signup</a>
<form action="/logout" method="POST">
<button type="submit">Logout</button>
</form>
5 changes: 5 additions & 0 deletions views/main.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<h1>Main Page</h1>

<a href="/">Home Page</a>

<img src="/images/funny-cat.jpg" alt="Funny cat" />
3 changes: 3 additions & 0 deletions views/private.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<h1>Super secret Page</h1>

<img src="/images/office-meme.gif" alt="Office Meme" />