Skip to content

OAuth2.0 #4102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 28 commits into
base: main
Choose a base branch
from
Open

OAuth2.0 #4102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
80e2cd6
feat: oauth2
hirale Jun 21, 2024
074a1a8
Merge branch 'OpenMage:main' into OAuth2
hirale Jul 17, 2024
c78147a
fix: fix minor bugs
hirale Jul 18, 2024
ccb193b
Update app/design/frontend/base/default/template/oauth2/device/verify…
hirale Jul 23, 2024
b195f07
fix: add missing translation
hirale Jul 23, 2024
65cad86
Merge branch 'main' into OAuth2
kiatng Jul 28, 2024
9b5660e
Merge branch 'main' into OAuth2
sreichel Sep 9, 2024
0a0e256
Merge branch 'main' into OAuth2
sreichel Sep 18, 2024
1b3dd27
Update app/code/core/Mage/Oauth2/Block/Adminhtml/Client/Edit.php
sreichel Sep 18, 2024
aacd9a3
Merge branch 'main' into OAuth2
sreichel Sep 23, 2024
040fae4
Merge branch 'OpenMage:main' into OAuth2
hirale Oct 15, 2024
29942a8
fix @Hanmac's suggestions
hirale Oct 15, 2024
4826847
fix: fix minor bugs
hirale Oct 15, 2024
d67306e
Merge branch 'main' into OAuth2
sreichel Oct 17, 2024
649d1db
fix: fix rector validation errors
hirale Oct 17, 2024
f7e267e
Merge branch 'main' into OAuth2
sreichel Oct 18, 2024
cbb03e7
Merge branch 'OpenMage:main' into OAuth2
hirale Nov 23, 2024
c961611
fix: add copyright headers and update meta files
hirale Nov 23, 2024
4324867
Apply suggestions from code review
sreichel Nov 23, 2024
10d0b98
Delete adminer-4.8.1-mysql-en.php
sreichel Nov 23, 2024
d5b9db9
Delete adminer.sql
sreichel Nov 23, 2024
89ebfc9
Delete errors/local.xml
sreichel Nov 23, 2024
21c5319
fix: remove sample logos and apply suggestions from code review
hirale Nov 23, 2024
cada379
fix: apply sreichel's suggestions
hirale Nov 23, 2024
6668603
fix: apply suggestions from code review
hirale Nov 23, 2024
bb42f37
Merge branch 'main' into OAuth2
sreichel Nov 29, 2024
6a0a49f
Merge branch 'main' into OAuth2
sreichel Nov 29, 2024
605e5a3
Merge branch 'main' into OAuth2
kiatng Dec 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion .phpstorm.meta.php/magento_blocks.meta.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1053,6 +1053,14 @@
'install/locale' => \Mage_Install_Block_Locale::class,
'install/state' => \Mage_Install_Block_State::class,
'newsletter/subscribe' => \Mage_Newsletter_Block_Subscribe::class,
'newsletter/widget_subscribe' => \Mage_Newsletter_Block_Widget_Subscribe::class,
'oauth2/adminhtml_client' => \Mage_Oauth2_Block_Adminhtml_Client::class,
'oauth2/adminhtml_client_edit' => \Mage_Oauth2_Block_Adminhtml_Client_Edit::class,
'oauth2/adminhtml_client_edit_form' => \Mage_Oauth2_Block_Adminhtml_Client_Edit_Form::class,
'oauth2/adminhtml_client_grid' => \Mage_Oauth2_Block_Adminhtml_Client_Grid::class,
'oauth2/adminhtml_text' => \Mage_Oauth2_Block_Adminhtml_Text::class,
'oauth2/authorize' => \Mage_Oauth2_Block_Authorize::class,
'oauth2/device_verify' => \Mage_Oauth2_Block_Device_Verify::class,
'oauth/adminhtml_oauth_admin_token' => \Mage_Oauth_Block_Adminhtml_Oauth_Admin_Token::class,
'oauth/adminhtml_oauth_admin_token_grid' => \Mage_Oauth_Block_Adminhtml_Oauth_Admin_Token_Grid::class,
'oauth/adminhtml_oauth_authorize' => \Mage_Oauth_Block_Adminhtml_Oauth_Authorize::class,
Expand Down Expand Up @@ -1252,7 +1260,6 @@
'sales/recurring_profiles' => \Mage_Sales_Block_Recurring_Profiles::class,
'sales/reorder_sidebar' => \Mage_Sales_Block_Reorder_Sidebar::class,
'sales/widget_guest_form' => \Mage_Sales_Block_Widget_Guest_Form::class,
'sendfriend/send' => \Mage_Sendfriend_Block_Send::class,
'shipping/tracking_ajax' => \Mage_Shipping_Block_Tracking_Ajax::class,
'shipping/tracking_popup' => \Mage_Shipping_Block_Tracking_Popup::class,
'tag/all' => \Mage_Tag_Block_All::class,
Expand Down
9 changes: 8 additions & 1 deletion .phpstorm.meta.php/magento_blocks_methods.meta.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1053,6 +1053,14 @@
'install/locale' => \Mage_Install_Block_Locale::class,
'install/state' => \Mage_Install_Block_State::class,
'newsletter/subscribe' => \Mage_Newsletter_Block_Subscribe::class,
'newsletter/widget_subscribe' => \Mage_Newsletter_Block_Widget_Subscribe::class,
'oauth2/adminhtml_client' => \Mage_Oauth2_Block_Adminhtml_Client::class,
'oauth2/adminhtml_client_edit' => \Mage_Oauth2_Block_Adminhtml_Client_Edit::class,
'oauth2/adminhtml_client_edit_form' => \Mage_Oauth2_Block_Adminhtml_Client_Edit_Form::class,
'oauth2/adminhtml_client_grid' => \Mage_Oauth2_Block_Adminhtml_Client_Grid::class,
'oauth2/adminhtml_text' => \Mage_Oauth2_Block_Adminhtml_Text::class,
'oauth2/authorize' => \Mage_Oauth2_Block_Authorize::class,
'oauth2/device_verify' => \Mage_Oauth2_Block_Device_Verify::class,
'oauth/adminhtml_oauth_admin_token' => \Mage_Oauth_Block_Adminhtml_Oauth_Admin_Token::class,
'oauth/adminhtml_oauth_admin_token_grid' => \Mage_Oauth_Block_Adminhtml_Oauth_Admin_Token_Grid::class,
'oauth/adminhtml_oauth_authorize' => \Mage_Oauth_Block_Adminhtml_Oauth_Authorize::class,
Expand Down Expand Up @@ -1252,7 +1260,6 @@
'sales/recurring_profiles' => \Mage_Sales_Block_Recurring_Profiles::class,
'sales/reorder_sidebar' => \Mage_Sales_Block_Reorder_Sidebar::class,
'sales/widget_guest_form' => \Mage_Sales_Block_Widget_Guest_Form::class,
'sendfriend/send' => \Mage_Sendfriend_Block_Send::class,
'shipping/tracking_ajax' => \Mage_Shipping_Block_Tracking_Ajax::class,
'shipping/tracking_popup' => \Mage_Shipping_Block_Tracking_Popup::class,
'tag/all' => \Mage_Tag_Block_All::class,
Expand Down
42 changes: 21 additions & 21 deletions .phpstorm.meta.php/magento_helpers.meta.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
'adminhtml/dashboard_abstract' => \Mage_Adminhtml_Helper_Dashboard_Abstract::class,
'adminhtml/dashboard_data' => \Mage_Adminhtml_Helper_Dashboard_Data::class,
'adminhtml/dashboard_order' => \Mage_Adminhtml_Helper_Dashboard_Order::class,
'adminhtml/data' => \Mage_Adminhtml_Helper_Data::class,
'adminhtml' => \Mage_Adminhtml_Helper_Data::class,
'adminhtml/data' => \Mage_Adminhtml_Helper_Data::class,
'adminhtml/help_mapping' => \Mage_Adminhtml_Helper_Help_Mapping::class,
'adminhtml/js' => \Mage_Adminhtml_Helper_Js::class,
'adminhtml/media_js' => \Mage_Adminhtml_Helper_Media_Js::class,
Expand All @@ -29,25 +29,25 @@
'api' => \Mage_Api_Helper_Data::class,
'api/data' => \Mage_Api_Helper_Data::class,
'authorizenet/admin' => \Mage_Authorizenet_Helper_Admin::class,
'authorizenet/data' => \Mage_Authorizenet_Helper_Data::class,
'authorizenet' => \Mage_Authorizenet_Helper_Data::class,
'authorizenet/data' => \Mage_Authorizenet_Helper_Data::class,
'bundle/catalog_product_configuration' => \Mage_Bundle_Helper_Catalog_Product_Configuration::class,
'bundle/data' => \Mage_Bundle_Helper_Data::class,
'bundle' => \Mage_Bundle_Helper_Data::class,
'bundle/data' => \Mage_Bundle_Helper_Data::class,
'captcha' => \Mage_Captcha_Helper_Data::class,
'captcha/data' => \Mage_Captcha_Helper_Data::class,
'cataloginventory' => \Mage_CatalogInventory_Helper_Data::class,
'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class,
'cataloginventory/minsaleqty' => \Mage_CatalogInventory_Helper_Minsaleqty::class,
'catalogrule' => \Mage_CatalogRule_Helper_Data::class,
'catalogrule/data' => \Mage_CatalogRule_Helper_Data::class,
'catalogsearch/data' => \Mage_CatalogSearch_Helper_Data::class,
'catalogsearch' => \Mage_CatalogSearch_Helper_Data::class,
'catalogsearch/data' => \Mage_CatalogSearch_Helper_Data::class,
'catalog/category' => \Mage_Catalog_Helper_Category::class,
'catalog/category_flat' => \Mage_Catalog_Helper_Category_Flat::class,
'catalog/category_url_rewrite' => \Mage_Catalog_Helper_Category_Url_Rewrite::class,
'catalog/data' => \Mage_Catalog_Helper_Data::class,
'catalog' => \Mage_Catalog_Helper_Data::class,
'catalog/data' => \Mage_Catalog_Helper_Data::class,
'catalog/flat_abstract' => \Mage_Catalog_Helper_Flat_Abstract::class,
'catalog/image' => \Mage_Catalog_Helper_Image::class,
'catalog/map' => \Mage_Catalog_Helper_Map::class,
Expand All @@ -61,8 +61,8 @@
'catalog/product_url' => \Mage_Catalog_Helper_Product_Url::class,
'catalog/product_url_rewrite' => \Mage_Catalog_Helper_Product_Url_Rewrite::class,
'catalog/product_view' => \Mage_Catalog_Helper_Product_View::class,
'centinel/data' => \Mage_Centinel_Helper_Data::class,
'centinel' => \Mage_Centinel_Helper_Data::class,
'centinel/data' => \Mage_Centinel_Helper_Data::class,
'checkout/cart' => \Mage_Checkout_Helper_Cart::class,
'checkout' => \Mage_Checkout_Helper_Data::class,
'checkout/data' => \Mage_Checkout_Helper_Data::class,
Expand All @@ -81,8 +81,8 @@
'core/abstract' => \Mage_Core_Helper_Abstract::class,
'core/array' => \Mage_Core_Helper_Array::class,
'core/cookie' => \Mage_Core_Helper_Cookie::class,
'core/data' => \Mage_Core_Helper_Data::class,
'core' => \Mage_Core_Helper_Data::class,
'core/data' => \Mage_Core_Helper_Data::class,
'core/environmentConfigLoader' => \Mage_Core_Helper_EnvironmentConfigLoader::class,
'core/file_storage' => \Mage_Core_Helper_File_Storage::class,
'core/file_storage_database' => \Mage_Core_Helper_File_Storage_Database::class,
Expand All @@ -101,8 +101,8 @@
'customer/address' => \Mage_Customer_Helper_Address::class,
'customer' => \Mage_Customer_Helper_Data::class,
'customer/data' => \Mage_Customer_Helper_Data::class,
'dataflow/data' => \Mage_Dataflow_Helper_Data::class,
'dataflow' => \Mage_Dataflow_Helper_Data::class,
'dataflow/data' => \Mage_Dataflow_Helper_Data::class,
'directory' => \Mage_Directory_Helper_Data::class,
'directory/data' => \Mage_Directory_Helper_Data::class,
'directory/url' => \Mage_Directory_Helper_Url::class,
Expand All @@ -117,20 +117,22 @@
'giftmessage/data' => \Mage_GiftMessage_Helper_Data::class,
'giftmessage/message' => \Mage_GiftMessage_Helper_Message::class,
'giftmessage/url' => \Mage_GiftMessage_Helper_Url::class,
'googleanalytics/data' => \Mage_GoogleAnalytics_Helper_Data::class,
'googleanalytics' => \Mage_GoogleAnalytics_Helper_Data::class,
'importexport/data' => \Mage_ImportExport_Helper_Data::class,
'googleanalytics/data' => \Mage_GoogleAnalytics_Helper_Data::class,
'importexport' => \Mage_ImportExport_Helper_Data::class,
'importexport/data' => \Mage_ImportExport_Helper_Data::class,
'index' => \Mage_Index_Helper_Data::class,
'index/data' => \Mage_Index_Helper_Data::class,
'install' => \Mage_Install_Helper_Data::class,
'install/data' => \Mage_Install_Helper_Data::class,
'log/data' => \Mage_Log_Helper_Data::class,
'log' => \Mage_Log_Helper_Data::class,
'media/data' => \Mage_Media_Helper_Data::class,
'log/data' => \Mage_Log_Helper_Data::class,
'media' => \Mage_Media_Helper_Data::class,
'media/data' => \Mage_Media_Helper_Data::class,
'newsletter' => \Mage_Newsletter_Helper_Data::class,
'newsletter/data' => \Mage_Newsletter_Helper_Data::class,
'oauth2' => \Mage_Oauth2_Helper_Data::class,
'oauth2/data' => \Mage_Oauth2_Helper_Data::class,
'oauth' => \Mage_Oauth_Helper_Data::class,
'oauth/data' => \Mage_Oauth_Helper_Data::class,
'page' => \Mage_Page_Helper_Data::class,
Expand All @@ -139,19 +141,19 @@
'page/layout' => \Mage_Page_Helper_Layout::class,
'payment' => \Mage_Payment_Helper_Data::class,
'payment/data' => \Mage_Payment_Helper_Data::class,
'paypaluk/data' => \Mage_PaypalUk_Helper_Data::class,
'paypaluk' => \Mage_PaypalUk_Helper_Data::class,
'paypaluk/data' => \Mage_PaypalUk_Helper_Data::class,
'paypal/checkout' => \Mage_Paypal_Helper_Checkout::class,
'paypal/data' => \Mage_Paypal_Helper_Data::class,
'paypal' => \Mage_Paypal_Helper_Data::class,
'paypal/data' => \Mage_Paypal_Helper_Data::class,
'paypal/hss' => \Mage_Paypal_Helper_Hss::class,
'persistent' => \Mage_Persistent_Helper_Data::class,
'persistent/data' => \Mage_Persistent_Helper_Data::class,
'persistent/session' => \Mage_Persistent_Helper_Session::class,
'productalert/data' => \Mage_ProductAlert_Helper_Data::class,
'productalert' => \Mage_ProductAlert_Helper_Data::class,
'rating/data' => \Mage_Rating_Helper_Data::class,
'productalert/data' => \Mage_ProductAlert_Helper_Data::class,
'rating' => \Mage_Rating_Helper_Data::class,
'rating/data' => \Mage_Rating_Helper_Data::class,
'reports' => \Mage_Reports_Helper_Data::class,
'reports/data' => \Mage_Reports_Helper_Data::class,
'review' => \Mage_Review_Helper_Data::class,
Expand All @@ -165,22 +167,20 @@
'salesrule/coupon' => \Mage_SalesRule_Helper_Coupon::class,
'salesrule' => \Mage_SalesRule_Helper_Data::class,
'salesrule/data' => \Mage_SalesRule_Helper_Data::class,
'sales/data' => \Mage_Sales_Helper_Data::class,
'sales' => \Mage_Sales_Helper_Data::class,
'sales/data' => \Mage_Sales_Helper_Data::class,
'sales/guest' => \Mage_Sales_Helper_Guest::class,
'sales/reorder' => \Mage_Sales_Helper_Reorder::class,
'sendfriend/data' => \Mage_Sendfriend_Helper_Data::class,
'sendfriend' => \Mage_Sendfriend_Helper_Data::class,
'shipping' => \Mage_Shipping_Helper_Data::class,
'shipping/data' => \Mage_Shipping_Helper_Data::class,
'sitemap' => \Mage_Sitemap_Helper_Data::class,
'sitemap/data' => \Mage_Sitemap_Helper_Data::class,
'tag' => \Mage_Tag_Helper_Data::class,
'tag/data' => \Mage_Tag_Helper_Data::class,
'tax/data' => \Mage_Tax_Helper_Data::class,
'tax' => \Mage_Tax_Helper_Data::class,
'uploader/data' => \Mage_Uploader_Helper_Data::class,
'tax/data' => \Mage_Tax_Helper_Data::class,
'uploader' => \Mage_Uploader_Helper_Data::class,
'uploader/data' => \Mage_Uploader_Helper_Data::class,
'uploader/file' => \Mage_Uploader_Helper_File::class,
'usa' => \Mage_Usa_Helper_Data::class,
'usa/data' => \Mage_Usa_Helper_Data::class,
Expand Down
Loading
Loading