From ad289b3963349746b92ff28422598a746736112a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20B=C3=B6ttcher?= <c.boettcher@fz-juelich.de>
Date: Mon, 6 Mar 2023 07:57:17 +0100
Subject: [PATCH] change import to already installed package
---
plugins/__init__.py | 0
plugins/unity_integration.py | 6 ++----
2 files changed, 2 insertions(+), 4 deletions(-)
create mode 100644 plugins/__init__.py
diff --git a/plugins/__init__.py b/plugins/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/plugins/unity_integration.py b/plugins/unity_integration.py
index 805d657..86cd616 100644
--- a/plugins/unity_integration.py
+++ b/plugins/unity_integration.py
@@ -1,9 +1,8 @@
import os, random, string
from authlib.integrations.flask_client import OAuth
-from flask import url_for, redirect
+from flask import url_for, redirect, current_app as app
from flask_login import login_user
from flask_appbuilder import expose, BaseView as AppBuilderBaseView
-from airflow.utils.airflow_flask_app import get_airflow_app
from airflow.plugins_manager import AirflowPlugin
import logging
import os
@@ -15,7 +14,6 @@ FAB_ADMIN_ROLE = "Admin"
FAB_VIEWER_ROLE = "Viewer"
FAB_PUBLIC_ROLE = "Public" # The "Public" role is given no permissions
-app= get_airflow_app()
oauth = OAuth(app)
oauth.register(
name='unity',
@@ -53,7 +51,7 @@ class UnityIntegrationAuthView(AppBuilderBaseView):
# check airflow user backend
# check if user already exists, if not create it (with long random password)
sec_manager = app.appbuilder.sm
- fab_user = sec_manager.find_user('username')
+ fab_user = sec_manager.find_user(username=persistent_identifier)
if fab_user is None: # TODO check if None is the rioght thing to compare to
characters = string.ascii_letters + string.digits + string.punctuation
fab_user = sec_manager.add_user(
--
GitLab