Skip to content

Commit f154fc9

Browse files
mahesh-singh-rajawatmahesh-singh-rajawat
committed
CABPI-513::Change Admin user details page - fixed unused file
1 parent c2c8c3d commit f154fc9

File tree

2 files changed

+53
-73
lines changed

2 files changed

+53
-73
lines changed

‎AdminAdobeIms/etc/adminhtml/di.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@
5151
<type name="Magento\Backend\Block\Widget\Form">
5252
<plugin name="remove_password_and_user_confirmation_form_fields"
5353
type="Magento\AdminAdobeIms\Plugin\RemovePasswordAndUserConfirmationFormFieldsPlugin"/>
54+
<plugin name="update_and_user_confirmation_form_fields"
55+
type="Magento\AdminAdobeIms\Plugin\UpdateUserFormFieldsPlugin" sortOrder="20"/>
5456
</type>
5557
<type name="Magento\Integration\Model\AdminTokenService">
5658
<plugin name="revoke_admin_access_token"

‎AdminAdobeIms/etc/di.xml‎

Lines changed: 51 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -5,96 +5,74 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9-
xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
10-
<preference for="Magento\Backend\App\Action\Plugin\Authentication"
11-
type="Magento\AdminAdobeIms\App\Action\Plugin\Authentication"/>
12-
<preference for="Magento\Backend\Model\Auth\Credential\StorageInterface"
13-
type="Magento\AdminAdobeIms\Model\User" />
8+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
9+
<preference for="Magento\AdminAdobeIms\Api\Data\ImsWebapiSearchResultsInterface" type="Magento\AdminAdobeIms\Model\ImsWebapiSearchResults"/>
10+
<preference for="Magento\AdminAdobeIms\Api\ImsWebapiRepositoryInterface" type="Magento\AdminAdobeIms\Model\ImsWebapiRepository"/>
11+
<preference for="Magento\AdminAdobeIms\Api\Data\ImsWebapiInterface" type="Magento\AdminAdobeIms\Model\ImsWebapi"/>
12+
<preference for="Magento\AdobeImsApi\Api\GetAccessTokenInterface" type="Magento\AdminAdobeIms\Model\GetAccessTokenProxy"/>
13+
<preference for="Magento\AdobeImsApi\Api\UserAuthorizedInterface" type="Magento\AdminAdobeIms\Model\UserAuthorizedProxy"/>
14+
<preference for="Magento\AdminAdobeIms\Api\SaveImsUserInterface" type="Magento\AdminAdobeIms\Model\SaveImsUser"/>
1415

15-
<type name="Magento\Framework\View\Result\Layout">
16-
<plugin name="add_adobe_ims_layout_handle"
17-
type="Magento\AdminAdobeIms\Plugin\AddAdobeImsLayoutHandlePlugin" />
18-
</type>
19-
20-
<type name="Magento\Framework\View\Element\Message\MessageConfigurationsPool">
16+
<type name="Magento\Framework\Console\CommandListInterface">
2117
<arguments>
22-
<argument name="configurationsMap" xsi:type="array">
23-
<item name="adminAdobeImsMessage" xsi:type="array">
24-
<item name="renderer" xsi:type="const">\Magento\Framework\View\Element\Message\Renderer\BlockRenderer::CODE</item>
25-
<item name="data" xsi:type="array">
26-
<item name="template" xsi:type="string">Magento_AdminAdobeIms::messages/admin_adobe_ims_messages.phtml</item>
27-
</item>
28-
</item>
18+
<argument name="commands" xsi:type="array">
19+
<item name="adminAdobeEnableImsCommand" xsi:type="object">Magento\AdminAdobeIms\Console\Command\AdminAdobeImsEnableCommand</item>
20+
<item name="adminAdobeDisableImsCommand" xsi:type="object">Magento\AdminAdobeIms\Console\Command\AdminAdobeImsDisableCommand</item>
21+
<item name="adminAdobeInfoImsCommand" xsi:type="object">Magento\AdminAdobeIms\Console\Command\AdminAdobeImsInfoCommand</item>
22+
<item name="adminAdobeStatusImsCommand" xsi:type="object">Magento\AdminAdobeIms\Console\Command\AdminAdobeImsStatusCommand</item>
2923
</argument>
3024
</arguments>
3125
</type>
3226

