backedn converted to ts
This commit is contained in:
+2
-1
@@ -48,5 +48,6 @@
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/uuid": "^9.0.2"
|
||||
}
|
||||
},
|
||||
"proxy": "http://localhost:5000"
|
||||
}
|
||||
|
||||
@@ -9,11 +9,6 @@ const Login = () => {
|
||||
const dispatch = useAppDispatch();
|
||||
const isAuthenticated = useAppSelector((state) => state.auth.isAuthenticated);
|
||||
|
||||
const onChangeEmail = () =>
|
||||
setEmail(email)
|
||||
const onChangePasword = () =>
|
||||
setPassword(password)
|
||||
|
||||
const onSubmit = async (e: React.SyntheticEvent) => {
|
||||
e.preventDefault();
|
||||
await dispatch(login(email, password));
|
||||
@@ -36,7 +31,7 @@ const Login = () => {
|
||||
placeholder="Email Address"
|
||||
name="email"
|
||||
value={email}
|
||||
onChange={onChangeEmail}
|
||||
onChange={(e) => setEmail(e.target.value)}
|
||||
/>
|
||||
</div>
|
||||
<div className="form-group">
|
||||
@@ -45,7 +40,7 @@ const Login = () => {
|
||||
placeholder="Password"
|
||||
name="password"
|
||||
value={password}
|
||||
onChange={onChangePasword}
|
||||
onChange={(e)=>setPassword(e.target.value)}
|
||||
//used to be "6"
|
||||
minLength={6}
|
||||
/>
|
||||
|
||||
@@ -40,7 +40,7 @@ const Register = () => {
|
||||
placeholder="Name"
|
||||
name="name"
|
||||
value={name}
|
||||
onChange={() => setName(name)}
|
||||
onChange={(e) => setName(e.target.value)}
|
||||
/>
|
||||
</div>
|
||||
<div className="form-group">
|
||||
@@ -49,7 +49,7 @@ const Register = () => {
|
||||
placeholder="Email Address"
|
||||
name="email"
|
||||
value={email}
|
||||
onChange={() => setEmail(email)}
|
||||
onChange={(e) => setEmail(e.target.value)}
|
||||
/>
|
||||
<small className="form-text">
|
||||
This site uses Gravatar so if you want a profile image, use a
|
||||
@@ -62,7 +62,7 @@ const Register = () => {
|
||||
placeholder="Password"
|
||||
name="password"
|
||||
value={password}
|
||||
onChange={() => setPassword(password)}
|
||||
onChange={(e) => setPassword(e.target.value)}
|
||||
/>
|
||||
</div>
|
||||
<div className="form-group">
|
||||
@@ -71,7 +71,7 @@ const Register = () => {
|
||||
placeholder="Confirm Password"
|
||||
name="password2"
|
||||
value={password2}
|
||||
onChange={() => setPassword2(password2)}
|
||||
onChange={(e) => setPassword2(e.target.value)}
|
||||
/>
|
||||
</div>
|
||||
<input type="submit" className="btn btn-primary" value="Register" />
|
||||
|
||||
+10
-9
@@ -1,20 +1,21 @@
|
||||
const mongoose = require('mongoose');
|
||||
const config = require('config');
|
||||
import mongoose from "mongoose";
|
||||
import config from 'config'
|
||||
|
||||
const db = config.get('mongoURI');
|
||||
|
||||
const connectDB = async () => {
|
||||
try {
|
||||
await mongoose.connect(db, {
|
||||
useNewUrlParser: true,
|
||||
useUnifiedTopology: true
|
||||
});
|
||||
if (typeof db === 'string')
|
||||
await mongoose.connect(db);
|
||||
|
||||
console.log('MongoDB Connected...');
|
||||
} catch (err) {
|
||||
} catch (err: unknown) {
|
||||
if (typeof err === 'string')
|
||||
console.error(err)
|
||||
else if (err instanceof Error)
|
||||
console.error(err.message);
|
||||
// Exit process with failure
|
||||
process.exit(1);
|
||||
}
|
||||
};
|
||||
|
||||
module.exports = connectDB;
|
||||
export default connectDB
|
||||
|
||||
+7
-4
@@ -1,7 +1,8 @@
|
||||
const config = require('config');
|
||||
const jwt = require('jsonwebtoken');
|
||||
import config from 'config'
|
||||
import jwt from 'jsonwebtoken'
|
||||
import type { Request, Response, NextFunction } from 'express';
|
||||
|
||||
module.exports = function (req, res, next) {
|
||||
function auth(req: Request, res: Response, next: NextFunction) {
|
||||
|
||||
// Get token from header
|
||||
const token = req.header('x-auth-token');
|
||||
@@ -16,7 +17,8 @@ module.exports = function (req, res, next) {
|
||||
if (error) {
|
||||
return res.status(401).json({ msg: 'Token is not valid' });
|
||||
} else {
|
||||
req.user = decoded.user;
|
||||
if ('user' in req && decoded && typeof decoded !== "string")
|
||||
req.user = decoded?.user;
|
||||
next();
|
||||
}
|
||||
});
|
||||
@@ -26,3 +28,4 @@ module.exports = function (req, res, next) {
|
||||
}
|
||||
|
||||
};
|
||||
export default auth
|
||||
|
||||
@@ -1,9 +1,10 @@
|
||||
const mongoose = require('mongoose');
|
||||
import mongoose from "mongoose";
|
||||
// middleware to check for a valid object id
|
||||
const checkObjectId = (idToCheck) => (req, res, next) => {
|
||||
import type { Request, Response, NextFunction } from "express";
|
||||
const checkObjectId = (idToCheck: string) => (req: Request, res: Response, next: NextFunction) => {
|
||||
if (!mongoose.Types.ObjectId.isValid(req.params[idToCheck]))
|
||||
return res.status(400).json({ msg: 'Invalid ID' });
|
||||
next();
|
||||
};
|
||||
|
||||
module.exports = checkObjectId;
|
||||
export default checkObjectId
|
||||
|
||||
+4
-2
@@ -1,4 +1,5 @@
|
||||
const mongoose = require("mongoose");
|
||||
import mongoose from "mongoose";
|
||||
|
||||
const Schema = mongoose.Schema;
|
||||
|
||||
const PostSchema = new Schema({
|
||||
@@ -49,4 +50,5 @@ const PostSchema = new Schema({
|
||||
},
|
||||
});
|
||||
|
||||
module.exports = mongoose.model("post", PostSchema);
|
||||
const Post = mongoose.model("post", PostSchema);
|
||||
export default Post
|
||||
|
||||
+3
-2
@@ -1,4 +1,4 @@
|
||||
const mongoose = require("mongoose");
|
||||
import mongoose from "mongoose";
|
||||
|
||||
const ProfileSchema = new mongoose.Schema({
|
||||
user: {
|
||||
@@ -110,4 +110,5 @@ const ProfileSchema = new mongoose.Schema({
|
||||
},
|
||||
});
|
||||
|
||||
module.exports = mongoose.model("profile", ProfileSchema);
|
||||
const Profile = mongoose.model("profile", ProfileSchema);
|
||||
export default Profile
|
||||
|
||||
+4
-2
@@ -1,4 +1,4 @@
|
||||
const mongoose = require("mongoose");
|
||||
import mongoose from "mongoose";
|
||||
|
||||
const UserSchema = new mongoose.Schema({
|
||||
name: {
|
||||
@@ -23,4 +23,6 @@ const UserSchema = new mongoose.Schema({
|
||||
},
|
||||
});
|
||||
|
||||
module.exports = mongoose.model("user", UserSchema);
|
||||
const User = mongoose.model("user", UserSchema);
|
||||
|
||||
export default User
|
||||
|
||||
Generated
+865
-29400
File diff suppressed because it is too large
Load Diff
+21
-15
@@ -1,11 +1,11 @@
|
||||
{
|
||||
"name": "mern-stack-front-to-back",
|
||||
"name": "devconnectts",
|
||||
"version": "1.0.0",
|
||||
"description": "",
|
||||
"main": "server.js",
|
||||
"main": "server.ts",
|
||||
"scripts": {
|
||||
"start": "node server",
|
||||
"server": "nodemon server",
|
||||
"start": "ts-node server.ts",
|
||||
"server": "ts-node-dev server.ts",
|
||||
"client": "npm start --prefix client --trace-depracation",
|
||||
"dev": "concurrently \"npm run server\" \"npm run client\"",
|
||||
"render": "NPM_CONFIG_PRODUCTION=false npm install --prefix client && npm run build --prefix client"
|
||||
@@ -13,19 +13,25 @@
|
||||
"author": "",
|
||||
"license": "ISC",
|
||||
"dependencies": {
|
||||
"axios": "^0.21.0",
|
||||
"axios": "^1.4.0",
|
||||
"bcryptjs": "^2.4.3",
|
||||
"client": "file:client",
|
||||
"config": "^3.3.3",
|
||||
"express": "^4.17.1",
|
||||
"express-validator": "^6.8.1",
|
||||
"gravatar": "^1.8.1",
|
||||
"jsonwebtoken": "^8.5.1",
|
||||
"mongoose": "^5.11.8",
|
||||
"normalize-url": "^5.3.0"
|
||||
"config": "^3.3.9",
|
||||
"cors": "^2.8.5",
|
||||
"express": "^4.18.2",
|
||||
"express-validator": "^7.0.1",
|
||||
"gravatar": "^1.8.2",
|
||||
"jsonwebtoken": "^9.0.1",
|
||||
"mongoose": "^7.4.1",
|
||||
"normalize-url": "^5.0.0",
|
||||
"ts-node": "^10.9.1",
|
||||
"ts-node-dev": "^2.0.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"concurrently": "^5.3.0",
|
||||
"nodemon": "^2.0.6"
|
||||
"@types/bcryptjs": "^2.4.2",
|
||||
"@types/config": "^3.3.0",
|
||||
"@types/express": "^4.17.17",
|
||||
"@types/gravatar": "^1.8.3",
|
||||
"@types/jsonwebtoken": "^9.0.2",
|
||||
"@types/uuid": "^9.0.2"
|
||||
}
|
||||
}
|
||||
|
||||
+34
-18
@@ -1,21 +1,33 @@
|
||||
const express = require("express");
|
||||
import express from 'express'
|
||||
import bcrypt from 'bcryptjs'
|
||||
import jwt from 'jsonwebtoken';
|
||||
|
||||
import auth from '../../middleware/auth'
|
||||
import config from 'config'
|
||||
import { check, validationResult } from "express-validator";
|
||||
|
||||
import User from '../../models/User'
|
||||
import type { Request, Response } from 'express';
|
||||
import { isUserId } from '../../utils';
|
||||
|
||||
const router = express.Router();
|
||||
const bcrypt = require("bcryptjs");
|
||||
const auth = require("../../middleware/auth");
|
||||
const jwt = require("jsonwebtoken");
|
||||
const config = require("config");
|
||||
const { check, validationResult } = require("express-validator");
|
||||
|
||||
const User = require("../../models/User");
|
||||
|
||||
// @route GET api/auth
|
||||
// @desc Get user by token
|
||||
// @access Private
|
||||
router.get("/", auth, async (req, res) => {
|
||||
router.get("/", auth, async (req: Request, res) => {
|
||||
try {
|
||||
const user = await User.findById(req.user.id).select("-password");
|
||||
let user: unknown = null
|
||||
if (isUserId(req)) {
|
||||
user = await User.findById(req.user.id).select("-password");
|
||||
res.json(user);
|
||||
} catch (err) {
|
||||
}
|
||||
else {
|
||||
throw new Error('missing id in request')
|
||||
}
|
||||
} catch (err: unknown) {
|
||||
if (typeof err === 'string')
|
||||
console.error(err)
|
||||
else if (err instanceof Error)
|
||||
console.error(err.message);
|
||||
res.status(500).send("Server Error");
|
||||
}
|
||||
@@ -30,7 +42,7 @@ router.post(
|
||||
check("email", "Please include a valid email").isEmail(),
|
||||
check("password", "Password is required").exists(),
|
||||
],
|
||||
async (req, res) => {
|
||||
async (req: Request, res: Response) => {
|
||||
const errors = validationResult(req);
|
||||
if (!errors.isEmpty()) {
|
||||
return res.status(400).json({ errors: errors.array() });
|
||||
@@ -60,21 +72,25 @@ router.post(
|
||||
id: user.id,
|
||||
},
|
||||
};
|
||||
|
||||
jwt.sign(
|
||||
const jwtSecret = config.get('jwtSecret')
|
||||
if (typeof jwtSecret === 'string') jwt.sign(
|
||||
payload,
|
||||
config.get("jwtSecret"),
|
||||
jwtSecret,
|
||||
{ expiresIn: 360000 },
|
||||
(err, token) => {
|
||||
if (err) throw err;
|
||||
res.json({ token });
|
||||
}
|
||||
);
|
||||
} catch (err) {
|
||||
else throw new Error('Error signing the jwt token')
|
||||
} catch (err: unknown) {
|
||||
if (typeof err === 'string')
|
||||
console.error(err)
|
||||
else if (err instanceof Error)
|
||||
console.error(err.message);
|
||||
res.status(500).send("Server error");
|
||||
}
|
||||
}
|
||||
);
|
||||
|
||||
module.exports = router;
|
||||
module.exports = router
|
||||
|
||||
+93
-37
@@ -1,11 +1,14 @@
|
||||
const express = require("express");
|
||||
const router = express.Router();
|
||||
const { check, validationResult } = require("express-validator");
|
||||
const auth = require("../../middleware/auth");
|
||||
|
||||
const Post = require("../../models/Post");
|
||||
const User = require("../../models/User");
|
||||
const checkObjectId = require("../../middleware/checkObjectId");
|
||||
import express, { Request, Response } from 'express'
|
||||
import { check, validationResult } from "express-validator";
|
||||
import auth from "../../middleware/auth";
|
||||
import Post from "../../models/Post";
|
||||
import User from "../../models/User";
|
||||
import checkObjectId from "../../middleware/checkObjectId";
|
||||
import { isUserId } from '../../utils';
|
||||
|
||||
|
||||
const router = express.Router();
|
||||
|
||||
// @route POST api/posts
|
||||
// @desc Create a post
|
||||
@@ -22,19 +25,29 @@ router.post(
|
||||
}
|
||||
|
||||
try {
|
||||
if (isUserId(req)) {
|
||||
const user = await User.findById(req.user.id).select("-password");
|
||||
|
||||
if (user) {
|
||||
const newPost = new Post({
|
||||
text: req.body.text,
|
||||
name: user.name,
|
||||
avatar: user.avatar,
|
||||
user: req.user.id,
|
||||
});
|
||||
|
||||
const post = await newPost.save();
|
||||
|
||||
res.json(post);
|
||||
} catch (err) {
|
||||
}
|
||||
else {
|
||||
throw new Error('Error finding the user')
|
||||
}
|
||||
}
|
||||
else {
|
||||
throw new Error('Error finding the user')
|
||||
}
|
||||
} catch (err: unknown) {
|
||||
if (typeof err === 'string')
|
||||
console.error(err)
|
||||
else if (err instanceof Error)
|
||||
console.error(err.message);
|
||||
res.status(500).send("Server Error");
|
||||
}
|
||||
@@ -48,7 +61,10 @@ router.get("/", auth, async (req, res) => {
|
||||
try {
|
||||
const posts = await Post.find().sort({ date: -1 });
|
||||
res.json(posts);
|
||||
} catch (err) {
|
||||
} catch (err: unknown) {
|
||||
if (typeof err === 'string')
|
||||
console.error(err)
|
||||
else if (err instanceof Error)
|
||||
console.error(err.message);
|
||||
res.status(500).send("Server Error");
|
||||
}
|
||||
@@ -66,7 +82,10 @@ router.get("/:id", auth, checkObjectId("id"), async (req, res) => {
|
||||
}
|
||||
|
||||
res.json(post);
|
||||
} catch (err) {
|
||||
} catch (err: unknown) {
|
||||
if (typeof err === 'string')
|
||||
console.error(err)
|
||||
else if (err instanceof Error)
|
||||
console.error(err.message);
|
||||
|
||||
res.status(500).send("Server Error");
|
||||
@@ -76,25 +95,32 @@ router.get("/:id", auth, checkObjectId("id"), async (req, res) => {
|
||||
// @route DELETE api/posts/:id
|
||||
// @desc Delete a post
|
||||
// @access Private
|
||||
router.delete("/:id", [auth, checkObjectId("id")], async (req, res) => {
|
||||
router.delete("/:id", [auth, checkObjectId("id")], async (req: Request, res: Response) => {
|
||||
try {
|
||||
const post = await Post.findById(req.params.id);
|
||||
const post = await Post.findOne({ _id: req.params.id });
|
||||
|
||||
if (!post) {
|
||||
return res.status(404).json({ msg: "Post not found" });
|
||||
}
|
||||
|
||||
// Check user
|
||||
if (post.user && isUserId(req)) {
|
||||
if (post.user.toString() !== req.user.id) {
|
||||
return res.status(401).json({ msg: "User not authorized" });
|
||||
}
|
||||
|
||||
await post.remove();
|
||||
}
|
||||
else {
|
||||
throw new Error('Error in req.user')
|
||||
}
|
||||
await post.deleteOne();
|
||||
|
||||
res.json({ msg: "Post removed" });
|
||||
} catch (err) {
|
||||
console.error(err.message);
|
||||
|
||||
} catch (err: unknown) {
|
||||
if (typeof err === 'string')
|
||||
console.error(err)
|
||||
else if (err instanceof Error)
|
||||
console.error(err.message);
|
||||
res.status(500).send("Server Error");
|
||||
}
|
||||
});
|
||||
@@ -107,16 +133,23 @@ router.put("/like/:id", auth, checkObjectId("id"), async (req, res) => {
|
||||
const post = await Post.findById(req.params.id);
|
||||
|
||||
// Check if the post has already been liked
|
||||
if (post.likes.some((like) => like.user.toString() === req.user.id)) {
|
||||
if (post && isUserId(req)) {
|
||||
if (post.likes.some((like) => like.user?.toString() === req.user.id)) {
|
||||
return res.status(400).json({ msg: "Post already liked" });
|
||||
}
|
||||
|
||||
post.likes.unshift({ user: req.user.id });
|
||||
const user: any = req.user.id
|
||||
// can't make string into ObjectID
|
||||
post.likes.unshift({ user });
|
||||
|
||||
await post.save();
|
||||
|
||||
return res.json(post.likes);
|
||||
} catch (err) {
|
||||
return res.json(post.likes)
|
||||
};
|
||||
} catch (err: unknown) {
|
||||
if (typeof err === 'string')
|
||||
console.error(err)
|
||||
else if (err instanceof Error)
|
||||
console.error(err.message);
|
||||
res.status(500).send("Server Error");
|
||||
}
|
||||
@@ -130,19 +163,29 @@ router.put("/unlike/:id", auth, checkObjectId("id"), async (req, res) => {
|
||||
const post = await Post.findById(req.params.id);
|
||||
|
||||
// Check if the post has not yet been liked
|
||||
if (!post.likes.some((like) => like.user.toString() === req.user.id)) {
|
||||
if (post && isUserId(req)) {
|
||||
|
||||
if (!post.likes.some((like) => like.user?.toString() === req.user.id)) {
|
||||
return res.status(400).json({ msg: "Post has not yet been liked" });
|
||||
}
|
||||
|
||||
// remove the like
|
||||
post.likes = post.likes.filter(
|
||||
({ user }) => user.toString() !== req.user.id
|
||||
({ user }) => {
|
||||
if (user)
|
||||
return user.toString() !== req.user.id
|
||||
return false
|
||||
}
|
||||
);
|
||||
|
||||
await post.save();
|
||||
|
||||
return res.json(post.likes);
|
||||
} catch (err) {
|
||||
}
|
||||
} catch (err: unknown) {
|
||||
if (typeof err === 'string')
|
||||
console.error(err)
|
||||
else if (err instanceof Error)
|
||||
console.error(err.message);
|
||||
res.status(500).send("Server Error");
|
||||
}
|
||||
@@ -163,22 +206,30 @@ router.post(
|
||||
}
|
||||
|
||||
try {
|
||||
if (isUserId(req) && req.params) {
|
||||
const user = await User.findById(req.user.id).select("-password");
|
||||
const post = await Post.findById(req.params.id);
|
||||
|
||||
if (user) {
|
||||
const newComment = {
|
||||
text: req.body.text,
|
||||
name: user.name,
|
||||
avatar: user.avatar,
|
||||
user: req.user.id,
|
||||
};
|
||||
|
||||
post.comments.unshift(newComment);
|
||||
|
||||
if (post) {
|
||||
post.comments.unshift(newComment as any);
|
||||
await post.save();
|
||||
|
||||
res.json(post.comments);
|
||||
} catch (err) {
|
||||
}
|
||||
throw new Error('Error in finding post')
|
||||
}
|
||||
throw new Error('Error in finding user')
|
||||
}
|
||||
throw new Error('Error in parsing the req')
|
||||
} catch (err: unknown) {
|
||||
if (typeof err === 'string')
|
||||
console.error(err)
|
||||
else if (err instanceof Error)
|
||||
console.error(err.message);
|
||||
res.status(500).send("Server Error");
|
||||
}
|
||||
@@ -193,29 +244,34 @@ router.delete("/comment/:id/:comment_id", auth, async (req, res) => {
|
||||
const post = await Post.findById(req.params.id);
|
||||
|
||||
// Pull out comment
|
||||
if (post) {
|
||||
const comment = post.comments.find(
|
||||
(comment) => comment.id === req.params.comment_id
|
||||
(comment: any) => comment.id === req.params.comment_id
|
||||
);
|
||||
// Make sure comment exists
|
||||
if (!comment) {
|
||||
return res.status(404).json({ msg: "Comment does not exist" });
|
||||
}
|
||||
// Check user
|
||||
if (comment.user.toString() !== req.user.id) {
|
||||
if ('user' in comment && comment.user && isUserId(req) && comment.user.toString() !== req.user.id) {
|
||||
return res.status(401).json({ msg: "User not authorized" });
|
||||
}
|
||||
|
||||
post.comments = post.comments.filter(
|
||||
({ id }) => id !== req.params.comment_id
|
||||
({ id }: any) => id !== req.params.comment_id
|
||||
);
|
||||
|
||||
await post.save();
|
||||
|
||||
return res.json(post.comments);
|
||||
} catch (err) {
|
||||
}
|
||||
} catch (err: unknown) {
|
||||
if (typeof err === 'string')
|
||||
console.error(err)
|
||||
else if (err instanceof Error)
|
||||
console.error(err.message);
|
||||
return res.status(500).send("Server Error");
|
||||
}
|
||||
});
|
||||
|
||||
module.exports = router;
|
||||
module.exports = router
|
||||
|
||||
+83
-33
@@ -1,21 +1,25 @@
|
||||
const express = require('express');
|
||||
const axios = require('axios');
|
||||
const config = require('config');
|
||||
const router = express.Router();
|
||||
const auth = require('../../middleware/auth');
|
||||
const { check, validationResult } = require('express-validator');
|
||||
// bring in normalize to give us a proper url, regardless of what user entered
|
||||
const normalize = require('normalize-url');
|
||||
const checkObjectId = require('../../middleware/checkObjectId');
|
||||
import express from 'express';
|
||||
import axios from 'axios';
|
||||
import config from 'config';
|
||||
|
||||
const Profile = require('../../models/Profile');
|
||||
const User = require('../../models/User');
|
||||
const Post = require('../../models/Post');
|
||||
import auth from '../../middleware/auth';
|
||||
import { check, validationResult } from 'express-validator';
|
||||
|
||||
// bring in normalize to give us a proper url, regardless of what user entered
|
||||
import normalize from 'normalize-url';
|
||||
import checkObjectId from '../../middleware/checkObjectId';
|
||||
|
||||
import Profile from '../../models/Profile';
|
||||
import User from '../../models/User';
|
||||
import Post from '../../models/Post';
|
||||
import { isUserId } from '../../utils';
|
||||
const router = express.Router();
|
||||
// @route GET api/profile/me
|
||||
// @desc Get current users profile
|
||||
// @access Private
|
||||
router.get('/me', auth, async (req, res) => {
|
||||
try {
|
||||
if (isUserId(req)) {
|
||||
const profile = await Profile.findOne({
|
||||
user: req.user.id
|
||||
}).populate('user', ['name', 'avatar']);
|
||||
@@ -25,7 +29,11 @@ router.get('/me', auth, async (req, res) => {
|
||||
}
|
||||
|
||||
res.json(profile);
|
||||
} catch (err) {
|
||||
}
|
||||
} catch (err: unknown) {
|
||||
if (typeof err === 'string')
|
||||
console.error(err)
|
||||
else if (err instanceof Error)
|
||||
console.error(err.message);
|
||||
res.status(500).send('Server Error');
|
||||
}
|
||||
@@ -59,6 +67,7 @@ router.post(
|
||||
} = req.body;
|
||||
|
||||
// build a profile
|
||||
if (isUserId(req)) {
|
||||
const profileFields = {
|
||||
user: req.user.id,
|
||||
website:
|
||||
@@ -67,12 +76,12 @@ router.post(
|
||||
: '',
|
||||
skills: Array.isArray(skills)
|
||||
? skills
|
||||
: skills.split(',').map((skill) => ' ' + skill.trim()),
|
||||
: skills.split(',').map((skill: string) => ' ' + skill.trim()),
|
||||
...rest
|
||||
};
|
||||
|
||||
// Build socialFields object
|
||||
const socialFields = { youtube, twitter, instagram, linkedin, facebook };
|
||||
const socialFields: { [key: string]: any } = { youtube, twitter, instagram, linkedin, facebook };
|
||||
|
||||
// normalize social fields to ensure valid url
|
||||
for (const [key, value] of Object.entries(socialFields)) {
|
||||
@@ -90,11 +99,15 @@ router.post(
|
||||
{ new: true, upsert: true, setDefaultsOnInsert: true }
|
||||
);
|
||||
return res.json(profile);
|
||||
} catch (err) {
|
||||
} catch (err: unknown) {
|
||||
if (typeof err === 'string')
|
||||
console.error(err)
|
||||
else if (err instanceof Error)
|
||||
console.error(err.message);
|
||||
return res.status(500).send('Server Error');
|
||||
}
|
||||
}
|
||||
}
|
||||
);
|
||||
|
||||
// @route GET api/profile
|
||||
@@ -104,7 +117,10 @@ router.get('/', async (req, res) => {
|
||||
try {
|
||||
const profiles = await Profile.find().populate('user', ['name', 'avatar']);
|
||||
res.json(profiles);
|
||||
} catch (err) {
|
||||
} catch (err: unknown) {
|
||||
if (typeof err === 'string')
|
||||
console.error(err)
|
||||
else if (err instanceof Error)
|
||||
console.error(err.message);
|
||||
res.status(500).send('Server Error');
|
||||
}
|
||||
@@ -125,7 +141,10 @@ router.get(
|
||||
if (!profile) return res.status(400).json({ msg: 'Profile not found' });
|
||||
|
||||
return res.json(profile);
|
||||
} catch (err) {
|
||||
} catch (err: unknown) {
|
||||
if (typeof err === 'string')
|
||||
console.error(err)
|
||||
else if (err instanceof Error)
|
||||
console.error(err.message);
|
||||
return res.status(500).json({ msg: 'Server error' });
|
||||
}
|
||||
@@ -140,6 +159,7 @@ router.delete('/', auth, async (req, res) => {
|
||||
// Remove user posts
|
||||
// Remove profile
|
||||
// Remove user
|
||||
if (isUserId(req))
|
||||
await Promise.all([
|
||||
Post.deleteMany({ user: req.user.id }),
|
||||
Profile.findOneAndRemove({ user: req.user.id }),
|
||||
@@ -147,7 +167,10 @@ router.delete('/', auth, async (req, res) => {
|
||||
]);
|
||||
|
||||
res.json({ msg: 'User deleted' });
|
||||
} catch (err) {
|
||||
} catch (err: unknown) {
|
||||
if (typeof err === 'string')
|
||||
console.error(err)
|
||||
else if (err instanceof Error)
|
||||
console.error(err.message);
|
||||
res.status(500).send('Server Error');
|
||||
}
|
||||
@@ -171,14 +194,20 @@ router.put(
|
||||
}
|
||||
|
||||
try {
|
||||
if (isUserId(req)) {
|
||||
const profile = await Profile.findOne({ user: req.user.id });
|
||||
|
||||
if (profile) {
|
||||
profile.experience.unshift(req.body);
|
||||
|
||||
await profile.save();
|
||||
|
||||
}
|
||||
res.json(profile);
|
||||
} catch (err) {
|
||||
}
|
||||
} catch (err: unknown) {
|
||||
if (typeof err === 'string')
|
||||
console.error(err)
|
||||
else if (err instanceof Error)
|
||||
console.error(err.message);
|
||||
res.status(500).send('Server Error');
|
||||
}
|
||||
@@ -191,16 +220,22 @@ router.put(
|
||||
|
||||
router.delete('/experience/:exp_id', auth, async (req, res) => {
|
||||
try {
|
||||
if (isUserId(req)) {
|
||||
const foundProfile = await Profile.findOne({ user: req.user.id });
|
||||
|
||||
if (foundProfile) {
|
||||
foundProfile.experience = foundProfile.experience.filter(
|
||||
(exp) => exp._id.toString() !== req.params.exp_id
|
||||
(exp: any) => exp._id.toString() !== req.params.exp_id
|
||||
);
|
||||
|
||||
await foundProfile.save();
|
||||
}
|
||||
return res.status(200).json(foundProfile);
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
}
|
||||
} catch (err: unknown) {
|
||||
if (typeof err === 'string')
|
||||
console.error(err)
|
||||
else if (err instanceof Error)
|
||||
console.error(err.message);
|
||||
return res.status(500).json({ msg: 'Server error' });
|
||||
}
|
||||
});
|
||||
@@ -224,14 +259,19 @@ router.put(
|
||||
}
|
||||
|
||||
try {
|
||||
if (isUserId(req)) {
|
||||
const profile = await Profile.findOne({ user: req.user.id });
|
||||
|
||||
if (profile) {
|
||||
profile.education.unshift(req.body);
|
||||
|
||||
await profile.save();
|
||||
|
||||
}
|
||||
res.json(profile);
|
||||
} catch (err) {
|
||||
}
|
||||
} catch (err: unknown) {
|
||||
if (typeof err === 'string')
|
||||
console.error(err)
|
||||
else if (err instanceof Error)
|
||||
console.error(err.message);
|
||||
res.status(500).send('Server Error');
|
||||
}
|
||||
@@ -244,14 +284,21 @@ router.put(
|
||||
|
||||
router.delete('/education/:edu_id', auth, async (req, res) => {
|
||||
try {
|
||||
if (isUserId(req)) {
|
||||
const foundProfile = await Profile.findOne({ user: req.user.id });
|
||||
if (foundProfile) {
|
||||
foundProfile.education = foundProfile.education.filter(
|
||||
(edu) => edu._id.toString() !== req.params.edu_id
|
||||
(edu: any) => edu._id.toString() !== req.params.edu_id
|
||||
);
|
||||
await foundProfile.save();
|
||||
}
|
||||
return res.status(200).json(foundProfile);
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
}
|
||||
} catch (err: unknown) {
|
||||
if (typeof err === 'string')
|
||||
console.error(err)
|
||||
else if (err instanceof Error)
|
||||
console.error(err.message);
|
||||
return res.status(500).json({ msg: 'Server error' });
|
||||
}
|
||||
});
|
||||
@@ -271,10 +318,13 @@ router.get('/github/:username', async (req, res) => {
|
||||
|
||||
const gitHubResponse = await axios.get(uri, { headers });
|
||||
return res.json(gitHubResponse.data);
|
||||
} catch (err) {
|
||||
} catch (err: unknown) {
|
||||
if (typeof err === 'string')
|
||||
console.error(err)
|
||||
else if (err instanceof Error)
|
||||
console.error(err.message);
|
||||
return res.status(404).json({ msg: 'No Github profile found' });
|
||||
}
|
||||
});
|
||||
|
||||
module.exports = router;
|
||||
module.exports = router
|
||||
|
||||
+20
-13
@@ -1,12 +1,15 @@
|
||||
const express = require("express");
|
||||
import express from "express";
|
||||
import gravatar from "gravatar";
|
||||
import bcrypt from "bcryptjs";
|
||||
import jwt from "jsonwebtoken";
|
||||
import config from "config";
|
||||
import { check, validationResult } from "express-validator";
|
||||
import User from "../../models/User";
|
||||
|
||||
import normalizeUrl from "normalize-url";
|
||||
|
||||
|
||||
const router = express.Router();
|
||||
const gravatar = require("gravatar");
|
||||
const bcrypt = require("bcryptjs");
|
||||
const jwt = require("jsonwebtoken");
|
||||
const config = require("config");
|
||||
const { check, validationResult } = require("express-validator");
|
||||
const User = require("../../models/User");
|
||||
const normalize = require('normalize-url');
|
||||
|
||||
// @route POST api/users
|
||||
// @desc Register user
|
||||
@@ -36,7 +39,7 @@ router.post(
|
||||
.json({ errors: [{ msg: "User already exists" }] });
|
||||
}
|
||||
|
||||
const avatar = normalize(
|
||||
const avatar = normalizeUrl(
|
||||
gravatar.url(email, {
|
||||
s: "200",
|
||||
r: "pg",
|
||||
@@ -64,20 +67,24 @@ router.post(
|
||||
},
|
||||
};
|
||||
|
||||
jwt.sign(
|
||||
const jwtSecret = config.get('jwtSecret')
|
||||
if (typeof jwtSecret === 'string') jwt.sign(
|
||||
payload,
|
||||
config.get("jwtSecret"),
|
||||
jwtSecret,
|
||||
{ expiresIn: "5 days" },
|
||||
(err, token) => {
|
||||
if (err) throw err;
|
||||
res.json({ token });
|
||||
}
|
||||
);
|
||||
} catch (err) {
|
||||
} catch (err: unknown) {
|
||||
if (typeof err === 'string')
|
||||
console.error(err)
|
||||
else if (err instanceof Error)
|
||||
console.error(err.message);
|
||||
res.status(500).send("Server error");
|
||||
}
|
||||
}
|
||||
);
|
||||
|
||||
module.exports = router;
|
||||
module.exports = router
|
||||
|
||||
@@ -1,12 +1,14 @@
|
||||
const express = require('express');
|
||||
const connectDB= require('./config/db')
|
||||
import express from 'express'
|
||||
|
||||
const path = require('path')
|
||||
import connectDB from './config/db'
|
||||
|
||||
|
||||
import path from 'path'
|
||||
const app = express();
|
||||
|
||||
connectDB();
|
||||
|
||||
app.use(express.json({extended:false}));
|
||||
app.use(express.json());
|
||||
|
||||
|
||||
app.use('/api/users', require('./routers/api/users'))
|
||||
|
||||
+103
@@ -0,0 +1,103 @@
|
||||
{
|
||||
"compilerOptions": {
|
||||
/* Visit https://aka.ms/tsconfig to read more about this file */
|
||||
|
||||
/* Projects */
|
||||
// "incremental": true, /* Save .tsbuildinfo files to allow for incremental compilation of projects. */
|
||||
// "composite": true, /* Enable constraints that allow a TypeScript project to be used with project references. */
|
||||
// "tsBuildInfoFile": "./.tsbuildinfo", /* Specify the path to .tsbuildinfo incremental compilation file. */
|
||||
// "disableSourceOfProjectReferenceRedirect": true, /* Disable preferring source files instead of declaration files when referencing composite projects. */
|
||||
// "disableSolutionSearching": true, /* Opt a project out of multi-project reference checking when editing. */
|
||||
// "disableReferencedProjectLoad": true, /* Reduce the number of projects loaded automatically by TypeScript. */
|
||||
|
||||
/* Language and Environment */
|
||||
"target": "es2018", /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
|
||||
// "lib": [], /* Specify a set of bundled library declaration files that describe the target runtime environment. */
|
||||
// "jsx": "preserve", /* Specify what JSX code is generated. */
|
||||
// "experimentalDecorators": true, /* Enable experimental support for TC39 stage 2 draft decorators. */
|
||||
// "emitDecoratorMetadata": true, /* Emit design-type metadata for decorated declarations in source files. */
|
||||
// "jsxFactory": "", /* Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h'. */
|
||||
// "jsxFragmentFactory": "", /* Specify the JSX Fragment reference used for fragments when targeting React JSX emit e.g. 'React.Fragment' or 'Fragment'. */
|
||||
// "jsxImportSource": "", /* Specify module specifier used to import the JSX factory functions when using 'jsx: react-jsx*'. */
|
||||
// "reactNamespace": "", /* Specify the object invoked for 'createElement'. This only applies when targeting 'react' JSX emit. */
|
||||
// "noLib": true, /* Disable including any library files, including the default lib.d.ts. */
|
||||
// "useDefineForClassFields": true, /* Emit ECMAScript-standard-compliant class fields. */
|
||||
// "moduleDetection": "auto", /* Control what method is used to detect module-format JS files. */
|
||||
|
||||
/* Modules */
|
||||
"module": "commonjs", /* Specify what module code is generated. */
|
||||
// "rootDir": "./", /* Specify the root folder within your source files. */
|
||||
// "moduleResolution": "node", /* Specify how TypeScript looks up a file from a given module specifier. */
|
||||
// "baseUrl": "./", /* Specify the base directory to resolve non-relative module names. */
|
||||
// "paths": {}, /* Specify a set of entries that re-map imports to additional lookup locations. */
|
||||
// "rootDirs": [], /* Allow multiple folders to be treated as one when resolving modules. */
|
||||
// "typeRoots": [], /* Specify multiple folders that act like './node_modules/@types'. */
|
||||
// "types": [], /* Specify type package names to be included without being referenced in a source file. */
|
||||
// "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */
|
||||
// "moduleSuffixes": [], /* List of file name suffixes to search when resolving a module. */
|
||||
// "resolveJsonModule": true, /* Enable importing .json files. */
|
||||
// "noResolve": true, /* Disallow 'import's, 'require's or '<reference>'s from expanding the number of files TypeScript should add to a project. */
|
||||
|
||||
/* JavaScript Support */
|
||||
// "allowJs": true, /* Allow JavaScript files to be a part of your program. Use the 'checkJS' option to get errors from these files. */
|
||||
// "checkJs": true, /* Enable error reporting in type-checked JavaScript files. */
|
||||
// "maxNodeModuleJsDepth": 1, /* Specify the maximum folder depth used for checking JavaScript files from 'node_modules'. Only applicable with 'allowJs'. */
|
||||
|
||||
/* Emit */
|
||||
// "declaration": true, /* Generate .d.ts files from TypeScript and JavaScript files in your project. */
|
||||
// "declarationMap": true, /* Create sourcemaps for d.ts files. */
|
||||
// "emitDeclarationOnly": true, /* Only output d.ts files and not JavaScript files. */
|
||||
// "sourceMap": true, /* Create source map files for emitted JavaScript files. */
|
||||
// "outFile": "./", /* Specify a file that bundles all outputs into one JavaScript file. If 'declaration' is true, also designates a file that bundles all .d.ts output. */
|
||||
// "outDir": "./", /* Specify an output folder for all emitted files. */
|
||||
// "removeComments": true, /* Disable emitting comments. */
|
||||
// "noEmit": true, /* Disable emitting files from a compilation. */
|
||||
// "importHelpers": true, /* Allow importing helper functions from tslib once per project, instead of including them per-file. */
|
||||
// "importsNotUsedAsValues": "remove", /* Specify emit/checking behavior for imports that are only used for types. */
|
||||
// "downlevelIteration": true, /* Emit more compliant, but verbose and less performant JavaScript for iteration. */
|
||||
// "sourceRoot": "", /* Specify the root path for debuggers to find the reference source code. */
|
||||
// "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */
|
||||
// "inlineSourceMap": true, /* Include sourcemap files inside the emitted JavaScript. */
|
||||
// "inlineSources": true, /* Include source code in the sourcemaps inside the emitted JavaScript. */
|
||||
// "emitBOM": true, /* Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files. */
|
||||
// "newLine": "crlf", /* Set the newline character for emitting files. */
|
||||
// "stripInternal": true, /* Disable emitting declarations that have '@internal' in their JSDoc comments. */
|
||||
// "noEmitHelpers": true, /* Disable generating custom helper functions like '__extends' in compiled output. */
|
||||
// "noEmitOnError": true, /* Disable emitting files if any type checking errors are reported. */
|
||||
// "preserveConstEnums": true, /* Disable erasing 'const enum' declarations in generated code. */
|
||||
// "declarationDir": "./", /* Specify the output directory for generated declaration files. */
|
||||
// "preserveValueImports": true, /* Preserve unused imported values in the JavaScript output that would otherwise be removed. */
|
||||
|
||||
/* Interop Constraints */
|
||||
// "isolatedModules": true, /* Ensure that each file can be safely transpiled without relying on other imports. */
|
||||
// "allowSyntheticDefaultImports": true, /* Allow 'import x from y' when a module doesn't have a default export. */
|
||||
"esModuleInterop": true, /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */
|
||||
// "preserveSymlinks": true, /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */
|
||||
"forceConsistentCasingInFileNames": true, /* Ensure that casing is correct in imports. */
|
||||
|
||||
/* Type Checking */
|
||||
"strict": true, /* Enable all strict type-checking options. */
|
||||
// "noImplicitAny": true, /* Enable error reporting for expressions and declarations with an implied 'any' type. */
|
||||
// "strictNullChecks": true, /* When type checking, take into account 'null' and 'undefined'. */
|
||||
// "strictFunctionTypes": true, /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */
|
||||
// "strictBindCallApply": true, /* Check that the arguments for 'bind', 'call', and 'apply' methods match the original function. */
|
||||
// "strictPropertyInitialization": true, /* Check for class properties that are declared but not set in the constructor. */
|
||||
// "noImplicitThis": true, /* Enable error reporting when 'this' is given the type 'any'. */
|
||||
// "useUnknownInCatchVariables": true, /* Default catch clause variables as 'unknown' instead of 'any'. */
|
||||
// "alwaysStrict": true, /* Ensure 'use strict' is always emitted. */
|
||||
// "noUnusedLocals": true, /* Enable error reporting when local variables aren't read. */
|
||||
// "noUnusedParameters": true, /* Raise an error when a function parameter isn't read. */
|
||||
// "exactOptionalPropertyTypes": true, /* Interpret optional property types as written, rather than adding 'undefined'. */
|
||||
// "noImplicitReturns": true, /* Enable error reporting for codepaths that do not explicitly return in a function. */
|
||||
// "noFallthroughCasesInSwitch": true, /* Enable error reporting for fallthrough cases in switch statements. */
|
||||
// "noUncheckedIndexedAccess": true, /* Add 'undefined' to a type when accessed using an index. */
|
||||
// "noImplicitOverride": true, /* Ensure overriding members in derived classes are marked with an override modifier. */
|
||||
// "noPropertyAccessFromIndexSignature": true, /* Enforces using indexed accessors for keys declared using an indexed type. */
|
||||
// "allowUnusedLabels": true, /* Disable error reporting for unused labels. */
|
||||
// "allowUnreachableCode": true, /* Disable error reporting for unreachable code. */
|
||||
|
||||
/* Completeness */
|
||||
// "skipDefaultLibCheck": true, /* Skip type checking .d.ts files that are included with TypeScript. */
|
||||
"skipLibCheck": true /* Skip type checking all .d.ts files. */
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
export const isUserId = function(req: unknown): req is { user: { id: string } } {
|
||||
let user: unknown = null
|
||||
let id: unknown = null
|
||||
if (typeof req === 'object' && req)
|
||||
if ('user' in req) {
|
||||
user = req.user
|
||||
if (typeof user === 'object' && user && 'id' in user) {
|
||||
id = user.id
|
||||
if (typeof id === 'string') {
|
||||
return true
|
||||
}
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
Reference in New Issue
Block a user