fix(Envelope): remove farmework condition of tfa enabled

EnvelopeGenerator.CommonServices/Models/EnvelopeModel.vb

@@ -49,7 +49,7 @@ Public Class EnvelopeModel
             .UseAccessCode = pRow.ItemEx("USE_ACCESS_CODE", False),
             .FinalEmailToCreator = ObjectEx.ToEnum(Of FinalEmailType)(pRow.ItemEx("FINAL_EMAIL_TO_CREATOR", FinalEmailType.No.ToString())),
             .FinalEmailToReceivers = ObjectEx.ToEnum(Of FinalEmailType)(pRow.ItemEx("FINAL_EMAIL_TO_RECEIVERS", FinalEmailType.No.ToString())),
-            .TFA_Enabled = pRow.ItemEx("TFA_Enabled", False)
+            .TfaEnabled = pRow.ItemEx("TFA_ENABLED", False)
         }
         Dim oDOC_RESULT = pRow.Item("DOC_RESULT")
         If Not IsDBNull(oDOC_RESULT) Then
@@ -191,7 +191,7 @@ Public Class EnvelopeModel
             oSql += " [SEND_REMINDER_EMAILS] = @SEND_REMINDER_EMAILS, "
             oSql += " [USE_ACCESS_CODE] = @USE_ACCESS_CODE, "
             oSql += " [CHANGED_WHEN] = GETDATE(), "
-            oSql += " [TFA_Enabled] = @TFA_Enabled"
+            oSql += " [TfaEnabled] = @TfaEnabled"
             oSql += " WHERE GUID = @ID AND USER_ID = @USER_ID"
 
 
@@ -216,7 +216,7 @@ Public Class EnvelopeModel
             oCommand.Parameters.Add("REMINDER_INTERVAL_DAYS", SqlDbType.Int).Value = pEnvelope.ReminderIntervalDays
             oCommand.Parameters.Add("SEND_REMINDER_EMAILS", SqlDbType.Bit).Value = pEnvelope.SendReminderEmails
             oCommand.Parameters.Add("USE_ACCESS_CODE", SqlDbType.Bit).Value = pEnvelope.UseAccessCode
-            oCommand.Parameters.Add("TFA_ENABLED", SqlDbType.Bit).Value = pEnvelope.TFA_Enabled
+            oCommand.Parameters.Add("TFA_ENABLED", SqlDbType.Bit).Value = pEnvelope.TfaEnabled
             Return Database.ExecuteNonQuery(oCommand, pTransaction)
 
         Catch ex As Exception

EnvelopeGenerator.CommonServices/Models/EnvelopeTypeModel.vb

@@ -23,7 +23,7 @@ Public Class EnvelopeTypeModel
             .FinalEmailToReceivers = pRow.ItemEx("FINAL_EMAIL_TO_RECEIVERS", 0),
             .ContractType = pRow.ItemEx("CONTRACT_TYPE", 0),
             .CertificationType = pRow.ItemEx("CERTIFICATION_TYPE", 0),
-            .TFA_Enabled = pRow.ItemEx("TFA_Enabled", 0)
+            .TFA_Enabled = pRow.ItemEx("TfaEnabled", 0)
         }
     End Function
 

EnvelopeGenerator.Domain/Entities/Envelope.cs

@@ -125,6 +125,12 @@ public class Envelope
     [ForeignKey("UserId")]
     public User User { get; set; }
 
+    [Column("TFA_ENABLED")]
+    public bool TfaEnabled { get; set; }
+#if NETFRAMEWORK
+        = false;
+#endif
+
     [ForeignKey("EnvelopeTypeId")]
     public virtual EnvelopeType
 #if NET
@@ -139,9 +145,6 @@ public class Envelope
     [NotMapped]
     public bool IsAlreadySent => Status > (int)Constants.EnvelopeStatus.EnvelopeSaved;
 
