Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
45 changes: 45 additions & 0 deletions public/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
<!DOCTYPE html>
<html>

<head>
<title>Auth Test</title>
</head>

<body>
<main>

<div id="oauth"></div>

<hr> Access Token:
<span id="token"></span>
<hr>
<hr />
</main>

<script src="http://code.jquery.com/jquery-3.3.1.js" integrity="sha256-2Kok7MbOyxpgUVvAk/HJ2jigOSYS2auK4Pfzbm7uH60=" crossorigin="anonymous"></script>

<script>

let githubURL = "https://github.com/login/oauth/authorize";

let options = {
client_id: 'd6c0defbd80f3979493a',
redirect_uri: 'http://localhost:3000/oauth',
scope: 'read:user',
state: 'autumn',
allow_signup: 'true',
}

let QueryString = Object.keys(options).map((key, i) => {
return `${key}=` + encodeURIComponent(options[key]);
}).join("&");

let authURL = `${githubURL}?${QueryString}`;

$('#oauth').append(`<a href="${authURL}">Login With GitHub</a>`);
</script>


</body>

</html>
3 changes: 2 additions & 1 deletion src/api/api.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import express from 'express';
const router = express.Router();

import modelFinder from '../middleware/models.js';
import modelFinder from '../middleware/modelHelper.js';
router.param('model', modelFinder);


Expand Down Expand Up @@ -63,4 +63,5 @@ router.put('/api/v1/:model/:id', (req, res, next) => {

}
});

export default router;
22 changes: 14 additions & 8 deletions src/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,14 @@ import cors from 'cors';
// import cookieParser from 'cookie-parser';

import router from './api/api.js';
import authRouter from './auth/auth.js';

import notFound from './middleware/404.js';
import noAuth from './middleware/401.js';
import errorHandler from './middleware/error.js';
import noBody from './middleware/400.js';



let app = express();

Expand All @@ -15,15 +23,13 @@ app.use(express.json());
app.use(express.urlencoded({extended: true}));
// app.use(cookieParser());

// app.use(authRouter);
// app.use(profileRouter);
// app.use(upload);
// app.use(noBody);
// app.use(imageRouter);
app.use(router);
app.use(authRouter);

// app.use(notFound);
// app.use(noAuth);
// app.use(errorHandler);
app.use(notFound);
app.use(noAuth);
app.use(noBody);
app.use(errorHandler);

let server = false;

Expand Down
30 changes: 30 additions & 0 deletions src/auth/auth.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
'use strict';

import express from 'express';
import fs from 'fs';
const authRouter = express.Router();

import oauth from './lib/oauth.js';


authRouter.get('/', (req,res, next) => {
fs.readFile(__dirname + '/../../public/index.html', (err, data) => {
if(err) throw err;
res.status(200);
res.write(data);
res.end();
});
});


authRouter.get('/oauth', (req, res, next) => {

oauth.authorize(req)
.then( user => {
res.send(user);
})
.catch(next);

});

export default authRouter;
43 changes: 43 additions & 0 deletions src/auth/lib/oauth.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
'use strict';
import superagent from 'superagent';
const authorize = (req) => {

let code = req.query.code;

console.log('(1 Got code from Github)', code);

return superagent.get('https://github.com/login/oauth/access_token')
.send({
client_id: process.env.GITHUB_CLIENT_ID,
client_secret: process.env.GITHUB_CLIENT_SECRET,
code: code,
redirect_uri: process.env.API_URL + '/oauth',
state: process.env.SECRET,
})
.then(response => {
let gitHubToken = response.body.access_token;
console.log('(2) got a token from Github response body', response.body);
console.log('(2) got a token from Github', gitHubToken);
return gitHubToken;
})
.then(token => {
console.log('TOKEN:', token);
return superagent.get(`https://api.github.com/user?access_token=${token}`)
.then(response => {
let user = response.body;
console.log('(3) Got User info');
return user;
});
});
// .then(user => {
// console.log('(4) Create Account ');
// })
// .then(loggedInUser => {
// console.log('(5) we did it');
// return loggedInUser.generateToken();
// })
// .catch(error => error);
// };

};
export default { authorize };
13 changes: 13 additions & 0 deletions src/middleware/400.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@

'use strict';

export default (err, req, res, next) => {
if(err === 400) {
res.statusCode = 400;
res.statusMessage = 'Bad Request';
res.write('Bad Request, body is needed');
res.end();
} else {
next(err);
}
};
18 changes: 18 additions & 0 deletions src/middleware/401.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
'use strict';

export default (err, req, res, next) => {
if(err == 401) {
res.statusCode = 401;
res.statusMessage = 'Unauthorized';
res.write('ERROR: Invalid User ID/Password');
res.end();
} else if (err === 'Unauthorized') {
res.statusCode = 401;
res.statusMessage = 'Unauthorized';
res.write('Unauthorized Access');
res.end();
}
else {
next(err);
}
};
11 changes: 11 additions & 0 deletions src/middleware/404.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
'use strict';


export default (req,res) => {
let error = {error:'Resource Not Found'};
res.statusCode = 404;
res.statusMessage = 'Not Found';
res.setHeader('Content-Type', 'application/json');
res.write( JSON.stringify(error) );
res.end();
};
12 changes: 12 additions & 0 deletions src/middleware/error.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
'use strict';

export default (err,req,res) => {
let error = {
error:(typeof err==='object' && err.message) || err,
};
res.statusCode = (typeof err==='object' && err.status) || 500;
res.statusMessage = (typeof err==='object' && err.statusMessage) || 'Server Error';
res.setHeader('Content-Type', 'application/json');
res.write( JSON.stringify(error) );
res.end();
};