Revert "Merge branch 'b-7.4.x-generate-exceptions-OXDEV-9992' into b-7.4.x"

This reverts commit 25c6b8d, reversing
changes made to fe5e177.

Author: TitaKoleva

CHANGELOG.md

@@ -8,8 +8,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 - Extracted reusable Twig code into captcha.html.twig and password.html.twig
-- Facebook login OAuth-provider
-- Google login OAuth-provider
 
 ### Changed
 - Show multiple errors on invalid password

assets/out/src/css/providers.css

@@ -30,11 +30,7 @@
         "codeception/module-webdriver": "*",
         "oxid-esales/codeception-modules": "dev-b-7.4.x",
         "oxid-esales/codeception-page-objects": "dev-b-7.4.x",
-        "mikey179/vfsstream": "^1.6",
-        "pragmarx/google2fa": "^v8.0.3",
-        "bacon/bacon-qr-code": "v3.0.1",
-        "league/oauth2-google": "4.0.1",
-        "league/oauth2-facebook": "2.2.0"
+        "mikey179/vfsstream": "^1.6"
     },
     "minimum-stability": "dev",
     "prefer-stable": true,

composer.json

@@ -9,11 +9,8 @@
  * Metadata version
  */
 
-use OxidEsales\SecurityModule\Authentication\OAuth2\Service\ModuleSettingsService;
-use OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Service\ModuleSettingsService as TwoFactorAuthModuleSettings;
 use OxidEsales\SecurityModule\PasswordPolicy\Service\ModuleSettingsService as PasswordPolicyModuleSettings;
 use OxidEsales\SecurityModule\Captcha\Service\ModuleSettingsService as CaptchaModuleSettings;
-use OxidEsales\SecurityModule\Authentication\OAuth2\Service\ModuleSettingsService as OAuthModuleSettings;
 use OxidEsales\SecurityModule\Core\Module;
 
 $sMetadataVersion = '2.1';
@@ -42,9 +39,7 @@
     ],
     'controllers' => [
         'captcha' => \OxidEsales\SecurityModule\Captcha\Controller\CaptchaController::class,
-        'password' => \OxidEsales\SecurityModule\PasswordPolicy\Controller\PasswordAjaxController::class,
-        'oauth' => \OxidEsales\SecurityModule\Authentication\OAuth2\Controller\OAuthController::class,
-        'twofactorauth' => \OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Controller\TwoFactorAuthController::class,
+        'password' => \OxidEsales\SecurityModule\PasswordPolicy\Controller\PasswordAjaxController::class
     ],
     'templates'   => [
     ],
@@ -114,71 +109,6 @@
             'type'  => 'select',
             'constraints' => '5min|15min|30min',
             'value' => '15min'
-        ],
-
-        //OAuth2 settings
-        [
-            'group' => 'oauth',
-            'name'  => OAuthModuleSettings::FACEBOOK_LOGIN_ENABLED,
-            'type'  => 'bool',
-            'value' => false
-        ],
-        [
-            'group' => 'oauth',
-            'name'  => OAuthModuleSettings::FACEBOOK_CLIENT_ID,
-            'type'  => 'str',
-            'value' => ''
-        ],
-        [
-            'group' => 'oauth',
-            'name'  => OAuthModuleSettings::FACEBOOK_CLIENT_SECRET,
-            'type'  => 'str',
-            'value' => ''
-        ],
-        [
-            'group' => 'oauth',
-            'name'  => OAuthModuleSettings::FACEBOOK_REDIRECT_URL,
-            'type'  => 'str',
-            'value' => ''
-        ],
-        [
-            'group' => 'oauth',
-            'name'  => OAuthModuleSettings::GOOGLE_LOGIN_ENABLED,
-            'type'  => 'bool',
-            'value' => true
-        ],
-        [
-            'group' => 'oauth',
-            'name'  => OAuthModuleSettings::GOOGLE_CLIENT_ID,
-            'type'  => 'str',
-            'value' => ''
-        ],
-        [
-            'group' => 'oauth',
-            'name'  => OAuthModuleSettings::GOOGLE_CLIENT_SECRET,
-            'type'  => 'str',
-            'value' => ''
-        ],
-        [
-            'group' => 'oauth',
-            'name'  => OAuthModuleSettings::GOOGLE_REDIRECT_URL,
-            'type'  => 'str',
-            'value' => ''
-        ],
-
-        //TwoFactorAuth settings
-        [
-            'group' => 'two_factor_auth',
-            'name'  => TwoFactorAuthModuleSettings::ACTIVE,
-            'type'  => 'bool',
-            'value' => false
-        ],
-        [
-            'group' => 'two_factor_auth',
-            'name'  => TwoFactorAuthModuleSettings::TWO_FACTOR_TYPE,
-            'type'  => 'select',
-            'constraints' => 'otp|totp',
-            'value' => 'otp'
-        ],
+        ]
     ],
 ];

metadata.php

@@ -1,8 +1,6 @@
 imports:
   - { resource: src/Captcha/services.yaml }
   - { resource: src/PasswordPolicy/services.yaml }
-  - { resource: src/Authentication/services.yaml }
-  - { resource: src/Shared/services.yaml }
 
 services:
   _defaults: