clean up

Author: joeblackwaslike

src/quart_sqlalchemy/sim/handle.py

@@ -173,25 +173,13 @@ def get_or_create_by_email_and_client_id(
                 )
         return auth_user
 
-    def get_by_id_and_validate_exists(self, auth_user_id):
-        """This function helps formalize how a non-existent auth user should be handled."""
-        auth_user = self.logic.AuthUser.get_by_id(self.session_factory(), auth_user_id)
-        if auth_user is None:
-            raise RuntimeError('resource_name="auth_user"')
-        return auth_user
-
-    # This function is reserved for consolidating into a canonical user. Do not
-    # call this function under other circumstances as it will automatically set
-    # the user as verified. See ch-25343 for additional details.
     def create_verified_user(
         self,
         client_id,
         email,
         user_type=EntityType.FORTMATIC.value,
         **kwargs,
     ):
-        # with self.session_factory() as session:
-        # with self.logic.begin(ro=False) as session:
         session = self.session_factory()
         with session.begin_nested():
             auid = self.logic.AuthUser.add_by_email_and_client_id(
@@ -231,21 +219,6 @@ def get_by_client_id_and_user_type(
             limit=limit,
         )
 
-    def get_by_client_ids_and_user_type(
-        self,
-        client_ids,
-        user_type,
-        offset=None,
-        limit=None,
-    ):
-        return self.logic.AuthUser.get_by_client_ids_and_user_type(
-            self.session_factory(),
-            client_ids,
-            user_type,
-            offset=offset,
-            limit=limit,
-        )
-
     def exist_by_email_client_id_and_user_type(self, email, client_id, user_type):
         return self.logic.AuthUser.exist_by_email_and_client_id(
             self.session_factory(),
@@ -257,11 +230,6 @@ def exist_by_email_client_id_and_user_type(self, email, client_id, user_type):
     def update_email_by_id(self, model_id, email):
         return self.logic.AuthUser.update_by_id(self.session_factory(), model_id, email=email)
 
-    def update_phone_number_by_id(self, model_id, phone_number):
-        return self.logic.AuthUser.update_by_id(
-            self.session_factory(), model_id, phone_number=phone_number
-        )
-
     def get_by_email_client_id_and_user_type(self, email, client_id, user_type):
         return self.logic.AuthUser.get_by_email_and_client_id(
             self.session_factory(),
@@ -299,68 +267,17 @@ def set_role_by_email_magic_client_id(self, email, magic_client_id, role):
 
         return self.logic.AuthUser.update_by_id(session, auth_user.id, **{role: True})
 
-    def search_by_client_id_and_substring(
-        self,
-        client_id,
-        substring,
-        offset=None,
-        limit=10,
-    ):
-        if not isinstance(substring, str) or len(substring) < 3:
-            raise InvalidSubstringError()
-
-        auth_users = self.logic.AuthUser.get_by_client_id_with_substring_search(
-            self.session_factory(),
-            client_id,
-            substring,
-            offset=offset,
-            limit=limit,
-        )
-
-        return auth_users
-
-    def is_magic_connect_enabled(self, auth_user_id=None, auth_user=None):
-        if auth_user is None and auth_user_id is None:
-            raise Exception("At least one argument needed: auth_user_id or auth_user.")
-
-        if auth_user is None:
-            auth_user = self.get_by_id(auth_user_id)
-
-        return auth_user.user_type == EntityType.CONNECT.value
-
     def mark_as_inactive(self, auth_user_id):
         self.logic.AuthUser.update_by_id(self.session_factory(), auth_user_id, is_active=False)
 
-    def get_by_email_and_wallet_type_for_interop(self, email, wallet_type, network):
-        """
-        Opinionated method for fetching AuthWallets by email address, wallet_type and network.
-        """
-        return self.logic.AuthUser.get_by_email_for_interop(
-            self.session_factory(),
-            email=email,
-            wallet_type=wallet_type,
-            network=network,
-        )
-
-    def get_magic_connect_auth_user(self, auth_user_id):
-        auth_user = self.get_by_id_and_validate_exists(auth_user_id)
-        if not auth_user.is_magic_connect_user:
-            raise RuntimeError("RequestForbidden")
-        return auth_user
-
 
 @signals.auth_user_duplicate.connect
 def handle_duplicate_auth_users(
     app: Quart,
     original_auth_user_id: ObjectID,
     duplicate_auth_user_ids: t.Sequence[ObjectID],
 ) -> None:
-    logger.info(f"{len(duplicate_auth_user_ids)} dupe(s) found for {original_auth_user_id}")
-
     for dupe_id in duplicate_auth_user_ids:
-        logger.info(
-            f"marking auth_user_id {dupe_id} as inactive, in favor of original {original_auth_user_id}",
-        )
         app.container.logic().AuthUser.update_by_id(dupe_id, is_active=False)
 
 

src/quart_sqlalchemy/sim/logic.py

@@ -226,43 +226,6 @@ def get_by_session_token(
             )
         )
 
-    @provide_global_contextual_session
-    def get_or_add_by_phone_number_and_client_id(
-        self,
-        session,
-        client_id,
-        phone_number,
-        user_type=EntityType.FORTMATIC.value,
-    ):
-        if phone_number is None:
-            raise MissingPhoneNumber()
-
-        row = self.get_by_phone_number_and_client_id(
-            session=session,
-            phone_number=phone_number,
-            client_id=client_id,
-            user_type=user_type,
-        )
-
-        if row:
-            return row
-
-        row = self._repository.add(
-            session=session,
-            phone_number=phone_number,
-            client_id=client_id,
-            user_type=user_type,
-            provenance=Provenance.SMS,
-        )
-        logger.info(
-            "New auth user (id: {}) created by phone number (client_id: {})".format(
-                row.id,
-                client_id,
-            ),
-        )
-
-        return row
-
     @provide_global_contextual_session
     def get_by_active_identifier_and_client_id(
         self,
@@ -319,25 +282,6 @@ def get_by_email_and_client_id(
             for_update=for_update,
         )
 
-    @provide_global_contextual_session
-    def get_by_phone_number_and_client_id(
-        self,
-        session,
-        phone_number,
-        client_id,
-        user_type=EntityType.FORTMATIC.value,
-    ):
-        if phone_number is None:
-            raise MissingPhoneNumber()
-
-        return self.get_by_active_identifier_and_client_id(
-            session=session,
-            identifier_field=auth_user_model.phone_number,
-            identifier_value=phone_number,
-            client_id=client_id,
-            user_type=user_type,
-        )
-
     @provide_global_contextual_session
     def exist_by_email_and_client_id(
         self,
@@ -392,17 +336,6 @@ def get_user_count_by_client_id_and_user_type(self, session, client_id, user_typ
 
         return session.execute(query).scalar()
 
-    @provide_global_contextual_session
-    def get_by_client_id_and_global_auth_user(self, session, client_id, global_auth_user_id):
-        return self._repository.get_by(
-            session=session,
-            filters=[
-                auth_user_model.client_id == client_id,
-                auth_user_model.user_type == EntityType.CONNECT.value,
-                auth_user_model.global_auth_user_id == global_auth_user_id,
-            ],
-        )
-
     @provide_global_contextual_session
     def get_by_client_id_and_user_type(
         self,
@@ -420,61 +353,6 @@ def get_by_client_id_and_user_type(
             limit=limit,
         )
 
-    @provide_global_contextual_session
-    def get_by_client_ids_and_user_type(
-        self,
-        session,
-        client_ids,
-        user_type,
-        offset=None,
-        limit=None,
-    ):
-        if not client_ids:
-            return []
-
-        return self._repository.get_by(
-            session,
-            filters=[
-                auth_user_model.client_id.in_(client_ids),
-                auth_user_model.user_type == user_type,
-                auth_user_model.date_verified != None,
-            ],
-            offset=offset,
-            limit=limit,
-            order_by_clause=auth_user_model.id.desc(),
-        )
-
-    @provide_global_contextual_session
-    def get_by_client_id_with_substring_search(
-        self,
-        session,
-        client_id,
-        substring,
-        offset=None,
-        limit=10,
-        join_list=None,
-    ):
-        return self._repository.get_by(
-            session,
-            filters=[
-                auth_user_model.client_id == client_id,
-                auth_user_model.user_type == EntityType.MAGIC.value,
-                sa.or_(
-                    auth_user_model.provenance == Provenance.SMS,
-                    auth_user_model.provenance == Provenance.LINK,
-                    auth_user_model.provenance == None,  # noqa: E711
-                ),
-                sa.or_(
-                    auth_user_model.phone_number.contains(substring),
-                    auth_user_model.email.contains(substring),
-                ),
-            ],
-            offset=offset,
-            limit=limit,
-            order_by_clause=auth_user_model.id.desc(),
-            join_list=join_list,
-        )
-
     @provide_global_contextual_session
     def yield_by_chunk(self, session, chunk_size, filters=None, join_list=None):
         yield from self._repository.yield_by_chunk(
@@ -518,72 +396,6 @@ def get_by_email(
             join_list=join_list,
         )
 
-    @provide_global_contextual_session
-    def get_by_email_for_interop(
-        self,
-        session,
-        email: str,
-        wallet_type: WalletType,
-        network: str,
-    ) -> t.List[auth_user_model]:
-        """
-        Custom method for searching for users eligible for interop. Unfortunately, this can't be done with the current
-        abstractions in our sql_repository, so this is a one-off bespoke method.
-        If we need to add more similar queries involving eager loading and multiple joins, we can add an abstraction
-        inside the repository.
-        """
-
-        query = (
-            session.query(auth_user_model)
-            .join(
-                auth_user_model.wallets.and_(
-                    auth_wallet_model.wallet_type == str(wallet_type)
-                ).and_(auth_wallet_model.network == network)
-            )
-            .options(sa.orm.contains_eager(auth_user_model.wallets))
-            .join(
-                auth_user_model.magic_client.and_(
-                    magic_client_model.connect_interop == ConnectInteropStatus.ENABLED,
-                ),
-            )
-            .options(sa.orm.contains_eager(auth_user_model.magic_client))
-            .filter(
-                auth_wallet_model.wallet_type == wallet_type,
-                auth_wallet_model.network == network,
-            )
-            .filter(
-                auth_user_model.email == email,
-                auth_user_model.user_type == EntityType.MAGIC.value,
-            )
-            .populate_existing()
-        )
-
-        return query.all()
-
-    @provide_global_contextual_session
-    def get_linked_users(self, session, primary_auth_user_id, join_list, no_op=False):
-        # TODO(magic-ravi#67899|2022-12-30): Re-enable account linked users for interop. Remove no_op flag.
-        if no_op:
-            return []
-        else:
-            return self._repository.get_by(
-                session,
-                filters=[
-                    auth_user_model.user_type == EntityType.MAGIC.value,
-                    auth_user_model.linked_primary_auth_user_id == primary_auth_user_id,
-                ],
-                join_list=join_list,
-            )
-
-    @provide_global_contextual_session
-    def get_by_phone_number(self, session, phone_number):
-        return self._repository.get_by(
-            session,
-            filters=[
-                auth_user_model.phone_number == phone_number,
-            ],
-        )
-
 
 class AuthWallet(LogicComponent[auth_wallet_model, ObjectID, sa.orm.Session]):
     model = auth_wallet_model