Skip to content

Fix empty scopes #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
grigoriev-semyon merged 1 commit into from
Apr 7, 2024
Merged

Fix empty scopes #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions services_backend/routes/button.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ def get_buttons(
"required_scopes": button.required_scopes,
"optional_scopes": button.optional_scopes,
}
if scopes:
if view == ButtonView.ACTIVE:
to_add["scopes"] = list(scopes)
result["buttons"].append(to_add)
return result
Expand Down Expand Up @@ -184,7 +184,7 @@ def get_button(
"required_scopes": button.required_scopes,
"optional_scopes": button.optional_scopes,
}
if scopes:
if view == ButtonView.ACTIVE:
result["scopes"] = list(scopes)
return result

Expand Down Expand Up @@ -312,6 +312,6 @@ def get_service(
"required_scopes": button.required_scopes,
"optional_scopes": button.optional_scopes,
}
if scopes:
if view == ButtonView.ACTIVE:
result["scopes"] = list(scopes)
return result
2 changes: 1 addition & 1 deletion services_backend/routes/category.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ def get_categories(
"order": button.order,
"type": button.type,
"view": view.value,
"scopes": list(scopes) if scopes else None,
"scopes": list(scopes) if view == ButtonView.ACTIVE else None,
"required_scopes": button.required_scopes,
"optional_scopes": button.optional_scopes,
}
Expand Down