diff --git a/kdb-bot/src/bot/bot.json b/kdb-bot/src/bot/bot.json index 2245c518..a0297264 100644 --- a/kdb-bot/src/bot/bot.json +++ b/kdb-bot/src/bot/bot.json @@ -26,7 +26,7 @@ "PyJWT==2.6.0", "waitress==2.1.2", "Flask-SocketIO==5.3.2", - "eventlet==0.33.2", + "eventlet==0.33.3", "requests-oauthlib==1.3.1", "icmplib==3.0.3", "ariadne==0.17.1" diff --git a/kdb-bot/src/bot_api/config b/kdb-bot/src/bot_api/config index e6046881..27289afd 160000 --- a/kdb-bot/src/bot_api/config +++ b/kdb-bot/src/bot_api/config @@ -1 +1 @@ -Subproject commit e6046881b562982008583afa973b39ff08b6a3c7 +Subproject commit 27289afd5e2d020cd9fcec62a682204a93688f25 diff --git a/kdb-bot/src/bot_api/controller/auth_discord_controller.py b/kdb-bot/src/bot_api/controller/auth_discord_controller.py index 322e186c..b9a13906 100644 --- a/kdb-bot/src/bot_api/controller/auth_discord_controller.py +++ b/kdb-bot/src/bot_api/controller/auth_discord_controller.py @@ -8,7 +8,7 @@ from cpl_core.utils import CredentialManager from cpl_discord.service import DiscordBotServiceABC from cpl_translation import TranslatePipe from flask import jsonify, Response -from flask import request, session +from flask import request from requests_oauthlib import OAuth2Session from bot_api.abc.auth_service_abc import AuthServiceABC @@ -16,10 +16,8 @@ from bot_api.api import Api from bot_api.configuration.discord_authentication_settings import ( DiscordAuthenticationSettings, ) -from bot_api.json_processor import JSONProcessor from bot_api.logging.api_logger import ApiLogger from bot_api.model.auth_user_dto import AuthUserDTO -from bot_api.model.o_auth_dto import OAuthDTO from bot_api.route.route import Route from bot_data.model.auth_role_enum import AuthRoleEnum @@ -59,7 +57,7 @@ class AuthDiscordController: self._bot.user.id, redirect_uri=self._auth_settings.redirect_url, state=request.args.get("state"), - scope=self._auth_settings.scope, + scope=self._auth_settings.scope.to_list(), ) token = discord.fetch_token( self._auth_settings.token_url, @@ -74,7 +72,7 @@ class AuthDiscordController: oauth = OAuth2Session( self._bot.user.id, redirect_uri=self._auth_settings.redirect_url, - scope=self._auth_settings.scope, + scope=self._auth_settings.scope.to_list(), ) login_url, state = oauth.authorization_url(self._auth_settings.auth_url) return jsonify({"loginUrl": login_url}) diff --git a/kdb-web/package.json b/kdb-web/package.json index 9a7aadca..463f97bf 100644 --- a/kdb-web/package.json +++ b/kdb-web/package.json @@ -1,6 +1,6 @@ { "name": "kdb-web", - "version": "0.3.0", + "version": "0.3.dev162", "scripts": { "ng": "ng", "update-version": "ts-node-esm update-version.ts", @@ -50,4 +50,4 @@ "tslib": "^2.4.1", "typescript": "~4.7.2" } -} +} \ No newline at end of file diff --git a/kdb-web/src/assets/config.json b/kdb-web/src/assets/config.json index 905b2d2f..7821c2be 100644 --- a/kdb-web/src/assets/config.json +++ b/kdb-web/src/assets/config.json @@ -3,7 +3,7 @@ "WebVersion": { "Major": "0", "Minor": "3", - "Micro": "0" + "Micro": "dev162" }, "Themes": [ {