secstate/Iris
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Removing SSL config - non HTTPS can't use SSL anyway

Browse Source
This commit is contained in:
James Barnsley
2018-10-04 21:07:25 +13:00
parent 5d827902e4
commit 62fe788395
9 changed files with 14100 additions and 10787 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/js/views/modals/InitialSetup.js
View File

@ -24,8 +24,7 @@ class InitialSetup extends React.Component{
username: this.props.username,
allow_reporting: this.props.allow_reporting,
host: this.props.host,
port: this.props.port,
ssl: this.props.ssl
port: this.props.port
}
}
@ -46,8 +45,7 @@ class InitialSetup extends React.Component{
});
this.props.mopidyActions.set({
host: this.state.host,
port: this.state.port,
ssl: this.state.ssl
port: this.state.port
});
this.setState({saving: true});
@ -56,7 +54,7 @@ class InitialSetup extends React.Component{
setTimeout(function(){
// We've changed a connection setting, so need to reload
if (self.state.host !== self.props.host || self.state.port !== self.props.port || self.state.ssl !== self.props.ssl){
if (self.state.host !== self.props.host || self.state.port !== self.props.port){
window.location = global.baseURL;
@ -108,21 +106,6 @@ class InitialSetup extends React.Component{
value={ this.state.port } />
</div>
</div>
<div className="field checkbox">
<div className="input">
<label>
<input
type="checkbox"
name="ssl"
checked={this.state.ssl}
onChange={e => this.setState({ssl: !this.state.ssl})} />
<span className="label tooltip">
Enable SSL
<span className="tooltip__content">Requires SSL proxy</span>
</span>
</label>
</div>
</div>
{helpers.isHosted() ? null : <div className="field checkbox">
<div className="input">
@ -157,8 +140,7 @@ const mapStateToProps = (state, ownProps) => {
allow_reporting: state.ui.allow_reporting,
username: (state.pusher && state.pusher.username ? state.pusher.username : 'Anonymous'),
host: state.mopidy.host,
port: state.mopidy.port,
ssl: state.mopidy.ssl
port: state.mopidy.port
}
}