Move OAuth into core/aaa

sahana · Aug 12, 2022 · cba4503 · cba4503
1 parent 9d2f3e7
commit cba4503
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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 → modules/core/aaa/oauth.py b/modules/s3oauth.py → modules/core/aaa/oauth.py
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		4.5-44-g98342c09a (2022-08-12 20:09:26)
		4.5-45-g9d2f3e717 (2022-08-12 20:28:42)