Merge pull request #469 from bounswe/dev

Dev to Master

Author: bahricanyesil

deliverables/CMPE451_Customer_Presentation_Milestone_1/deliverables.md

@@ -0,0 +1,196 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+lerna-debug.log*
+.pnpm-debug.log*
+
+# Diagnostic reports (https://nodejs.org/api/report.html)
+report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
+
+# Runtime data
+pids
+*.pid
+*.seed
+*.pid.lock
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+*.lcov
+
+# nyc test coverage
+.nyc_output
+
+# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# Bower dependency directory (https://bower.io/)
+bower_components
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (https://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
+node_modules/
+jspm_packages/
+
+# Snowpack dependency directory (https://snowpack.dev/)
+web_modules/
+
+# TypeScript cache
+*.tsbuildinfo
+
+# Optional npm cache directory
+.npm
+
+# Optional eslint cache
+.eslintcache
+
+# Optional stylelint cache
+.stylelintcache
+
+# Microbundle cache
+.rpt2_cache/
+.rts2_cache_cjs/
+.rts2_cache_es/
+.rts2_cache_umd/
+
+# Optional REPL history
+.node_repl_history
+
+# Output of 'npm pack'
+*.tgz
+
+# Yarn Integrity file
+.yarn-integrity
+
+# dotenv environment variable files
+.env.development.local
+.env.test.local
+.env.production.local
+.env.local
+
+# parcel-bundler cache (https://parceljs.org/)
+.cache
+.parcel-cache
+
+# Next.js build output
+.next
+out
+
+# Nuxt.js build / generate output
+.nuxt
+dist
+
+# Gatsby files
+.cache/
+# Comment in the public line in if your project uses Gatsby and not Next.js
+# https://nextjs.org/blog/next-9-1#public-directory-support
+# public
+
+# vuepress build output
+.vuepress/dist
+
+# vuepress v2.x temp and cache directory
+.temp
+.cache
+
+# Docusaurus cache and generated files
+.docusaurus
+
+# Serverless directories
+.serverless/
+
+# FuseBox cache
+.fusebox/
+
+# DynamoDB Local files
+.dynamodb/
+
+# TernJS port file
+.tern-port
+
+# Stores VSCode versions used for testing VSCode extensions
+.vscode-test
+
+# yarn v2
+.yarn/cache
+.yarn/unplugged
+.yarn/build-state.yml
+.yarn/install-state.gz
+.pnp.*
+
+# Ignore files related to API keys
+
+# Ignore IDE specific directories
+.vscode
+.idea
+
+# Ignore files/folders macOS could create in the directory
+.DS_Store
+.AppleDouble
+.LSOverride
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+._* 
+
+# Visual Studio Code related
+.classpath
+.project
+.settings/
+.vscode/* 
+!.vscode/settings.json 
+!.vscode/tasks.json 
+!.vscode/launch.json 
+!.vscode/extensions.json 
+.history
+
+# General
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+# Miscellaneous
+*.class
+*.lock
+*.log
+*.swp
+.atom/
+.buildlog/
+.svn/
+

learnify/backend/.dockerignore

@@ -0,0 +1 @@
+DB_URI="mongodb://mongo:27017"

learnify/backend/.env.prod

@@ -10,6 +10,11 @@ We uses Node.js and Express.js for our API.
 - Prepare the environment variables by generating .env file(you can find details about this bellow)
 - npm start
 
+## Docker Installation
+
+You can just run `docker-compose up` to get the DB and the API running.
+If you changed the code, you need to run `docker-compose up --build` to change the code in the image. 
+
 ## Requirements
 
 For development, you will need Node.js and MongoDB. In addition, you shall set your .env file.
@@ -56,6 +61,9 @@ You can list of environment variables that our API uses for configuration:
 #### Compulsory Variables
 
 DB_URI : MongoDB URI of your local development database. 
+JWT_KEY: key to be used for jwt generation.
+MAIL: mailaddress the API uses, currently only gmail is supported
+MAIL_PASS: password of MAIL
 
 #### Optional Variables
 

learnify/backend/README.md

@@ -0,0 +1,5 @@
+export { default as signup } from './signup.js';
+export { default as resend } from './resend.js';
+export { default as login } from './login.js';
+export { default as verifyEmail } from './verifyEmail.js';
+

learnify/backend/api/controllers/auth/index.js

@@ -0,0 +1,58 @@
+import { validateLogin } from '../../validators/user_validator.js';
+import bcrypt from 'bcryptjs';
+import jwt from "jsonwebtoken";
+import { User } from '../../../models/index.js';
+
+export default async (req,res) => {
+    const { error } = validateLogin(req.body);
+    if (error) {
+        console.log(error.details[0].message);
+        return res.status(400).json({ "resultMessage": "Please check your inputs." });
+    }
+
+    const email = req.body.email;
+
+    let emailCheck = await User.exists({ email: email})
+        .catch((err) => {
+        console.log(err.message);
+        return res.status(500).json({ "resultMessage":  "Something is wrong."});
+    });
+
+    if (!emailCheck) 
+        return res.status(404).json({"resultMessage": "There is no user with the given email."});
+
+    let user = await User.findOne({ email: email }).select('+password')
+        .catch((err) => {
+        console.log(err.message);
+        return res.status(500).json({ "resultMessage": "Something is wrong." });
+    });
+
+    
+    const incomingPassword = req.body.password;
+    const databasePassword = user.password;
+    const passwordCheck = bcrypt.compareSync(incomingPassword, databasePassword);
+
+    if (!passwordCheck) 
+        return res.status(409).json({"resultMessage": "Wrong password."});
+
+    if(!user.is_verified){
+        return res.status(401).json({
+            resultMessage: "User is not verified.",
+            user: user.toJSON(),
+        });
+    }
+    
+    const token = jwt.sign(
+        { user_id: user._id, email },
+        process.env.JWT_KEY,
+        {
+            expiresIn: "24h",
+        }
+        );
+        
+    return res.status(200).json({
+        resultMessage: "Successfully logged in.",
+        user: user.toJSON(),
+        token: token
+    });
+};

learnify/backend/api/controllers/auth/login.js

@@ -0,0 +1,24 @@
+import { User } from '../../../models/index.js';
+import send_verification_email from '../../../utils/auth/send_verification_email.js'
+
+export default async (req, res) => {
+
+    const email = req.body.email;
+
+    let user = await User.findOne({ email: email })
+        .catch((err) => {
+            console.log(err.message);
+            return res.status(500).json({ "resultMessage": "Something is wrong." });
+        });
+
+    try{
+        await send_verification_email(user);
+    }catch(err){
+        console.log(err.message);
+        return res.status(500).json({ "resultMessage": "Could not send verification email." });
+    }
+    return res.status(200).json({
+        resultMessage: "Verification code is succesfully resended."
+    });
+};   
+    

learnify/backend/api/controllers/auth/resend.js

@@ -0,0 +1,55 @@
+import bcrypt from 'bcryptjs';
+import { User } from '../../../models/index.js';
+import { validateSignup } from '../../validators/user_validator.js';
+import send_verification_email from '../../../utils/auth/send_verification_email.js'
+const { hash } = bcrypt;
+
+export default async (req, res) => {
+  const { error } = validateSignup(req.body);
+  if (error) {
+    console.log(error);
+    return res.status(400).json({ "resultMessage": "Please check your inputs."});
+  }
+  
+  const exists_email = await User.exists({ email: req.body.email })
+    .catch((err) => {
+      console.log("Could not fetch users from mongoDB")
+      console.log(err.message);
+      return res.status(500).json({ "resultMessage": "Something is wrong." });
+    });
+  
+  if (exists_email) {
+    console.log("User with existing email tried to signup")
+    return res.status(409).json({ "resultMessage": "There already exists a user with the given email." });
+  }
+  const exists_username = await User.exists({ username: req.body.username })
+  .catch((err) => {
+    console.log("Could not fetch users from mongoDB")
+    console.log(err.message)
+    return res.status(500).json({ "resultMessage": "Something is wrong" });
+  });
+
+  if (exists_username) {
+  console.log("User with existing username tried to signup")
+  return res.status(409).json({ "resultMessage": "There already exists a user with the given username." });
+  }
+
+  const hashed = await hash(req.body.password, 10);
+
+  let user = new User({
+    email: req.body.email,
+    password: hashed,
+    username: req.body.username,
+  });
+
+  try{
+    await send_verification_email(user);
+  }catch(err){
+    console.log("Could not send verification email.")
+    console.log(err.message)
+    return res.status(500).json({ "resultMessage":  "Could not send verification email."});
+  }
+  return res.status(200).json({
+    resultMessage: "User is successfully signed up."
+  });
+};