skorotkiewicz/gamja
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Reset config.server.auth when using custom server URL

Browse source
This commit is contained in:
Simon Ser 2021-06-10 18:28:01 +02:00
parent 4df9328be8
commit 77030931cb
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
components/app.js
View file

@ -175,8 +175,6 @@ export default class App extends Component {
* - Default server URL constructed from the current URL location * - Default server URL constructed from the current URL location
*/ */
handleConfig(config) { handleConfig(config) {
this.config = config;
let connectParams = {}; let connectParams = {};
if (config.server) { if (config.server) {
@ -200,6 +198,12 @@ export default class App extends Component {
let queryParams = parseQueryString(); let queryParams = parseQueryString();
if (queryParams.server) { if (queryParams.server) {
connectParams.url = queryParams.server; connectParams.url = queryParams.server;
// When using a custom server, some configuration options don't
// make sense anymore.
if (config.server) {
config.server.auth = null;
}
} }
if (queryParams.nick) { if (queryParams.nick) {
connectParams.nick = queryParams.nick; connectParams.nick = queryParams.nick;
@ -212,6 +216,8 @@ export default class App extends Component {
connectParams.autojoin = window.location.hash.split(","); connectParams.autojoin = window.location.hash.split(",");
} }
this.config = config;
this.setState((state) => { this.setState((state) => {
return { return {
connectParams: { connectParams: {