From 77030931cbfdff485da2a37763106f8b0d367f48 Mon Sep 17 00:00:00 2001
From: Simon Ser <contact@emersion.fr>
Date: Thu, 10 Jun 2021 18:28:01 +0200
Subject: [PATCH] Reset config.server.auth when using custom server URL

---
 components/app.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/components/app.js b/components/app.js
index 3c09ed9..9f59a78 100644
--- a/components/app.js
+++ b/components/app.js
@@ -175,8 +175,6 @@ export default class App extends Component {
 	 * - Default server URL constructed from the current URL location
 	 */
 	handleConfig(config) {
-		this.config = config;
-
 		let connectParams = {};
 
 		if (config.server) {
@@ -200,6 +198,12 @@ export default class App extends Component {
 		let queryParams = parseQueryString();
 		if (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) {
 			connectParams.nick = queryParams.nick;
@@ -212,6 +216,8 @@ export default class App extends Component {
 			connectParams.autojoin = window.location.hash.split(",");
 		}
 
+		this.config = config;
+
 		this.setState((state) => {
 			return {
 				connectParams: {