33-
<type name="Magento\User\Model\User">
34-
<plugin name="aroundVerifyIdentity"
35-
type="Magento\AdminAdobeIms\Plugin\ReplaceVerifyIdentityWithImsPlugin"/>
36-
<plugin name="user_save"
37-
type="Magento\AdminAdobeIms\Plugin\UserSavePlugin"/>
38-
<plugin name="change_perform_identity_check_message"
39-
type="Magento\AdminAdobeIms\Plugin\PerformIdentityCheckMessagePlugin"/>
40-
</type>
41-
<type name="Magento\User\Model\UserValidationRules">
42-
<plugin name="remove_user_validation_rules"
43-
type="Magento\AdminAdobeIms\Plugin\RemoveUserValidationRulesPlugin"/>
44-
</type>
45-
<type name="Magento\User\Model\Backend\Config\ObserverConfig">
46-
<plugin name="disable_password_reset"
47-
type="Magento\AdminAdobeIms\Plugin\DisablePasswordResetPlugin"/>
48-
<plugin name="disable_forced_password_change"
49-
type="Magento\AdminAdobeIms\Plugin\DisableForcedPasswordChangePlugin"/>
50-
</type>
51-
<type name="Magento\Backend\Block\Widget\Form">
52-
<plugin name="remove_password_and_user_confirmation_form_fields"
53-
type="Magento\AdminAdobeIms\Plugin\RemovePasswordAndUserConfirmationFormFieldsPlugin" sortOrder="10"/>
54-
<plugin name="update_and_user_confirmation_form_fields"
55-
type="Magento\AdminAdobeIms\Plugin\UpdateUserFormFieldsPlugin" sortOrder="20"/>
27+
<type name="Magento\User\Controller\Adminhtml\Auth\Forgotpassword">
28+
<plugin name="admin_forgot_password_plugin" type="Magento\AdminAdobeIms\Plugin\AdminForgotPasswordPlugin" sortOrder="1"/>
5629
</type>
57-
<type name="Magento\Integration\Model\AdminTokenService">
58-
<plugin name="revoke_admin_access_token"
59-
type="Magento\AdminAdobeIms\Plugin\RevokeAdminAccessTokenPlugin"/>
60-
</type>
61-
<type name="Magento\Security\Model\AdminSessionsManager">
62-
<plugin name="keep_other_user_sessions"
63-
type="Magento\AdminAdobeIms\Plugin\OtherUserSessionPlugin"/>
30+
31+
<type name="Magento\AdminAdobeIms\Service\ImsCommandValidationService">
32+
<arguments>
33+
<argument name="organizationIdRegex" xsi:type="string"><![CDATA[/^([A-Z0-9]{24})(@AdobeOrg)?$/i]]></argument>
34+
<argument name="clientIdRegex" xsi:type="string"><![CDATA[/[^a-z_\-0-9]/i]]></argument>
35+
<argument name="clientSecretRegex" xsi:type="string"><![CDATA[/[^a-z_\-0-9]/i]]></argument>
36+
<argument name="twoFactorAuthRegex" xsi:type="string"><![CDATA[/^y/i]]></argument>
37+
</arguments>
6438
</type>
6539

66-
<type name="Magento\User\Block\User\Edit\Tab\Main">
67-
<plugin name="admin_adobe_ims_reauth_button_user_edit"
68-
type="Magento\AdminAdobeIms\Plugin\Block\Adminhtml\User\Edit\Tab\AddReAuthVerification"/>
40+
<type name="Magento\Captcha\Observer\CheckUserLoginBackendObserver">
41+
<plugin name="captcha_check_user_login_backend_observer_plugin"
42+
type="Magento\AdminAdobeIms\Plugin\CheckUserLoginBackendObserverPlugin"/>
6943
</type>
7044

