From cba4503d416a455a6b60a4ef02f3f4b28c68979c Mon Sep 17 00:00:00 2001 From: Quartermaster Date: Fri, 12 Aug 2022 20:28:42 +0200 Subject: [PATCH] Move OAuth into core/aaa --- VERSION | 2 +- controllers/default.py | 8 ++++---- modules/{s3oauth.py => core/aaa/oauth.py} | 0 3 files changed, 5 insertions(+), 5 deletions(-) rename modules/{s3oauth.py => core/aaa/oauth.py} (100%) diff --git a/VERSION b/VERSION index f6d1c23219..788c554f39 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.5-44-g98342c09a (2022-08-12 20:09:26) +4.5-45-g9d2f3e717 (2022-08-12 20:28:42) diff --git a/controllers/default.py b/controllers/default.py index 0f996c2869..861e98a316 100755 --- a/controllers/default.py +++ b/controllers/default.py @@ -1148,7 +1148,7 @@ def facebook(): if not channel: redirect(URL(f="user", args=request.args, vars=get_vars)) - from s3oauth import FaceBookAccount + from core.aaa.oauth import FaceBookAccount auth.settings.login_form = FaceBookAccount(channel) form = auth() @@ -1163,7 +1163,7 @@ def google(): if not channel: redirect(URL(f="user", args=request.args, vars=get_vars)) - from s3oauth import GooglePlusAccount + from core.aaa.oauth import GooglePlusAccount auth.settings.login_form = GooglePlusAccount(channel) form = auth() @@ -1178,7 +1178,7 @@ def humanitarian_id(): if not channel: redirect(URL(f="user", args=request.args, vars=get_vars)) - from s3oauth import HumanitarianIDAccount + from core.aaa.oauth import HumanitarianIDAccount auth.settings.login_form = HumanitarianIDAccount(channel) form = auth() @@ -1192,7 +1192,7 @@ def openid_connect(): if not channel: redirect(URL(f="user", args=request.args, vars=get_vars)) - from s3oauth import OpenIDConnectAccount + from core.aaa.oauth import OpenIDConnectAccount auth.settings.login_form = OpenIDConnectAccount(channel) form = auth() diff --git a/modules/s3oauth.py b/modules/core/aaa/oauth.py similarity index 100% rename from modules/s3oauth.py rename to modules/core/aaa/oauth.py