From 3e257d42660136efff37adc6ef8e4c68eb5cc4c5 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Mon, 18 Jan 2021 22:53:06 -0500
Subject: [PATCH] Move all two-factor authentication classes in
 Security\TwoFactor

---
 src/Model/User.php                                            | 2 +-
 src/Module/Security/TwoFactor/Recovery.php                    | 2 +-
 src/Module/Settings/TwoFactor/AppSpecific.php                 | 2 +-
 src/Module/Settings/TwoFactor/Index.php                       | 4 ++--
 src/Module/Settings/TwoFactor/Recovery.php                    | 2 +-
 .../TwoFactor/Model}/AppSpecificPassword.php                  | 2 +-
 .../TwoFactor => Security/TwoFactor/Model}/RecoveryCode.php   | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)
 rename src/{Model/TwoFactor => Security/TwoFactor/Model}/AppSpecificPassword.php (98%)
 rename src/{Model/TwoFactor => Security/TwoFactor/Model}/RecoveryCode.php (98%)

diff --git a/src/Model/User.php b/src/Model/User.php
index dbace74e5..41e612ac8 100644
--- a/src/Model/User.php
+++ b/src/Model/User.php
@@ -34,7 +34,7 @@ use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\DI;
-use Friendica\Model\TwoFactor\AppSpecificPassword;
+use Friendica\Security\TwoFactor\Model\AppSpecificPassword;
 use Friendica\Network\HTTPException;
 use Friendica\Object\Image;
 use Friendica\Util\Crypto;
diff --git a/src/Module/Security/TwoFactor/Recovery.php b/src/Module/Security/TwoFactor/Recovery.php
index 7af1b6ac0..384d36e0d 100644
--- a/src/Module/Security/TwoFactor/Recovery.php
+++ b/src/Module/Security/TwoFactor/Recovery.php
@@ -25,7 +25,7 @@ use Friendica\BaseModule;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session;
 use Friendica\DI;
-use Friendica\Model\TwoFactor\RecoveryCode;
+use Friendica\Security\TwoFactor\Model\RecoveryCode;
 
 /**
  * // Page 1a: Recovery code verification
diff --git a/src/Module/Settings/TwoFactor/AppSpecific.php b/src/Module/Settings/TwoFactor/AppSpecific.php
index db094a885..8c11af029 100644
--- a/src/Module/Settings/TwoFactor/AppSpecific.php
+++ b/src/Module/Settings/TwoFactor/AppSpecific.php
@@ -23,7 +23,7 @@ namespace Friendica\Module\Settings\TwoFactor;
 
 use Friendica\Core\Renderer;
 use Friendica\DI;
-use Friendica\Model\TwoFactor\AppSpecificPassword;
+use Friendica\Security\TwoFactor\Model\AppSpecificPassword;
 use Friendica\Module\BaseSettings;
 use Friendica\Module\Security\Login;
 
diff --git a/src/Module/Settings/TwoFactor/Index.php b/src/Module/Settings/TwoFactor/Index.php
index 8cc04787f..bd3840485 100644
--- a/src/Module/Settings/TwoFactor/Index.php
+++ b/src/Module/Settings/TwoFactor/Index.php
@@ -24,8 +24,8 @@ namespace Friendica\Module\Settings\TwoFactor;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session;
 use Friendica\DI;
-use Friendica\Model\TwoFactor\AppSpecificPassword;
-use Friendica\Model\TwoFactor\RecoveryCode;
+use Friendica\Security\TwoFactor\Model\AppSpecificPassword;
+use Friendica\Security\TwoFactor\Model\RecoveryCode;
 use Friendica\Model\User;
 use Friendica\Module\BaseSettings;
 use Friendica\Module\Security\Login;
diff --git a/src/Module/Settings/TwoFactor/Recovery.php b/src/Module/Settings/TwoFactor/Recovery.php
index 7b0d28534..6ee52bd03 100644
--- a/src/Module/Settings/TwoFactor/Recovery.php
+++ b/src/Module/Settings/TwoFactor/Recovery.php
@@ -23,7 +23,7 @@ namespace Friendica\Module\Settings\TwoFactor;
 
 use Friendica\Core\Renderer;
 use Friendica\DI;
-use Friendica\Model\TwoFactor\RecoveryCode;
+use Friendica\Security\TwoFactor\Model\RecoveryCode;
 use Friendica\Module\BaseSettings;
 use Friendica\Module\Security\Login;
 
diff --git a/src/Model/TwoFactor/AppSpecificPassword.php b/src/Security/TwoFactor/Model/AppSpecificPassword.php
similarity index 98%
rename from src/Model/TwoFactor/AppSpecificPassword.php
rename to src/Security/TwoFactor/Model/AppSpecificPassword.php
index 1e8d56f75..1524e2592 100644
--- a/src/Model/TwoFactor/AppSpecificPassword.php
+++ b/src/Security/TwoFactor/Model/AppSpecificPassword.php
@@ -19,7 +19,7 @@
  *
  */
 
-namespace Friendica\Model\TwoFactor;
+namespace Friendica\Security\TwoFactor\Model;
 
 use Friendica\Database\DBA;
 use Friendica\Model\User;
diff --git a/src/Model/TwoFactor/RecoveryCode.php b/src/Security/TwoFactor/Model/RecoveryCode.php
similarity index 98%
rename from src/Model/TwoFactor/RecoveryCode.php
rename to src/Security/TwoFactor/Model/RecoveryCode.php
index 2c3b71ad4..d6a1a6e95 100644
--- a/src/Model/TwoFactor/RecoveryCode.php
+++ b/src/Security/TwoFactor/Model/RecoveryCode.php
@@ -19,7 +19,7 @@
  *
  */
 
-namespace Friendica\Model\TwoFactor;
+namespace Friendica\Security\TwoFactor\Model;
 
 use Friendica\Database\DBA;
 use Friendica\Util\DateTimeFormat;