Changed bcrypt callback to promise

Author: shivkumar5

.gitignore

@@ -1,4 +1,5 @@
 node_modules/
 server/solutions/
 judge/result/
-solutions/
+solutions/
+codecamp-front/node_modules/

judge/app.js

@@ -32,7 +32,7 @@ if (cluster.isMaster) {
     const mongoose = require('mongoose')
 
     mongoose.Promise = global.Promise
-    mongoose.connect(process.env.MONGODB_URI || 'mongodb://127.0.0.1:27017/OnlineJudge')
+    mongoose.connect(process.env.MONGODB_URI || 'mongodb://127.0.0.1:27018/OnlineJudge')
 
     const bodyParser = require('body-parser');
     app.use( bodyParser.json() );

judge/result/binary/Solution.out

@@ -1,6 +1,9 @@
 #include<stdio.h>
     int main()
     {
-      printf("Welcome To CodeCamp");
+    int n;
+    scanf("%d",&n);
+    while(n--)
+      printf("Hello World\n");
     }
-    
+    

judge/result/source/Solution.c

@@ -1,8 +1 @@
-#include<bits/stdc++.h>
-using namespace std;
-      int main()
-      {
-        //int arr[123456781];
-        //cout << arr[12];
-        while(1);
-      }
+print("Welcome To CodeCamp")

judge/result/source/Solution.cpp

@@ -1,12 +1,6 @@
-import java.util.*;
-
-        public class Solution {
-
-          public static void main(String[] args) {
-
-              System.out.print("Welcome To CodeCamp");
-                for(int i=0;i<1000000000;i++);
-          }
-
-        }
-        
+#include<stdio.h>
+    int main()
+    {
+      printf("Welcome To CodeCamp");
+    }
+    

judge/result/source/Solution.java

@@ -1,28 +1,7 @@
-import math
-t=int(input())
-def fun(a,b,y):
-	x=ord(a[-1])-ord('0')
-	res=x**y
-	print(res%10)
-	'''m=math.ceil(math.log10(res))
-	print(m)
-	res=res%(10**m)
-	print(res)'''
-	
-for _ in range(t):
-	a,b=map(str,input().split())
-	if len(b)==1 and int(b)==0:
-		print(1)
-		continue
-	if len(b)<=1:
-		x=int(b)
-	else:
-		l=len(b)
-		x=(ord(b[-1])-ord('0'))+10*(ord(b[-2])-ord('0'))
-	
-	if x%4==0:
-		fun(a,x,4)
-	else:
-		fun(a,x,x%4)
-		
-		
+import java.util.*;
+        public class Solution {
+          public static void main(String[] args) {
+              System.out.print("Welcome To CodeCamp");
+          }
+        }
+        

judge/result/source/Solution.python

@@ -31,11 +31,9 @@ router.get('/:id',(req,res)=>{
               maxBuffer:pro.sourcelimit,
               encoding:'utf8'
             }
-        judge.compileAndRunProblem(contest,problem,id,language ,description,option).then((result)=>{    
-          console.log(result)  
+        judge.compileAndRunProblem(contest,problem,id,language ,description,option).then((result)=>{      
           res.send(result);
         }).catch((e)=>{
-          console.log(e)
           var compileError = /(g[/++/]|gcc|javac)/;
           if(e.toString().match(compileError)){
             res.status(200).send('CE');

judge/routes/solution.js

@@ -10,7 +10,7 @@ const app = express();
 const mongoose = require('mongoose')
 
 mongoose.Promise = global.Promise
-mongoose.connect(process.env.MONGODB_URI || 'mongodb://127.0.0.1:27017/OnlineJudge')
+mongoose.connect(process.env.MONGODB_URI || 'mongodb://127.0.0.1:27018/OnlineJudge')
 
 const bodyParser = require('body-parser');
 app.use(cors())
@@ -55,7 +55,7 @@ app.get('/',(req,res)=>{
 })
 
 const port = process.env.PORT || 80;
-app.listen(port,'192.168.0.11');
+app.listen(port,'0.0.0.0');
 console.log('magic is started at ' + port)
 
 module.exports={app}

server/app.js

@@ -108,13 +108,14 @@ var UserSchema = new mongoose.Schema({
 
 UserSchema.pre('save',function(next) {
     var user =this;
-    bcrypt.genSalt(10, function(err, salt) {
-      bcrypt.hash(user.password, salt, function(err, hash) {
-         user.password=hash
-         next();
-      });
+    bcrypt.hash(user.password, 10).then(function(hash) {
+        user.password=hash;
+        next();
+    }).catch((e)=>{
+        next(err);
     });
-  })
+});
+  
 
 UserSchema.methods.toJSON = function() {
     var user = this ;
@@ -130,20 +131,14 @@ UserSchema.statics.findByUsername=function(username,password,done){
         }else if(!user){
             return done(null,null);
         }else{
-            bcrypt.compare(password, user.password, function(err , res){
-                if(err){
-                    return done(err);
-                }else if(!res){
-<<<<<<< HEAD
-                    return done(err);
+            bcrypt.compare(password, user.password).then((res)=>{
+                if(!res){
+                    return done('WP',user);
                 }else if(res){
                     return done(null,user);
-=======
-                    return done(err)
-                } else if(res){
-                    return done(null,user)
->>>>>>> 2cc704141c7f90f47465c9318ad6508d35a021e3
                 }
+            }).catch((err)=>{
+                return done(err);
             })
         }
     })