diff --git a/inventory-app/oidc.py b/inventory-app/oidc.py index e1142ab..7e20273 100644 --- a/inventory-app/oidc.py +++ b/inventory-app/oidc.py @@ -16,7 +16,6 @@ def login_required(_f=None, *, groups=[]): def login_required_inner(f): @wraps(f) def decorated_function(*args, **kwargs): - print(groups) user = read_user() if not user: return do_login() @@ -31,9 +30,7 @@ def login_required(_f=None, *, groups=[]): return login_required_inner(_f) def do_login(): - print("doing login redirect") if request and request.full_path: - print("storing url: " + request.full_path) session["original_url"] = request.full_path url = add_url_params(metadata["authorization_endpoint"], { "client_id": os.getenv("OIDC_CLIENT_ID"), @@ -50,9 +47,8 @@ def add_url_params(url, params): @page_oidc.route('/login-callback') def login_callback(): - code = request.args.get('code') r = requests.post(metadata["token_endpoint"], { - "code": code, + "code": request.args.get('code'), "grant_type": "authorization_code", "redirect_uri": url_for("oidc.login_callback", _external=True, _scheme='https'), "client_id": os.getenv("OIDC_CLIENT_ID"), @@ -62,10 +58,10 @@ def login_callback(): return "failed to fetch tokens", 500 if not validate_id_token(r["id_token"]) or not read_user(r["access_token"]): return "tokens validation failed", 500 - print("authenticated") + session["id_token"] = r["id_token"] session["access_token"] = r["access_token"] - print("stored url was: " + session.get("original_url")) + print("authenticated, stored url was: " + session.get("original_url")) return redirect(session.pop("original_url", "/")) @page_oidc.route("/logout") diff --git a/inventory-app/templates/login.html b/inventory-app/templates/login.html deleted file mode 100644 index 5d85935..0000000 --- a/inventory-app/templates/login.html +++ /dev/null @@ -1,30 +0,0 @@ -{% extends 'base.html' %} - -{% block content %} -
- -
-
- {% if not devenv %} -

If you have active AD account click here to login

- {% else %} -

Click here to login as dev user

- {% endif %} -
-
-

Request a login link to your email address

-
- {{ form.csrf_token }} -

{{ form.email.label }}

-

{{ form.email }}

-

{{ form.recaptcha }}

- -
-
-
- - - -
-{% endblock %} - diff --git a/inventory-app/templates/login_error.html b/inventory-app/templates/login_error.html deleted file mode 100644 index 7c8e1e4..0000000 --- a/inventory-app/templates/login_error.html +++ /dev/null @@ -1,12 +0,0 @@ -{% extends 'base.html' %} - -{% block content %} -
-

-Your membership is not active or is suspended, please reach out to info@k-space.ee for more info -

- -
- -{% endblock %} - diff --git a/inventory-app/templates/login_link_request.html b/inventory-app/templates/login_link_request.html deleted file mode 100644 index 9bd28ce..0000000 --- a/inventory-app/templates/login_link_request.html +++ /dev/null @@ -1,10 +0,0 @@ -{% extends 'base.html' %} - -{% block content %} -
- -

If the address is known a login link should have been sent.

- -
-{% endblock %} -