fix #156

stackle_api/app/routes/comment.js → stackle_api/app/controllers/api/comment.js

@@ -1,6 +1,6 @@
 const express = require('express');
 const router = express.Router();
-const postModels = require('../models/post');
+const postModels = require('../../models/post');
 
 const Model = postModels.Post;
 const Comment = postModels.Comment;

stackle_api/app/controllers/api/index.js

@@ -0,0 +1,15 @@
+const post = require('./post');
+const comment = require('./comment');
+const stack = require('./stack');
+const reply = require('./reply');
+const user = require('./user');
+const profile = require('./profile')
+
+module.exports = {
+  post,
+  comment,
+  stack,
+  reply,
+  user,
+  profile
+}

stackle_api/app/routes/post.js → stackle_api/app/controllers/api/post.js

@@ -1,8 +1,7 @@
 const express = require('express');
 const router = express.Router();
-const postModels = require('../models/post');
+const postModels = require('../../models/post');
 const Post = postModels.Post;
-// const auth = require('../lib/auth');
 
 //to get all posts
 router.get('/all', function(request, response) {

stackle_api/app/controllers/api/profile.js

@@ -0,0 +1,22 @@
+const returnWithResponse = require('../../lib/returnWithResponse');
+
+const success = (req, res, next) => {
+    returnWithResponse.configureReturnData({
+        status: 200,
+        success: true,
+        result: req.user
+    } ,res);   
+}
+
+const failure = (err, req ,res, next) => {
+    returnWithResponse.configureReturnData({
+        status: 400,
+        success: false,
+        result: 'Access-Denied!'
+    } ,res);
+}
+
+module.exports = {
+    success,
+    failure
+}

stackle_api/app/routes/reply.js → stackle_api/app/controllers/api/reply.js

@@ -1,6 +1,6 @@
 const express = require('express');
 const router = express.Router();
-const models = require('../models/post');
+const models = require('../../models/post');
 const Reply = models.Reply;
 
 //to reply on a comment

stackle_api/app/routes/stack.js → stackle_api/app/controllers/api/stack.js

@@ -1,7 +1,7 @@
 const express = require('express');
 const router = express.Router();
 
-const Model = require('../models/stack');
+const Model = require('../../models/stack');
 
 //create a Stack
 router.post('/create', function(request, response) {

stackle_api/app/routes/user.js → stackle_api/app/controllers/api/user.js

@@ -1,6 +1,6 @@
 const express = require('express');
 const router = express.Router();
-const userModel = require('../models/user');
+const userModel = require('../../models/user');
 
 //create a user
 router.post('/create', function(request, response) {

stackle_api/app/controllers/auth/github.js

@@ -0,0 +1,21 @@
+const passport = require('passport')
+const returnWithResponse = require('../../lib/returnWithResponse');
+
+const githubCallbackSuccess = (request, response) => {
+  const { userId, token } = request.user
+  const redirectUrl = `http://localhost:4200/callback?userId='${userId}&token=${token}`
+  response.redirect(redirectUrl);
+}
+
+const githubCallbackFail = (err, request , response) => {
+  returnWithResponse.configureReturnData({
+    status: 400,
+    success: false,
+    result: 'Authentication Failed'
+  }, response);
+}
+
+module.exports = {
+  githubCallbackSuccess,
+  githubCallbackFail
+}

stackle_api/app/controllers/auth/index.js

@@ -0,0 +1,9 @@
+const {
+  githubCallbackSuccess,
+  githubCallbackFail
+} = require('./github')
+
+module.exports = {
+  githubCallbackSuccess,
+  githubCallbackFail
+}

stackle_api/app/routes.js

@@ -1,16 +1,9 @@
 /** -------------------------  application -------------------------------- */
-'use strict';
 const mongoose = require('mongoose');
-
-const User = require('./models/user');
-const Stack = require('./models/stack');
-const postModels = require('./models/post');
 const Validator = require('./lib/validator').Validator;
 const returnWithResponse = require('./lib/returnWithResponse');
-
-const Post = postModels.Post;
-const Comment = postModels.Comment;
-const Reply = postModels.Reply;
+const apiRouter = require('./routes/api');
+const authRouter = require('./routes/auth');
 
 module.exports = function(app, db) {
 
@@ -29,8 +22,16 @@ module.exports = function(app, db) {
     });
 
 
-    // app.get('/api/notifications', function (request, response) {
-    // });
+    app.use('/api', apiRouter);
+
+    //Auth and its callback
+    app.use('/auth', authRouter);
+
+
+    //logout
+    app.get('/logout' , function(request, response){
+        UserModel.logout(request, response);
+    });
 
     app.get('/*', function(request, response) {
         response.sendFile('./public/404.html');

stackle_api/app/routes/api/index.js

@@ -0,0 +1,19 @@
+const express = require('express')
+const passport = require('passport')
+const route = express.Router()
+const apiController = require('../../controllers/api')
+
+
+route.use('/post', apiController.post);
+route.use('/comment', apiController.comment);
+route.use('/user', apiController.user);
+route.use('/org', apiController.stack);
+route.use('/reply', apiController.reply);
+route.get('/profile',
+  passport.authenticate('bearer', { session: false, failWithError: true }),
+  apiController.profile.success,
+  apiController.profile.failure 
+);
+
+
+module.exports = route

stackle_api/app/routes/auth/index.js

@@ -0,0 +1,16 @@
+const express = require('express')
+const passport = require('passport')
+const route = express.Router()
+const authController = require('../../controllers/auth')
+
+route.get('/github',
+  passport.authenticate('github', {session: false})
+);
+
+route.get('/github/callback',
+  passport.authenticate('github', {failureRedirect : '/', failWithError: true, session: false}),
+  authController.githubCallbackSuccess,
+  authController.githubCallbackFail
+);
+
+module.exports = route