Skip to content

Commit 1361a58

Browse files
grigoriev-semyongrigoriev-semyon
authored
Cli fix (#194)
1 parent 72be529 commit 1361a58

4 files changed

Lines changed: 45 additions & 33 deletions

File tree

‎Makefile‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -35,30 +35,30 @@ create-user:
3535

3636
create-admin:
3737
source ./venv/bin/activate && python -m auth_backend user create --email test-admin@profcomff.com --password string
38-
source ./venv/bin/activate && python -m auth_backend scope create --name auth.group.create --comment auth.group.create --creator 1
39-
source ./venv/bin/activate && python -m auth_backend scope create --name auth.group.delete --comment auth.group.delete --creator 1
40-
source ./venv/bin/activate && python -m auth_backend scope create --name auth.group.read --comment auth.group.read --creator 1
41-
source ./venv/bin/activate && python -m auth_backend scope create --name auth.group.update --comment auth.group.update --creator 1
42-
source ./venv/bin/activate && python -m auth_backend scope create --name auth.scope.create --comment auth.scope.create --creator 1
43-
source ./venv/bin/activate && python -m auth_backend scope create --name auth.scope.delete --comment auth.scope.delete --creator 1
44-
source ./venv/bin/activate && python -m auth_backend scope create --name auth.scope.read --comment auth.scope.read --creator 1
45-
source ./venv/bin/activate && python -m auth_backend scope create --name auth.scope.update --comment auth.scope.update --creator 1
46-
source ./venv/bin/activate && python -m auth_backend scope create --name auth.user.delete --comment auth.user.delete --creator 1
47-
source ./venv/bin/activate && python -m auth_backend scope create --name auth.user.read --comment auth.user.read --creator 1
48-
source ./venv/bin/activate && python -m auth_backend scope create --name auth.user.update --comment auth.user.update --creator 1
49-
source ./venv/bin/activate && python -m auth_backend scope create --name auth.airflow_outer_auth.link.read --comment auth.airflow_outer_auth.link.read --creator 1
50-
source ./venv/bin/activate && python -m auth_backend scope create --name auth.airflow_outer_auth.link.create --comment auth.airflow_outer_auth.link.create --creator 1
51-
source ./venv/bin/activate && python -m auth_backend scope create --name auth.airflow_outer_auth.link.delete --comment auth.airflow_outer_auth.link.delete --creator 1
52-
source ./venv/bin/activate && python -m auth_backend scope create --name auth.coder_outer_auth.link.read --comment auth.coder_outer_auth.link.read --creator 1
53-
source ./venv/bin/activate && python -m auth_backend scope create --name auth.coder_outer_auth.link.create --comment auth.coder_outer_auth.link.create --creator 1
54-
source ./venv/bin/activate && python -m auth_backend scope create --name auth.coder_outer_auth.link.delete --comment auth.coder_outer_auth.link.delete --creator 1
55-
source ./venv/bin/activate && python -m auth_backend scope create --name auth.mailu_outer_auth.link.read --comment auth.mailu_outer_auth.link.read --creator 1
56-
source ./venv/bin/activate && python -m auth_backend scope create --name auth.mailu_outer_auth.link.create --comment auth.mailu_outer_auth.link.create --creator 1
57-
source ./venv/bin/activate && python -m auth_backend scope create --name auth.mailu_outer_auth.link.delete --comment auth.mailu_outer_auth.link.delete --creator 1
58-
source ./venv/bin/activate && python -m auth_backend scope create --name auth.postgres_outer_auth.link.read --comment auth.postgres_outer_auth.link.read --creator 1
59-
source ./venv/bin/activate && python -m auth_backend scope create --name auth.postgres_outer_auth.link.create --comment auth.postgres_outer_auth.link.create --creator 1
60-
source ./venv/bin/activate && python -m auth_backend scope create --name auth.postgres_outer_auth.link.delete --comment auth.postgres_outer_auth.link.delete --creator 1
61-
source ./venv/bin/activate && python -m auth_backend user_group create --user_id 1 --group_id 1
38+
source ./venv/bin/activate && python -m auth_backend scope create --name auth.group.create --comment auth.group.create --creator_email test-admin@profcomff.com
39+
source ./venv/bin/activate && python -m auth_backend scope create --name auth.group.delete --comment auth.group.delete --creator_email test-admin@profcomff.com
40+
source ./venv/bin/activate && python -m auth_backend scope create --name auth.group.read --comment auth.group.read --creator_email test-admin@profcomff.com
41+
source ./venv/bin/activate && python -m auth_backend scope create --name auth.group.update --comment auth.group.update --creator_email test-admin@profcomff.com
42+
source ./venv/bin/activate && python -m auth_backend scope create --name auth.scope.create --comment auth.scope.create --creator_email test-admin@profcomff.com
43+
source ./venv/bin/activate && python -m auth_backend scope create --name auth.scope.delete --comment auth.scope.delete --creator_email test-admin@profcomff.com
44+
source ./venv/bin/activate && python -m auth_backend scope create --name auth.scope.read --comment auth.scope.read --creator_email test-admin@profcomff.com
45+
source ./venv/bin/activate && python -m auth_backend scope create --name auth.scope.update --comment auth.scope.update --creator_email test-admin@profcomff.com
46+
source ./venv/bin/activate && python -m auth_backend scope create --name auth.user.delete --comment auth.user.delete --creator_email test-admin@profcomff.com
47+
source ./venv/bin/activate && python -m auth_backend scope create --name auth.user.read --comment auth.user.read --creator_email test-admin@profcomff.com
48+
source ./venv/bin/activate && python -m auth_backend scope create --name auth.user.update --comment auth.user.update --creator_email test-admin@profcomff.com
49+
source ./venv/bin/activate && python -m auth_backend scope create --name auth.airflow_outer_auth.link.read --comment auth.airflow_outer_auth.link.read --creator_email test-admin@profcomff.com
50+
source ./venv/bin/activate && python -m auth_backend scope create --name auth.airflow_outer_auth.link.create --comment auth.airflow_outer_auth.link.create --creator_email test-admin@profcomff.com
51+
source ./venv/bin/activate && python -m auth_backend scope create --name auth.airflow_outer_auth.link.delete --comment auth.airflow_outer_auth.link.delete --creator_email test-admin@profcomff.com
52+
source ./venv/bin/activate && python -m auth_backend scope create --name auth.coder_outer_auth.link.read --comment auth.coder_outer_auth.link.read --creator_email test-admin@profcomff.com
53+
source ./venv/bin/activate && python -m auth_backend scope create --name auth.coder_outer_auth.link.create --comment auth.coder_outer_auth.link.create --creator_email test-admin@profcomff.com
54+
source ./venv/bin/activate && python -m auth_backend scope create --name auth.coder_outer_auth.link.delete --comment auth.coder_outer_auth.link.delete --creator_email test-admin@profcomff.com
55+
source ./venv/bin/activate && python -m auth_backend scope create --name auth.mailu_outer_auth.link.read --comment auth.mailu_outer_auth.link.read --creator_email test-admin@profcomff.com
56+
source ./venv/bin/activate && python -m auth_backend scope create --name auth.mailu_outer_auth.link.create --comment auth.mailu_outer_auth.link.create --creator_email test-admin@profcomff.com
57+
source ./venv/bin/activate && python -m auth_backend scope create --name auth.mailu_outer_auth.link.delete --comment auth.mailu_outer_auth.link.delete --creator_email test-admin@profcomff.com
58+
source ./venv/bin/activate && python -m auth_backend scope create --name auth.postgres_outer_auth.link.read --comment auth.postgres_outer_auth.link.read --creator_email test-admin@profcomff.com
59+
source ./venv/bin/activate && python -m auth_backend scope create --name auth.postgres_outer_auth.link.create --comment auth.postgres_outer_auth.link.create --creator_email test-admin@profcomff.com
60+
source ./venv/bin/activate && python -m auth_backend scope create --name auth.postgres_outer_auth.link.delete --comment auth.postgres_outer_auth.link.delete --creator_email test-admin@profcomff.com
61+
source ./venv/bin/activate && python -m auth_backend user_group create --email test-admin@profcomff.com
6262

6363
login-user:
6464
curl -X 'POST' 'http://localhost:8000/email/login' -H 'accept: application/json' -H 'Content-Type: application/json' -d '{"email": "test-user@profcomff.com", "password": "string"}'

‎auth_backend/cli/process.py‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,13 @@ def get_args():
4040
scope_subparsers = scope.add_subparsers(dest='subcommand')
4141
scope_create = scope_subparsers.add_parser("create")
4242
scope_create.add_argument('--name', type=str, required=True)
43-
scope_create.add_argument('--creator', type=str, required=True)
43+
scope_create.add_argument('--creator_email', type=str, required=True)
4444
scope_create.add_argument('--comment', type=str, required=True)
4545

4646
user_group = subparsers.add_parser("user_group")
4747
user_group_subparsers = user_group.add_subparsers(dest='subcommand')
4848
user_group_create = user_group_subparsers.add_parser("create")
49-
user_group_create.add_argument('--user_id', type=str, required=True)
50-
user_group_create.add_argument('--group_id', type=str, required=True)
49+
user_group_create.add_argument('--email', type=str, required=True)
5150

5251
return parser.parse_args()
5352

@@ -67,7 +66,7 @@ def process() -> None:
6766
create_group(args.name, args.scopes, args.parent, session)
6867
elif args.command == 'scope' and args.subcommand == 'create':
6968
print(f'Creating scope with params {args}')
70-
create_scope(args.name, args.creator, args.comment, session)
69+
create_scope(args.name, args.creator_email, args.comment, session)
7170
elif args.command == 'user_group' and args.subcommand == 'create':
7271
print(f'Creating user_group with params {args}')
73-
create_user_group(args.user_id, args.group_id, session)
72+
create_user_group(args.email, session)

‎auth_backend/cli/scope.py‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,19 @@
22

33
from sqlalchemy.orm import Session
44

5-
from auth_backend.models.db import Scope
5+
from auth_backend.models.db import AuthMethod, Scope
66

77

8-
def create_scope(name: str, creator_id: int, comment: str, session: Session) -> None:
8+
def create_scope(name: str, creator_email: str, comment: str, session: Session) -> None:
99
if Scope.query(session=session).filter(Scope.name == name).one_or_none():
1010
print("Scope already exists")
1111
exit(errno.EIO)
12+
creator_id = (
13+
AuthMethod.query(session=session)
14+
.filter(AuthMethod.auth_method == "email", AuthMethod.value == creator_email)
15+
.one()
16+
.user_id
17+
)
1218
scope = Scope.create(name=name, creator_id=creator_id, comment=comment, session=session)
1319
session.commit()
1420
print(f"Created scope: {scope}")

‎auth_backend/cli/user_group.py‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,17 @@
22

33
from sqlalchemy.orm import Session
44

5-
from auth_backend.models.db import UserGroup
5+
from auth_backend.models.db import AuthMethod, Group, UserGroup
66

77

8-
def create_user_group(user_id: int, group_id: int, session: Session) -> None:
8+
def create_user_group(email: str, session: Session) -> None:
9+
user_id = (
10+
AuthMethod.query(session=session)
11+
.filter(AuthMethod.auth_method == "email", AuthMethod.value == email)
12+
.one()
13+
.user_id
14+
)
15+
group_id = Group.query(session=session).filter(Group.name == "root").one().id
916
if (
1017
UserGroup.query(session=session)
1118
.filter(UserGroup.user_id == user_id, UserGroup.group_id == group_id)

0 commit comments

Comments
 (0)