feat: Add Households to Mealie (#3970)

This commit is contained in:
Michael Genson
2024-08-22 10:14:32 -05:00
committed by GitHub
parent 0c29cef17d
commit eb170cc7e5
315 changed files with 6975 additions and 3577 deletions

View File

@@ -68,7 +68,7 @@ async def get_public_group(group_slug: str = fastapi.Path(...), session=Depends(
repos = get_repositories(session)
group = repos.groups.get_by_slug_or_id(group_slug)
if not group or group.preferences.private_group or not group.preferences.recipe_public:
if not group or group.preferences.private_group:
raise HTTPException(404, "group not found")
else:
return group
@@ -111,7 +111,7 @@ async def get_current_user(
except PyJWTError as e:
raise credentials_exception from e
repos = get_repositories(session)
repos = get_repositories(session, group_id=None, household_id=None)
user = repos.users.get_one(token_data.user_id, "id", any_case=False)
@@ -139,7 +139,7 @@ async def get_admin_user(current_user: PrivateUser = Depends(get_current_user))
def validate_long_live_token(session: Session, client_token: str, user_id: str) -> PrivateUser:
repos = get_repositories(session)
repos = get_repositories(session, group_id=None, household_id=None)
token = repos.api_tokens.multi_query({"token": client_token, "user_id": user_id})

View File

@@ -56,7 +56,7 @@ class AuthProvider(Generic[T], metaclass=abc.ABCMeta):
if self.__has_tried_user:
return self.user
db = get_repositories(self.session)
db = get_repositories(self.session, group_id=None, household_id=None)
user = user = db.users.get_one(username, "username", any_case=True)
if not user:

View File

@@ -23,7 +23,7 @@ class CredentialsProvider(AuthProvider[CredentialsRequest]):
async def authenticate(self) -> tuple[str, timedelta] | None:
"""Attempt to authenticate a user given a username and password"""
settings = get_app_settings()
db = get_repositories(self.session)
db = get_repositories(self.session, group_id=None, household_id=None)
user = self.try_get_user(self.data.username)
if not user:

View File

@@ -95,7 +95,7 @@ class LDAPProvider(CredentialsProvider):
"""
settings = get_app_settings()
db = get_repositories(self.session)
db = get_repositories(self.session, group_id=None, household_id=None)
if not self.data:
return None
data = self.data

View File

@@ -33,7 +33,7 @@ class OpenIDProvider(AuthProvider[OIDCRequest]):
if not claims:
return None
repos = get_repositories(self.session)
repos = get_repositories(self.session, group_id=None, household_id=None)
user = self.try_get_user(claims.get(settings.OIDC_USER_CLAIM))
is_admin = False

View File

@@ -179,6 +179,7 @@ class AppSettings(AppLoggingSettings):
return self.DB_PROVIDER.db_url_public if self.DB_PROVIDER else None
DEFAULT_GROUP: str = "Home"
DEFAULT_HOUSEHOLD: str = "Family"
_DEFAULT_EMAIL: str = "changeme@example.com"
"""