Use updated verify-email endpoint to enable 2FA

lib/core/configuration.dart

@@ -43,6 +43,7 @@ class Configuration {
   static const nameKey = "name";
   static const secretKeyKey = "secret_key";
   static const tokenKey = "token";
+  static const encryptedTokenKey = "encrypted_token";
   static const userIDKey = "user_id";
 
   final kTempFolderDeletionTimeBuffer = Duration(days: 1).inMicroseconds;
@@ -187,7 +188,7 @@ class Configuration {
     );
   }
 
-  Future<void> decryptAndSaveKey(
+  Future<void> decryptAndSaveSecrets(
       String password, KeyAttributes attributes) async {
     final kek = await CryptoUtil.deriveKey(
       utf8.encode(password),
@@ -208,6 +209,11 @@ class Configuration {
         Sodium.base642bin(attributes.secretKeyDecryptionNonce));
     await setKey(Sodium.bin2base64(key));
     await setSecretKey(Sodium.bin2base64(secretKey));
+    final token = CryptoUtil.openSealSync(
+        Sodium.base642bin(getEncryptedToken()),
+        Sodium.base642bin(attributes.publicKey),
+        secretKey);
+    await setToken(Sodium.bin2base64(token));
   }
 
   Future<KeyAttributes> createNewRecoveryKey() async {
@@ -265,6 +271,14 @@ class Configuration {
     await _preferences.setString(tokenKey, token);
   }
 
+  Future<void> setEncryptedToken(String encryptedToken) async {
+    await _preferences.setString(encryptedTokenKey, encryptedToken);
+  }
+
+  String getEncryptedToken() {
+    return _preferences.getString(encryptedTokenKey);
+  }
+
   String getEmail() {
     return _preferences.getString(emailKey);
   }

lib/services/user_service.dart

@@ -79,13 +79,13 @@ class UserService {
     }
   }
 
-  Future<void> getCredentials(BuildContext context, String ott) async {
+  Future<void> verifyEmail(BuildContext context, String ott) async {
     final dialog = createProgressDialog(context, "please wait...");
     await dialog.show();
     try {
-      final response = await _dio.get(
-        _config.getHttpEndpoint() + "/users/credentials",
-        queryParameters: {
+      final response = await _dio.post(
+        _config.getHttpEndpoint() + "/users/verify-email",
+        data: {
           "email": _config.getEmail(),
           "ott": ott,
         },
@@ -95,7 +95,7 @@ class UserService {
         await _saveConfiguration(response);
         showToast("email verification successful!");
         var page;
-        if (Configuration.instance.getKeyAttributes() != null) {
+        if (Configuration.instance.getEncryptedToken() != null) {
           page = PasswordReentryPage();
         } else {
           page = PasswordEntryPage();
@@ -194,11 +194,13 @@ class UserService {
 
   Future<void> _saveConfiguration(Response response) async {
     await Configuration.instance.setUserID(response.data["id"]);
-    await Configuration.instance.setToken(response.data["token"]);
-    final keyAttributes = response.data["keyAttributes"];
-    if (keyAttributes != null) {
+    if (response.data["encryptedToken"] != null) {
       await Configuration.instance
-          .setKeyAttributes(KeyAttributes.fromMap(keyAttributes));
+          .setEncryptedToken(response.data["encryptedToken"]);
+      await Configuration.instance.setKeyAttributes(
+          KeyAttributes.fromMap(response.data["keyAttributes"]));
+    } else {
+      await Configuration.instance.setToken(response.data["token"]);
     }
   }
 }

lib/ui/home_widget.dart

@@ -270,7 +270,7 @@ class _HomeWidgetState extends State<HomeWidget> {
       return;
     }
     final ott = Uri.parse(link).queryParameters["ott"];
-    UserService.instance.getCredentials(context, ott);
+    UserService.instance.verifyEmail(context, ott);
   }
 
   Widget _getMainGalleryWidget() {

lib/ui/landing_page_widget.dart

@@ -195,7 +195,7 @@ class _LandingPageWidgetState extends State<LandingPageWidget> {
 
   void _navigateToSignUpPage() {
     var page;
-    if (Configuration.instance.getToken() == null) {
+    if (Configuration.instance.getEncryptedToken() == null) {
       page = EmailEntryPage();
     } else {
       // No key
@@ -221,7 +221,7 @@ class _LandingPageWidgetState extends State<LandingPageWidget> {
 
   void _navigateToSignInPage() {
     var page;
-    if (Configuration.instance.getToken() == null) {
+    if (Configuration.instance.getEncryptedToken() == null) {
       page = LoginPage();
     } else {
       // No key

lib/ui/ott_verification_page.dart

@@ -86,7 +86,7 @@ class _OTTVerificationPageState extends State<OTTVerificationPage> {
                           _verificationCodeController.text.isEmpty
                       ? null
                       : () {
-                          UserService.instance.getCredentials(
+                          UserService.instance.verifyEmail(
                               context, _verificationCodeController.text);
                         },
                   fontSize: 18,

lib/ui/password_reentry_page.dart

@@ -100,7 +100,7 @@ class _PasswordReentryPageState extends State<PasswordReentryPage> {
                         createProgressDialog(context, "please wait...");
                     await dialog.show();
                     try {
-                      await Configuration.instance.decryptAndSaveKey(
+                      await Configuration.instance.decryptAndSaveSecrets(
                           _passwordController.text,
                           Configuration.instance.getKeyAttributes());
                     } catch (e) {