Skip to content

Add support for multiple oauth login methods #351

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
deathbeam wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add support for multiple oauth login methods #351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions .eslintrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,8 @@
"pragma": "h",
"version": "16.0"
}
},
"rules": {
"jsx-a11y/anchor-is-valid": "off"
}
}
40 changes: 29 additions & 11 deletions src/components/navigation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ const Navigation = ({ dark, login, loggedIn, username }) => (
</a>
</li>
<li class="nav-item dropdown">
{/* eslint-disable-next-line */}
<a class="nav-link dropdown-toggle" id="navbarDropdown">
API
</a>
Expand Down Expand Up @@ -138,19 +137,38 @@ const Navigation = ({ dark, login, loggedIn, username }) => (
<span class="d-lg-none"> GitHub</span>
</a>
</li>
<li class="nav-item" onClick={toggleMenu}>
{loggedIn ? (
{loggedIn ? (
<li class="nav-item" onClick={toggleMenu}>
<a class="nav-link" href="/account/home">
<i class="fas fa-user fa-fw" /> {username}
</a>
) : (
<form class="form-inline">
<button class="btn btn-primary" type="button" onClick={login}>
Login
</button>
</form>
)}
</li>
</li>
) : (
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" id="navbarDropdown">
Login
</a>
<div
class="dropdown-menu dropdown-menu-right"
aria-labelledby="navbarDropdown"
>
<a
class="dropdown-item"
type="button"
onClick={() => login('GOOGLE')}
>
<i class="fab fa-google" /> Login via Google
</a>
<a
class="dropdown-item"
type="button"
onClick={() => login('DISCORD')}
>
<i class="fab fa-discord" /> Login via Discord
</a>
</div>
</li>
)}
</ul>
</div>
</nav>
Expand Down
4 changes: 2 additions & 2 deletions src/modules/account.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export const {
resetSession
} = createActions(
{
LOGIN: () => async (dispatch, getState) => {
LOGIN: provider => async (dispatch, getState) => {
const version = getLatestRelease(getState())
const localUuid = getState().account.uuid
const baseUrl = getBaseUrl()
Expand All @@ -26,7 +26,7 @@ export const {
loadingPane.focus()

const authResponse = await runeliteApi(
`runelite-${version}/account/login?uuid=${localUuid}`,
`runelite-${version}/account/login?uuid=${localUuid}&provider=${provider}`,
{
method: 'GET'
}
Expand Down