Skip to content
Open
Changes from all commits
Commits
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
34 changes: 23 additions & 11 deletions propelauth_flask/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
from propelauth_py.api import (
OrgQueryOrderBy,
UserQueryOrderBy,
SsoTrustLevel
)
from werkzeug.local import LocalProxy
from propelauth_flask.auth_decorator import (
Expand Down Expand Up @@ -104,13 +105,13 @@ def validate_access_token_and_get_user(self, authorization_header: str) -> User:
def fetch_user_metadata_by_user_id(self, user_id: str, include_orgs: bool = False):
return self.auth.fetch_user_metadata_by_user_id(user_id, include_orgs)

def fetch_user_metadata_by_email(self, email: str, include_orgs: bool = False):
return self.auth.fetch_user_metadata_by_email(email, include_orgs)
def fetch_user_metadata_by_email(self, email: str, include_orgs: bool = False, isolated_org_id: Optional[str] = None):
return self.auth.fetch_user_metadata_by_email(email, include_orgs, isolated_org_id)

def fetch_user_metadata_by_username(
self, username: str, include_orgs: bool = False
self, username: str, include_orgs: bool = False, isolated_org_id: Optional[str] = None
):
return self.auth.fetch_user_metadata_by_username(username, include_orgs)
return self.auth.fetch_user_metadata_by_username(username, include_orgs, isolated_org_id)

def fetch_user_signup_query_params_by_user_id(self, user_id: str):
return self.auth.fetch_user_signup_query_params_by_user_id(user_id)
Expand Down Expand Up @@ -162,6 +163,7 @@ def fetch_users_by_query(
email_or_username: Optional[str] = None,
include_orgs: bool = False,
legacy_user_id: Optional[str] = None,
isolated_org_id: Optional[str] = None
):
return self.auth.fetch_users_by_query(
page_size,
Expand All @@ -170,6 +172,7 @@ def fetch_users_by_query(
email_or_username,
include_orgs,
legacy_user_id,
isolated_org_id
)

def fetch_users_in_org(
Expand Down Expand Up @@ -357,6 +360,7 @@ def update_org_metadata(
domain: Optional[str] = None,
require_2fa_by: Optional[str] = None,
extra_domains: Optional[List[str]] = None,
sso_trust_level: Optional[SsoTrustLevel] = None
):
return self.auth.update_org_metadata(
org_id,
Expand All @@ -369,6 +373,7 @@ def update_org_metadata(
domain,
require_2fa_by,
extra_domains,
sso_trust_level
)

def subscribe_org_to_role_mapping(self, org_id: str, custom_role_mapping_name: str):
Expand Down Expand Up @@ -574,6 +579,9 @@ def verify_sms_challenge(

def fetch_employee_by_id(self, employee_id: str):
return self.auth.fetch_employee_by_id(employee_id)

def migrate_org_to_isolated(self, org_id: str):
return self.auth.migrate_org_to_isolated(org_id)


class FlaskAuthAsync():
Expand Down Expand Up @@ -646,11 +654,11 @@ def validate_access_token_and_get_user(self, authorization_header: str) -> User:
async def fetch_user_metadata_by_user_id(self, user_id: str, include_orgs: bool = False):
return await self.auth.fetch_user_metadata_by_user_id(user_id, include_orgs)

async def fetch_user_metadata_by_email(self, email: str, include_orgs: bool = False):
return await self.auth.fetch_user_metadata_by_email(email, include_orgs)
async def fetch_user_metadata_by_email(self, email: str, include_orgs: bool = False, isolated_org_id: Optional[str] = None):
return await self.auth.fetch_user_metadata_by_email(email, include_orgs, isolated_org_id)

async def fetch_user_metadata_by_username(self, username: str, include_orgs: bool = False):
return await self.auth.fetch_user_metadata_by_username(username, include_orgs)
async def fetch_user_metadata_by_username(self, username: str, include_orgs: bool = False, isolated_org_id: Optional[str] = None):
return await self.auth.fetch_user_metadata_by_username(username, include_orgs, isolated_org_id)

async def fetch_user_signup_query_params_by_user_id(self, user_id: str):
return await self.auth.fetch_user_signup_query_params_by_user_id(user_id)
Expand Down Expand Up @@ -681,9 +689,9 @@ async def fetch_pending_invites(self, page_number: int = 0, page_size: int = 10,

async def fetch_users_by_query(
self, page_size: int = 10, page_number: int = 0, order_by: UserQueryOrderBy = UserQueryOrderBy.CREATED_AT_ASC,
email_or_username: Optional[str] = None, include_orgs: bool = False, legacy_user_id: Optional[str] = None
email_or_username: Optional[str] = None, include_orgs: bool = False, legacy_user_id: Optional[str] = None, isolated_org_id: Optional[str] = None
):
return await self.auth.fetch_users_by_query(page_size, page_number, order_by, email_or_username, include_orgs, legacy_user_id)
return await self.auth.fetch_users_by_query(page_size, page_number, order_by, email_or_username, include_orgs, legacy_user_id, isolated_org_id)

async def fetch_users_in_org(
self, org_id: str, page_size: int = 10, page_number: int = 0, include_orgs: bool = False, role: Optional[str] = None
Expand Down Expand Up @@ -805,10 +813,11 @@ async def update_org_metadata(
domain: Optional[str] = None,
require_2fa_by: Optional[str] = None,
extra_domains: Optional[List[str]] = None,
sso_trust_level: Optional[SsoTrustLevel] = None
):
return await self.auth.update_org_metadata(
org_id, name, can_setup_saml, metadata, max_users,
can_join_on_email_domain_match, members_must_have_email_domain_match, domain, require_2fa_by, extra_domains
can_join_on_email_domain_match, members_must_have_email_domain_match, domain, require_2fa_by, extra_domains, sso_trust_level
)

async def subscribe_org_to_role_mapping(self, org_id: str, custom_role_mapping_name: str):
Expand Down Expand Up @@ -1019,6 +1028,9 @@ async def fetch_employee_by_id(self, employee_id: str):
return await self.auth.fetch_employee_by_id(
employee_id
)

async def migrate_org_to_isolated(self, org_id: str):
return await self.auth.migrate_org_to_isolated(org_id)

def init_auth(
auth_url: str,
Expand Down
Loading