From b07685666b5d1464210cdbab4892c30a4e15d0f0 Mon Sep 17 00:00:00 2001 From: grossmj Date: Mon, 6 Apr 2026 19:55:11 +0800 Subject: [PATCH] Regenerate DB migration script --- .../controller/dependencies/authentication.py | 2 +- .../20260405_add_token_version_to_users.py | 28 ------------------- ...fc119a_add_token_version_to_users_table.py | 24 ++++++++++++++++ 3 files changed, 25 insertions(+), 29 deletions(-) delete mode 100644 gns3server/db_migrations/versions/20260405_add_token_version_to_users.py create mode 100644 gns3server/db_migrations/versions/aff810fc119a_add_token_version_to_users_table.py diff --git a/gns3server/api/routes/controller/dependencies/authentication.py b/gns3server/api/routes/controller/dependencies/authentication.py index abd746ce1..fb21aa8e3 100644 --- a/gns3server/api/routes/controller/dependencies/authentication.py +++ b/gns3server/api/routes/controller/dependencies/authentication.py @@ -58,7 +58,7 @@ async def get_user_from_token( if token_data.token_version != user.token_version: raise HTTPException( status_code=status.HTTP_401_UNAUTHORIZED, - detail="Token has been revoked", + detail=f"Token has been revoked for '{token_data.username}'", headers={"WWW-Authenticate": "Bearer"}, ) return user diff --git a/gns3server/db_migrations/versions/20260405_add_token_version_to_users.py b/gns3server/db_migrations/versions/20260405_add_token_version_to_users.py deleted file mode 100644 index aa65f786c..000000000 --- a/gns3server/db_migrations/versions/20260405_add_token_version_to_users.py +++ /dev/null @@ -1,28 +0,0 @@ -"""add token_version to users - -Revision ID: 20260405_add_token_version_to_users -Revises: 20260303_create_llm_model_configs -Create Date: 2026-04-05 - -""" -from alembic import op -import sqlalchemy as sa -from sqlalchemy import inspect - -# revision identifiers, used by Alembic. -revision = '20260405_add_token_version_to_users' -down_revision = 'ec4b7b198555' -branch_labels = None -depends_on = None - - -def upgrade() -> None: - conn = op.get_bind() - inspector = inspect(conn) - columns = [col['name'] for col in inspector.get_columns('users')] - if 'token_version' not in columns: - op.add_column('users', sa.Column('token_version', sa.Integer(), nullable=False, server_default='0')) - - -def downgrade() -> None: - op.drop_column('users', 'token_version') diff --git a/gns3server/db_migrations/versions/aff810fc119a_add_token_version_to_users_table.py b/gns3server/db_migrations/versions/aff810fc119a_add_token_version_to_users_table.py new file mode 100644 index 000000000..f9f82cc43 --- /dev/null +++ b/gns3server/db_migrations/versions/aff810fc119a_add_token_version_to_users_table.py @@ -0,0 +1,24 @@ +"""add token version to users table + +Revision ID: aff810fc119a +Revises: ec4b7b198555 +Create Date: 2026-04-06 19:49:12.155446 + +""" +from alembic import op +import sqlalchemy as sa + +# revision identifiers, used by Alembic. +revision = 'aff810fc119a' +down_revision = 'ec4b7b198555' +branch_labels = None +depends_on = None + + +def upgrade() -> None: + + op.add_column('users', sa.Column('token_version', sa.Integer(), nullable=False, server_default='0')) + +def downgrade() -> None: + + op.drop_column('users', 'token_version')