From 469dc05a9d952233235d186d4a31b86d80c322e7 Mon Sep 17 00:00:00 2001
From: Philipp Schmidt <philipp.schmidt@xfel.eu>
Date: Wed, 18 May 2022 13:17:44 +0200
Subject: [PATCH] Temporarily revert OAuth2-related changes for notebook hotfix
---
notebooks/LPD/LPD_Correct_Fast.ipynb | 1 -
setup.py | 1 -
src/cal_tools/restful_config.yaml | 1 -
3 files changed, 3 deletions(-)
diff --git a/notebooks/LPD/LPD_Correct_Fast.ipynb b/notebooks/LPD/LPD_Correct_Fast.ipynb
index 167559900..6c6990439 100644
--- a/notebooks/LPD/LPD_Correct_Fast.ipynb
+++ b/notebooks/LPD/LPD_Correct_Fast.ipynb
@@ -206,7 +206,6 @@
"# Connect to CalCat.\n",
"calcat_config = restful_config['calcat']\n",
"client = CalibrationClient(\n",
- " use_oauth2=calcat_config['use-oauth2'],\n",
" client_id=calcat_config['user-id'],\n",
" client_secret=calcat_config['user-secret'],\n",
" user_email=calcat_config['user-email'],\n",
diff --git a/setup.py b/setup.py
index f2dd6fbdf..9288cbb06 100644
--- a/setup.py
+++ b/setup.py
@@ -120,7 +120,6 @@ setup(
packages=find_packages("src"),
package_dir={"": "src"},
package_data={
- "cal_tools": ["restful_config.yaml"],
"xfel_calibrate": [
"bin/*.sh",
"titlepage.tmpl",
diff --git a/src/cal_tools/restful_config.yaml b/src/cal_tools/restful_config.yaml
index 21b9546e1..813d1467d 100644
--- a/src/cal_tools/restful_config.yaml
+++ b/src/cal_tools/restful_config.yaml
@@ -10,7 +10,6 @@ mdc:
user-secret: '@note add this to secrets file'
calcat:
- use-oauth2: true
auth-url: https://in.xfel.eu/calibration/oauth/authorize
base-api-url: https://in.xfel.eu/calibration/api
refresh-url: https://in.xfel.eu/calibration/oauth/token
--
GitLab