rzmk/learnhouse
1
0
Fork 0
mirror of https://github.com/rzmk/learnhouse.git synced 2025-12-19 04:19:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: generic errors

Browse source
This commit is contained in:
swve 2023-06-19 17:57:11 +02:00
parent 9c2332961b
commit 94f50a89a5
3 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
config/config.py
View file

@ -1,4 +1,3 @@
from calendar import c
from typing import Optional from typing import Optional
from pydantic import BaseModel from pydantic import BaseModel
import os import os
@ -51,7 +50,7 @@ def get_learnhouse_config() -> LearnHouseConfig:
env_site_description = os.environ.get("LEARNHOUSE_SITE_DESCRIPTION") env_site_description = os.environ.get("LEARNHOUSE_SITE_DESCRIPTION")
env_contact_email = os.environ.get("LEARNHOUSE_CONTACT_EMAIL") env_contact_email = os.environ.get("LEARNHOUSE_CONTACT_EMAIL")
env_domain = os.environ.get("LEARNHOUSE_DOMAIN") env_domain = os.environ.get("LEARNHOUSE_DOMAIN")
env_port = os.environ.get("LEARNHOUSE_PORT") os.environ.get("LEARNHOUSE_PORT")
env_ssl = os.environ.get("LEARNHOUSE_SSL") env_ssl = os.environ.get("LEARNHOUSE_SSL")
env_use_default_org = os.environ.get("LEARNHOUSE_USE_DEFAULT_ORG") env_use_default_org = os.environ.get("LEARNHOUSE_USE_DEFAULT_ORG")
env_allowed_origins = os.environ.get("LEARNHOUSE_ALLOWED_ORIGINS") env_allowed_origins = os.environ.get("LEARNHOUSE_ALLOWED_ORIGINS")

3
src/security/auth.py
View file

@ -1,4 +1,3 @@
from webbrowser import get
from config.config import get_learnhouse_config from config.config import get_learnhouse_config
from pydantic import BaseModel from pydantic import BaseModel
from fastapi import Depends, HTTPException, Request, status from fastapi import Depends, HTTPException, Request, status
@ -7,7 +6,7 @@ from jose import JWTError, jwt
from datetime import datetime, timedelta from datetime import datetime, timedelta
from src.services.users.schemas.users import AnonymousUser, PublicUser from src.services.users.schemas.users import AnonymousUser, PublicUser
from src.services.users.users import security_get_user, security_verify_password from src.services.users.users import security_get_user, security_verify_password
from src.security.security import ALGORITHM, SECRET_KEY, verify_user_rights_with_roles from src.security.security import ALGORITHM, SECRET_KEY
from fastapi_jwt_auth import AuthJWT from fastapi_jwt_auth import AuthJWT
oauth2_scheme = OAuth2PasswordBearer(tokenUrl="/api/auth/login") oauth2_scheme = OAuth2PasswordBearer(tokenUrl="/api/auth/login")

7
src/services/orgs/orgs.py
View file

@ -1,5 +1,4 @@
import json import json
from typing import Optional
from uuid import uuid4 from uuid import uuid4
from src.services.orgs.logos import upload_org_logo from src.services.orgs.logos import upload_org_logo
from src.services.orgs.schemas.orgs import ( from src.services.orgs.schemas.orgs import (
@ -96,7 +95,7 @@ async def update_org(
orgs = request.app.db["organizations"] orgs = request.app.db["organizations"]
org = await orgs.find_one({"org_id": org_id}) await orgs.find_one({"org_id": org_id})
updated_org = OrganizationInDB(org_id=org_id, **org_object.dict()) updated_org = OrganizationInDB(org_id=org_id, **org_object.dict())
@ -114,12 +113,12 @@ async def update_org_logo(
orgs = request.app.db["organizations"] orgs = request.app.db["organizations"]
org = await orgs.find_one({"org_id": org_id}) await orgs.find_one({"org_id": org_id})
name_in_disk = await upload_org_logo(logo_file) name_in_disk = await upload_org_logo(logo_file)
# update org # update org
org = await orgs.update_one({"org_id": org_id}, {"$set": {"logo": name_in_disk}}) await orgs.update_one({"org_id": org_id}, {"$set": {"logo": name_in_disk}})
return {"detail": "Logo updated"} return {"detail": "Logo updated"}