Merge branch 'main' of https://github.com/GSA/notifications-api into notify-260

This commit is contained in:
Kenneth Kehl
2023-05-30 11:47:36 -07:00
38 changed files with 305 additions and 544 deletions

View File

@@ -108,7 +108,7 @@ class User(db.Model):
platform_admin = db.Column(db.Boolean, nullable=False, default=False)
current_session_id = db.Column(UUID(as_uuid=True), nullable=True)
auth_type = db.Column(
db.String, db.ForeignKey('auth_type.name'), index=True, nullable=False, default=EMAIL_AUTH_TYPE
db.String, db.ForeignKey('auth_type.name'), index=True, nullable=False, default=SMS_AUTH_TYPE
)
email_access_validated_at = db.Column(
db.DateTime, index=False, unique=False, nullable=False, default=datetime.datetime.utcnow
@@ -1651,7 +1651,7 @@ class InvitedUser(db.Model):
db.ForeignKey('auth_type.name'),
index=True,
nullable=False,
default=EMAIL_AUTH_TYPE
default=SMS_AUTH_TYPE
)
folder_permissions = db.Column(JSONB(none_as_null=True), nullable=False, default=[])