Skip to content

Commit

Permalink
Fix linter errors
Browse files Browse the repository at this point in the history
  • Loading branch information
iaincollins committed Jul 27, 2020
1 parent 19da066 commit 12a5d6b
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 9 deletions.
2 changes: 1 addition & 1 deletion src/adapters/typeorm/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { createConnection, getConnection } from 'typeorm'
import { createHash } from 'crypto'
import require_optional from 'require_optional'
import require_optional from 'require_optional' // eslint-disable-line camelcase

import { CreateUserError } from '../../lib/errors'
import adapterConfig from './lib/config'
Expand Down
2 changes: 1 addition & 1 deletion src/providers/linkedin.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export default (options) => {
name: profile.localizedFirstName + ' ' + profile.localizedLastName,
email: null,
image: null
};
}
},
...options
}
Expand Down
2 changes: 1 addition & 1 deletion src/server/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ export default async (req, res, userSuppliedOptions) => {
res.json({ csrfToken })
return done()
case 'signin':
if (options.pages.signIn) {
if (options.pages.signIn) {
let redirectUrl = `${options.pages.signIn}${options.pages.signIn.includes('?') ? '&' : '?'}callbackUrl=${options.callbackUrl}`
if (req.query.error) { redirectUrl = `${redirectUrl}&error=${req.query.error}` }
return redirect(redirectUrl)
Expand Down
7 changes: 4 additions & 3 deletions src/server/pages/signin.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,10 @@ export default ({ req, csrfToken, providers, callbackUrl }) => {

return render(
<div className='signin'>
{errorMessage && <div className='error'>
{errorMessage}
</div>}
{errorMessage &&
<div className='error'>
{errorMessage}
</div>}
{providersToRender.map((provider, i) =>
<div key={provider.id} className='provider'>
{provider.type === 'oauth' &&
Expand Down
4 changes: 2 additions & 2 deletions www/sidebars.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,14 @@ module.exports = {
'providers/gitlab',
'providers/google',
'providers/identity-server4',
"providers/linkedin",
'providers/linkedin',
'providers/mixer',
'providers/okta',
'providers/slack',
'providers/spotify',
'providers/twitch',
'providers/twitter',
'providers/yandex'
],
]
}
}
2 changes: 1 addition & 1 deletion www/src/pages/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ function Home () {
<div className='hero-wave-inner' />
</div>
</header>
<main className='home-main'>
<main className='home-main'>
<section className={`section-features ${styles.features}`}>
<div className='container'>
<div className='row'>
Expand Down

0 comments on commit 12a5d6b

Please sign in to comment.