Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #2349 from influxdata/multitenancy_allow-entry-without-auth 

Scope auth logic beneath isUsingAuth
pull/10616/head
lukevmorris 2017-11-10 17:45:56 -08:00 committed by GitHub
parent 6cb6fb58bd b401983cbe
commit b6616fc177
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ui/src/CheckSources.js
View File

@ -150,18 +150,12 @@ const CheckSources = React.createClass({
const { const {
params, params,
sources, sources,
auth: {isUsingAuth, me, me: {currentOrganization}}, auth: {isUsingAuth, me: {currentOrganization}},
} = this.props } = this.props
const {isFetching} = this.state const {isFetching} = this.state
const source = sources.find(s => s.id === params.sourceID) const source = sources.find(s => s.id === params.sourceID)
if ( if (isFetching || !source || (isUsingAuth && !currentOrganization)) {
isFetching ||
!source ||
typeof isUsingAuth !== 'boolean' ||
(me && me.role === undefined) || // TODO: not sure this happens
!currentOrganization
) {
return <div className="page-spinner" /> return <div className="page-spinner" />
} }