71-
<type name="Magento\Backend\Block\System\Account\Edit\Form">
72-
<plugin name="admin_adobe_ims_reauth_button_account_edit"
73-
type="Magento\AdminAdobeIms\Plugin\Block\Adminhtml\System\Account\Edit\AddReAuthVerification"/>
45+
<type name="Magento\Captcha\Observer\ResetAttemptForBackendObserver">
46+
<plugin name="captcha_reset_attempt_for_backend_observer_plugin"
47+
type="Magento\AdminAdobeIms\Plugin\ResetAttemptForBackendObserverPlugin"/>
7448
</type>
7549

76-
<type name="Magento\User\Block\Role\Tab\Info">
77-
<plugin name="admin_adobe_ims_reauth_button_role_edit"
78-
type="Magento\AdminAdobeIms\Plugin\Block\Adminhtml\User\Role\Tab\AddReAuthVerification"/>
50+
<virtualType name="Magento\AdminAdobeIms\Logger\Handler" type="Magento\Framework\Logger\Handler\Base">
51+
<arguments>
52+
<argument name="fileName" xsi:type="string">/var/log/admin_adobe_ims.log</argument>
53+
</arguments>
54+
</virtualType>
55+
<type name="Magento\AdminAdobeIms\Logger\AdminAdobeImsLogger">
56+
<arguments>
57+
<argument name="enabled" xsi:type="string">1</argument>
58+
<argument name="name" xsi:type="string">admin_adobe_ims_logger</argument>
59+
<argument name="handlers" xsi:type="array">
60+
<item name="system" xsi:type="object">Magento\AdminAdobeIms\Logger\Handler</item>
61+
</argument>
62+
</arguments>
7963
</type>
80-
<type name="Magento\AdobeIms\Block\Adminhtml\SignIn">
81-
<plugin name="authentication_component_config"
82-
type="Magento\AdminAdobeIms\Plugin\Block\Adminhtml\SignInPlugin"/>
64+
<type name="Magento\Backend\Model\Auth">
65+
<plugin name="disable_admin_login_auth"
66+
type="Magento\AdminAdobeIms\Plugin\DisableAdminLoginAuthPlugin"/>
8367
</type>
8468

85-
<type name="Magento\Integration\Block\Adminhtml\Integration\Edit\Tab\Info">
86-
<plugin name="admin_adobe_ims_reauth_button_integration_edit"
87-
type="Magento\AdminAdobeIms\Plugin\Block\Adminhtml\Integration\Edit\Tab\AddReAuthVerification"/>
69+
<type name="Magento\Integration\Model\AdminTokenService">
70+
<plugin name="admin_adobe_ims_admin_token_plugin"
71+
type="Magento\AdminAdobeIms\Plugin\AdminTokenPlugin" />
8872
</type>
8973

90-
<type name="Magento\Authorization\Model\CompositeUserContext">
91-
<arguments>
92-
<argument name="userContexts" xsi:type="array">
93-
<item name="adobeImsTokenUserContext" xsi:type="array">
94-
<item name="type" xsi:type="object">Magento\AdminAdobeIms\Model\Authorization\AdobeImsAdminTokenUserContext\Proxy</item>
95-
<item name="sortOrder" xsi:type="string">20</item>
96-
</item>
97-
</argument>
98-
</arguments>
74+
<type name="Magento\Backend\Model\Auth\Session">
75+
<plugin name="admin_adobe_ims_backend_auth_session"
76+
type="Magento\AdminAdobeIms\Plugin\BackendAuthSessionPlugin"/>
9977
</type>
10078
</config>

0 commit comments

Comments
 (0)