tmp: logging

Author: costowell

selfservice/models.py

@@ -11,6 +11,7 @@
     Boolean,
     func,
 )
+from sqlalchemy.sql.functions import now
 from selfservice import db
 
 
@@ -23,7 +24,7 @@ class ResetToken(db.Model):
     __tablename__ = "token"
     id = Column(Integer, primary_key=True)
     username = Column(String(64), nullable=False)
-    created = Column(DateTime, default=func.timezone("UTC", func.now()))
+    created = Column(DateTime, default=func.timezone("UTC", now()))
     token = Column(String(36))
     session = Column(String(36), ForeignKey("session.id"))
     used = Column(Boolean)
@@ -39,7 +40,7 @@ class RecoverySession(db.Model):
     __tablename__ = "session"
     id = Column(String(36), primary_key=True)
     username = Column(String(64), nullable=False)
-    created = Column(DateTime, default=func.timezone("UTC", func.now()))
+    created = Column(DateTime, default=func.timezone("UTC", now()))
 
 
 class PhoneVerification(db.Model):

selfservice/utilities/general.py

@@ -66,8 +66,14 @@ def phone_recovery(phone, token):
         current_app.config.get("TWILIO_SID"), current_app.config.get("TWILIO_TOKEN")
     )
 
+    # REMOVE ME
+    client.http_client.logger = current_app.logger
+    print(f"twilio client: {client}")
+    # REMOVE ME
+
     body = f"Your CSH account recovery PIN is: {token}"
 
-    client.messages.create(
+    m = client.messages.create(
         to=phone, from_=from_number, body=body, messaging_service_sid=service_sid
     )
+    print(m)

selfservice/utilities/ldap.py

@@ -21,21 +21,21 @@ def verif_methods(username):
     user = ldap.get_member(username, uid=True)
 
     if user.mail:
-        for addr in user.__getattr__("mail", as_list=True):
+        for addr in user.get("mail"):
             if "rit.edu" not in addr and "@" in addr:
                 name, domain = addr.strip().split("@")
                 display = name[:1] + "..." + name[-1:] + "@" + domain
                 methods["email"].append({"data": addr, "display": display})
 
     if user.mobile:
-        for number in user.__getattr__("mobile", as_list=True):
+        for number in user.get("mobile"):
             stripped = re.sub("[^0-9]", "", number)
             if len(stripped) == 10:
                 display = f"(XXX) XXX-{stripped[-4:]}"
                 methods["phone"].append({"data": stripped, "display": display})
 
     if user.telephoneNumber:
-        for number in user.__getattr__("telephoneNumber", as_list=True):
+        for number in user.get("telephoneNumber"):
             stripped = re.sub("[^0-9]", "", number)
             if len(stripped) == 10:
                 methods["phone"].append(stripped)