Skip to content

Added login provider response param #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
BluehackRano wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Added login provider response param #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3e75f62
Change the apiway words to whatsit
BluehackRano Aug 16, 2017
c5546ad
Resolved [WHATSIT-58] : Add the login provider on response param.
BluehackRano Aug 17, 2017
1991bec
Added the config.template.json file for google provider login
BluehackRano Aug 17, 2017
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
6 changes: 6 additions & 0 deletions config.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,11 @@
"clientSecret": "<your clientSecret>",
"callbackURL": "<your callbackURL>",
"accessToken": "<your accessToken>"
},
"google": {
"clientID": "<your clientID>",
"clientSecret": "<your clientSecret>",
"callbackURL": "<your callbackURL>",
"accessToken": "<your accessToken>"
}
}
2 changes: 1 addition & 1 deletion routes/passport/github/githubCallback.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ router.get('/',

var redirectUrl = process.env.GITHUB_REDIRECTURL
//var redirectUrl = config.github.callbackURL
res.redirect(redirectUrl + '/?accessToken=' + accessToken);
res.redirect(redirectUrl + '/?provider=github&accessToken=' + accessToken);
});

module.exports = router;
2 changes: 1 addition & 1 deletion routes/passport/google/googleCallback.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ router.get('/',
console.log(res)

var redirectUrl = process.env.GOOGLE_REDIRECTURL
res.redirect(redirectUrl + '/?accessToken=' + accessToken);
res.redirect(redirectUrl + '/?provider=google&accessToken=' + accessToken);
});

module.exports = router;
10 changes: 5 additions & 5 deletions static/login.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="description" content="apiway design sample">
Copy link
Copy Markdown
Contributor

@bluehackmaster bluehackmaster Aug 17, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sphinx는 oauth core만 담당하도록 role define을 하였기 때문에,
기존의 login page와 관련한 코드들은 이제 더이상 필요 없을것 같네요.

즉,
login page관련 code들은 모두 제거 부탁드릴께요~

<meta name="description" content="whatsit design sample">
<meta name="author" content="R">
<meta name="keyword" content="api, apiway">
<meta name="keyword" content="image-labeling, whatsit">
<link rel="shortcut icon" href="img/favicon-pass.svg">
<title>APIWAY - Sign in</title>
<title>WHATSIT - Sign in</title>
<!-- CSS Reset -->
<link rel="stylesheet" href="css/normalize.css">
<!-- Icons -->
Expand All @@ -26,7 +26,7 @@

<div id="auth-start" class="pane">
<header class="pane-header">
<h1><img src="./img/logo.png" alt="apiway"></h1>
<h1><img src="./img/logo.png" alt="whatsit"></h1>
</header>
<div class="container">
<form>
Expand All @@ -42,7 +42,7 @@ <h1><img src="./img/logo.png" alt="apiway"></h1>
<a href="#">Privacy</a>
<a href="#">Cookies</a>
<h6 class="copyright">
&copy; 2017 <a href="http://app.apiway.io/">apiway.io</a>
&copy; 2017 <a href="http://app.whatsit.net/">whatsit.net</a>
</h6>
</footer>

Expand Down