-    [NotMapped]
-    public bool TFA_Enabled { get; set; } = false;
-
     [NotMapped]
     public byte[] DOC_RESULT { get; set; }
 #endif

EnvelopeGenerator.Form/Controllers/EnvelopeEditorController.vb

@@ -71,7 +71,7 @@ Public Class EnvelopeEditorController
         Dim oEnvelope As New Envelope() With {
             .UserId = State.UserId,
             .User = UserModel.SelectUser(),
-            .TFA_Enabled = DEF_TF_ENABLED
+            .TfaEnabled = DEF_TF_ENABLED
         }
 
         If EnvelopeModel.Insert(oEnvelope) Then

EnvelopeGenerator.Form/frmEnvelopeEditor.vb

@@ -168,7 +168,7 @@ Partial Public Class frmEnvelopeEditor
             colPhoneNumber.Visible = False
             Exit Sub
         End If
-        If Envelope.TFA_Enabled = True Then
+        If Envelope.TfaEnabled = True Then
             colPhoneNumber.Visible = DEF_TF_ENABLED_WITH_PHONE
         Else
             colPhoneNumber.Visible = False
@@ -564,7 +564,7 @@ Partial Public Class frmEnvelopeEditor
                         ViewReceivers.SetRowCellValue(e.RowHandle, ViewReceivers.Columns.Item(COL_NAME), oLastName)
                         CheckAccesscode(e.RowHandle, oAccessCode)
                         ' ViewReceivers.SetRowCellValue(e.RowHandle, ViewReceivers.Columns.Item(COL_CODE), oAccessCode)
-                        If Envelope.TFA_Enabled AndAlso DEF_TF_ENABLED_WITH_PHONE Then
+                        If Envelope.TfaEnabled AndAlso DEF_TF_ENABLED_WITH_PHONE Then
                             ViewReceivers.SetRowCellValue(e.RowHandle, ViewReceivers.Columns.Item(COL_PHONE), oPhoneNumber)
                         End If
                         If ViewReceivers.GetRowCellValue(e.RowHandle, ViewReceivers.Columns.Item(COL_CODE)) = String.Empty Then

EnvelopeGenerator.Form/frmEnvelopeMainData.vb

@@ -85,7 +85,7 @@ Public Class frmEnvelopeMainData
                 ' Now we can override these values with the values from envelope
                 txtTitle.EditValue = Envelope.Title
                 chkUseAccessCode.EditValue = Envelope.UseAccessCode
-                chked_2Faktor.EditValue = Envelope.TFA_Enabled
+                chked_2Faktor.EditValue = Envelope.TfaEnabled
                 cmbCertificationType.SelectedIndex = Convert.ToInt32(Envelope.CertificationType) - 1
                 cmbEmailToCreator.SelectedIndex = Convert.ToInt32(Envelope.FinalEmailToCreator)
                 cmbEmailToReceivers.SelectedIndex = Convert.ToInt32(Envelope.FinalEmailToReceivers)
@@ -97,7 +97,7 @@ Public Class frmEnvelopeMainData
 
     End Sub
     Private Sub CheckAccessCode()
-        If Envelope.TFA_Enabled = True Then
+        If Envelope.TfaEnabled = True Then
             chkUseAccessCode.Checked = True
             chkUseAccessCode.Enabled = False
         Else
@@ -138,7 +138,7 @@ Public Class frmEnvelopeMainData
         Envelope.ExpiresWarningWhenDays = spnExpiresWarningDays.EditValue
         Envelope.FinalEmailToCreator = cmbEmailToCreator.SelectedIndex
         Envelope.FinalEmailToReceivers = cmbEmailToReceivers.SelectedIndex
-        Envelope.TFA_Enabled = chked_2Faktor.EditValue
+        Envelope.TfaEnabled = chked_2Faktor.EditValue
         ' ContractType kann zzt nicht über die Oberfläche gesetzt werden
         Envelope.ContractType = ContractType.Contract
     End Sub