fix(ci): Adapt to change in authlib imports

See the warning about the change in version 0.13 in https://docs.authlib.org/en/stable/client/flask.html

10 files changed, 11 insertions, 11 deletions

diff --git a/api/app_oauth.py b/api/app_oauth.py
index 171f833b..98616f47 100644
--- a/api/app_oauth.py
+++ b/api/app_oauth.py
@@ -1,5 +1,5 @@
-from authlib.flask.oauth2 import AuthorizationServer, ResourceProtector
-from authlib.flask.oauth2.sqla import (
+from authlib.integrations.flask_oauth2 import AuthorizationServer, ResourceProtector
+from authlib.integrations.sqla_oauth2 import (
     create_query_client_func,
     create_save_token_func,
     create_revocation_endpoint,
diff --git a/api/controllers/api/account.py b/api/controllers/api/account.py
index 3230beef..b98af64a 100644
--- a/api/controllers/api/account.py
+++ b/api/controllers/api/account.py
@@ -1,6 +1,6 @@
 from flask import Blueprint, jsonify, request, abort
 from app_oauth import require_oauth
-from authlib.flask.oauth2 import current_token
+from authlib.integrations.flask_oauth2 import current_token
 from models import UserLogging
 
 bp_api_account = Blueprint("bp_api_account", __name__)
diff --git a/api/controllers/api/albums.py b/api/controllers/api/albums.py
index 699baf4e..513581cd 100644
--- a/api/controllers/api/albums.py
+++ b/api/controllers/api/albums.py
@@ -1,6 +1,6 @@
 from flask import Blueprint, jsonify, request, current_app
 from app_oauth import require_oauth
-from authlib.flask.oauth2 import current_token
+from authlib.integrations.flask_oauth2 import current_token
 from forms import AlbumForm
 from models import db, Album, User, Sound, SoundTag
 import json
diff --git a/api/controllers/api/pleroma_admin.py b/api/controllers/api/pleroma_admin.py
index 9fabdf1c..3f408d64 100644
--- a/api/controllers/api/pleroma_admin.py
+++ b/api/controllers/api/pleroma_admin.py
@@ -1,7 +1,7 @@
 from flask import Blueprint, request, jsonify, abort
 from models import db, User
 from app_oauth import require_oauth
-from authlib.flask.oauth2 import current_token
+from authlib.integrations.flask_oauth2 import current_token
 
 bp_api_pleroma_admin = Blueprint("bp_api_pleroma_admin", __name__)
 
diff --git a/api/controllers/api/reel2bits.py b/api/controllers/api/reel2bits.py
index 77ab5f95..fddbd9b8 100644
--- a/api/controllers/api/reel2bits.py
+++ b/api/controllers/api/reel2bits.py
@@ -3,7 +3,7 @@ from models import db, User, PasswordResetToken, Sound, SoundTag, Actor, Followe
 from utils.various import add_user_log, generate_random_token, add_log
 from datas_helpers import to_json_account, to_json_relationship, default_genres, to_json_track
 from app_oauth import require_oauth
-from authlib.flask.oauth2 import current_token
+from authlib.integrations.flask_oauth2 import current_token
 from flask_security.utils import hash_password, verify_password
 from flask_mail import Message
 import smtplib
diff --git a/api/controllers/api/tracks.py b/api/controllers/api/tracks.py
index affeb990..492edb5e 100644
--- a/api/controllers/api/tracks.py
+++ b/api/controllers/api/tracks.py
@@ -1,6 +1,6 @@
 from flask import Blueprint, request, jsonify, current_app
 from app_oauth import require_oauth
-from authlib.flask.oauth2 import current_token
+from authlib.integrations.flask_oauth2 import current_token
 from forms import SoundUploadForm
 from models import db, Sound, User, Album, UserLogging, SoundTag
 import json
diff --git a/api/controllers/api/v1/accounts.py b/api/controllers/api/v1/accounts.py
index 897dda54..0ee3ad47 100644
--- a/api/controllers/api/v1/accounts.py
+++ b/api/controllers/api/v1/accounts.py
@@ -17,7 +17,7 @@ from models import (
 from flask_security.utils import hash_password
 from flask_security import confirmable as FSConfirmable
 from app_oauth import authorization, require_oauth
-from authlib.flask.oauth2 import current_token
+from authlib.integrations.flask_oauth2 import current_token
 from datas_helpers import to_json_track, to_json_account, to_json_relationship
 from utils.various import forbidden_username, add_user_log, add_log, get_hashed_filename
 from tasks import send_update_profile, federate_delete_actor, post_to_outbox
diff --git a/api/controllers/api/v1/timelines.py b/api/controllers/api/v1/timelines.py
index 3925bd15..f1b1a040 100644
--- a/api/controllers/api/v1/timelines.py
+++ b/api/controllers/api/v1/timelines.py
@@ -2,7 +2,7 @@ from flask import Blueprint, jsonify, request, abort
 from models import db, Sound, Activity, Album, User
 from app_oauth import require_oauth
 from datas_helpers import to_json_track, to_json_account, to_json_album, to_json_relationship
-from authlib.flask.oauth2 import current_token
+from authlib.integrations.flask_oauth2 import current_token
 
 
 bp_api_v1_timelines = Blueprint("bp_api_v1_timelines", __name__)
diff --git a/api/forms.py b/api/forms.py
index e49465a8..bace39c8 100644
--- a/api/forms.py
+++ b/api/forms.py
@@ -1,4 +1,4 @@
-from authlib.flask.oauth2 import current_token
+from authlib.integrations.flask_oauth2 import current_token
 from flask_uploads import UploadSet, AUDIO
 from flask_wtf import FlaskForm as Form
 from flask_wtf.file import FileField, FileAllowed, FileRequired
diff --git a/api/models.py b/api/models.py
index d057d6b1..c1365702 100644
--- a/api/models.py
+++ b/api/models.py
@@ -19,7 +19,7 @@ from sqlalchemy.dialects.postgresql import UUID, JSONB
 from sqlalchemy import text as sa_text
 from little_boxes import activitypub as ap
 from urllib.parse import urlparse
-from authlib.flask.oauth2.sqla import OAuth2ClientMixin, OAuth2AuthorizationCodeMixin, OAuth2TokenMixin
+from authlib.integrations.sqla_oauth2 import OAuth2ClientMixin, OAuth2AuthorizationCodeMixin, OAuth2TokenMixin
 import time
 import uuid
 from utils.defaults import Reel2bitsDefaults