From d97d5f7b18604fc5a7d0edca7c7c69ac378547e8 Mon Sep 17 00:00:00 2001
From: iameskild <eskild@doublee.io>
Date: Mon, 17 Jan 2022 11:43:46 -0800
Subject: [PATCH] Fix minor upgrade bug

---
 qhub/upgrade.py | 13 +++++++++++--
 qhub/version.py |  2 +-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/qhub/upgrade.py b/qhub/upgrade.py
index c62cf157fe..23ce8ba2a8 100644
--- a/qhub/upgrade.py
+++ b/qhub/upgrade.py
@@ -217,8 +217,8 @@ def _version_specific_upgrade(
         return config
 
 
-class Upgrade_0_3_14(UpgradeStep):
-    version = "0.3.14"
+class Upgrade_0_4_0(UpgradeStep):
+    version = "0.4.0"
 
     def _version_specific_upgrade(
         self, config, start_version, config_filename: pathlib.Path, *args, **kwargs
@@ -309,6 +309,15 @@ def _version_specific_upgrade(
             if "project" in config["azure"]:
                 del config["azure"]["project"]
 
+        # "oauth_callback_url" and "scope" not required in qhub-config.yaml
+        # for Auth0 and Github authentication
+        auth_config = config["security"]["authentication"].get("config", None)
+        if auth_config:
+            if "oauth_callback_url" in auth_config:
+                del auth_config["oauth_callback_url"]
+            if "scope" in auth_config:
+                del auth_config["scope"]
+
         return config
 
 
diff --git a/qhub/version.py b/qhub/version.py
index 1e836f5b90..1625eeb559 100644
--- a/qhub/version.py
+++ b/qhub/version.py
@@ -1,4 +1,4 @@
-__version__ = "0.3.14"
+__version__ = "0.4.0"
 
 if __name__ == "__main__":
     print(__version__, end="")