LPD-36763 Update OAuth2 usages

liferay · Sep 26, 2024 · 34ee4f1 · 34ee4f1
1 parent 2225f8b
commit 34ee4f1
Show file tree

Hide file tree

Showing 16 changed files with 84 additions and 129 deletions.
diff --git a/...etplace-custom-element/src/pages/AdministratorDashboard/hooks/useAnalyticsViewsMetrics.ts b/...etplace-custom-element/src/pages/AdministratorDashboard/hooks/useAnalyticsViewsMetrics.ts
@@ -5,24 +5,22 @@
 
 import useSWR from 'swr';
 
-import useMarketplaceSpringBootOAuth2 from '../../../hooks/useMarketplaceSpringBootOAuth2';
+import analyticsOAuth2 from '../../../services/oauth/Analytics';
 import {colors} from '../mock';
 
 const useAnalyticsViewsMetrics = () => {
-	const marketplaceSpringBootOAuth2 = useMarketplaceSpringBootOAuth2();
-
 	const {data: analyticsViewsResponse = [], ...swr} = useSWR<
 		AnalyticsViews[]
 	>('administrator-dashboard/metrics/analytics', () =>
 		Promise.all([
-			marketplaceSpringBootOAuth2.getAnalyticsPages(
+			analyticsOAuth2.getPages(
 				new URLSearchParams({
 					rangeKey: '90',
 					sortMetric: 'viewsMetric',
 					sortOrder: 'desc',
 				})
 			),
-			marketplaceSpringBootOAuth2.getAnalyticsPages(
+			analyticsOAuth2.getPages(
 				new URLSearchParams({
 					keywords: '/p/',
 					rangeKey: '90',

diff --git a/...eray-marketplace-custom-element/src/pages/AdministratorDashboard/hooks/useTrialMetrics.ts b/...eray-marketplace-custom-element/src/pages/AdministratorDashboard/hooks/useTrialMetrics.ts
@@ -9,7 +9,7 @@ import useSWR from 'swr';
 
 import SearchBuilder from '../../../core/SearchBuilder';
 import {ORDER_TYPES, ORDER_WORKFLOW_STATUS_CODE} from '../../../enums/Order';
-import useMarketplaceSpringBootOAuth2 from '../../../hooks/useMarketplaceSpringBootOAuth2';
+import trialOAuth2 from '../../../services/oauth/Trial';
 import HeadlessCommerceAdminOrderImpl from '../../../services/rest/HeadlessCommerceAdminOrder';
 
 type FilterType = 'month' | 'q1' | 'q2' | 'q3' | 'q4' | 'week';
@@ -35,8 +35,6 @@ const useTrialMetrics = (param: FilterType) => {
 		DEFAULT_REFRESH_INTERVAL
 	);
 
-	const marketplaceSpringBootOAuth2 = useMarketplaceSpringBootOAuth2();
-
 	const beforeLastPeriod = addDays(
 		new Date(),
 		-METRIC_PARAMETER[param as keyof typeof METRIC_PARAMETER] * 2
@@ -99,7 +97,7 @@ const useTrialMetrics = (param: FilterType) => {
 		'administrator-dashboard/metrics/trial',
 		() =>
 			Promise.all([
-				marketplaceSpringBootOAuth2.getTrialAvailability(),
+				trialOAuth2.getAvailability(),
 				...requestsParams.map((searchParam) =>
 					HeadlessCommerceAdminOrderImpl.getOrders(searchParam)
 				),

diff --git a/...-custom-element/src/pages/AdministratorDashboard/pages/Trial/TrialTable/NewTrialModal.tsx b/...-custom-element/src/pages/AdministratorDashboard/pages/Trial/TrialTable/NewTrialModal.tsx
@@ -14,8 +14,8 @@ import {useMarketplaceContext} from '../../../../../context/MarketplaceContext';
 import SearchBuilder from '../../../../../core/SearchBuilder';
 import {ORDER_TYPES} from '../../../../../enums/Order';
 import useDebounce from '../../../../../hooks/useDebounce';
-import useMarketplaceSpringBootOAuth2 from '../../../../../hooks/useMarketplaceSpringBootOAuth2';
 import {Liferay} from '../../../../../liferay/liferay';
+import trialOAuth2 from '../../../../../services/oauth/Trial';
 import HeadlessCommerceAdminCatalogImpl from '../../../../../services/rest/HeadlessCommerceAdminCatalog';
 import headlessCommerceDeliveryCart from '../../../../../services/rest/HeadlessCommerceDeliveryCart';
 
@@ -35,7 +35,6 @@ const NewTrialModal: React.FC<NewTrialModalProps> = ({
 	const [search, setSearch] = useState('');
 	const {channel, myUserAccount} = useMarketplaceContext();
 	const debouncedSearch = useDebounce(search, 1000);
-	const marketplaceSpringBootOAuth2 = useMarketplaceSpringBootOAuth2();
 	const [selectedTrial, setSelectedTrial] = useState<{
 		accountId: string;
 		product: Product;
@@ -114,7 +113,7 @@ const NewTrialModal: React.FC<NewTrialModalProps> = ({
 
 			await headlessCommerceDeliveryCart.checkoutCart(cart.id);
 
-			await marketplaceSpringBootOAuth2.provisioningTrial(cart.id);
+			await trialOAuth2.provisioningTrial(cart.id);
 
 			onOpenChange(false);
 
@@ -127,7 +126,7 @@ const NewTrialModal: React.FC<NewTrialModalProps> = ({
 				type: 'success',
 			});
 		}
-		catch (error) {
+		catch {
 			Liferay.Util.openToast({
 				message: 'Not possible to create Trial',
 				type: 'danger',

diff --git a/...ketplace-custom-element/src/pages/AdministratorDashboard/pages/Trial/TrialTable/index.tsx b/...ketplace-custom-element/src/pages/AdministratorDashboard/pages/Trial/TrialTable/index.tsx
@@ -17,9 +17,9 @@ import Loading from '../../../../../components/Loading';
 import Modal from '../../../../../components/Modal';
 import Table from '../../../../../components/Table/Table';
 import {ORDER_WORKFLOW_STATUS_CODE} from '../../../../../enums/Order';
-import useMarketplaceSpringBootOAuth2 from '../../../../../hooks/useMarketplaceSpringBootOAuth2';
 import i18n from '../../../../../i18n';
 import {Liferay} from '../../../../../liferay/liferay';
+import trialOAuth2 from '../../../../../services/oauth/Trial';
 import CommerceSelectAccountImpl from '../../../../../services/rest/CommerceSelectAccount';
 import HeadlessCommerceAdminOrderImpl from '../../../../../services/rest/HeadlessCommerceAdminOrder';
 import NewTrialModal from './NewTrialModal';
@@ -45,7 +45,7 @@ const safeRunner = async (promise: any) => {
 	try {
 		await promise;
 	}
-	catch (error) {}
+	catch {}
 };
 
 const TrialTable: React.FC<TrialTableProps> = ({items, revalidate}) => {
@@ -54,15 +54,13 @@ const TrialTable: React.FC<TrialTableProps> = ({items, revalidate}) => {
 	const newTrialModal = useModal();
 	const modal = useModal();
 
-	const marketplaceSpringBootOAuth2 = useMarketplaceSpringBootOAuth2();
-
 	const onDeleteTrial = async (order: Order) => {
 		setProcessing(true);
 
 		const orderId = String(order.id);
 
 		await safeRunner(HeadlessCommerceAdminOrderImpl.deleteOrder(orderId));
-		await safeRunner(marketplaceSpringBootOAuth2.deleteTrial(orderId));
+		await safeRunner(trialOAuth2.deleteTrial(orderId));
 
 		await revalidate();
 

diff --git a/...ages/CustomerDashboard/pages/Apps/App/CloudProvisioning/pages/CloudProvisioningOutlet.tsx b/...ages/CustomerDashboard/pages/Apps/App/CloudProvisioning/pages/CloudProvisioningOutlet.tsx
@@ -17,14 +17,14 @@ import {PageRenderer} from '../../../../../../../components/Page';
 import ProductPurchase from '../../../../../../../components/ProductPurchase';
 import {useAccount} from '../../../../../../../hooks/data/useAccounts';
 import useGetProductByOrderId from '../../../../../../../hooks/useGetProductByOrderId';
-import useMarketplaceSpringBootOAuth2 from '../../../../../../../hooks/useMarketplaceSpringBootOAuth2';
 import i18n from '../../../../../../../i18n';
 import zodSchema, {z, zodResolver} from '../../../../../../../schema/zod';
 import useGetResourceInfo, {
 	convertMegabyteToGigabyte,
 } from '../../../../../../GetApp/hooks/useGetResourceInfo';
 
 import '../index.scss';
+import consoleOAuth2 from '../../../../../../../services/oauth/Console';
 import {ConsoleUserProject} from '../../../../../../../services/oauth/types';
 import {scrollToTop} from '../../../../../../../utils/browser';
 
@@ -99,7 +99,6 @@ const CloudProvisioningOutlet = () => {
 	const {data: selectedAccount} = useAccount();
 	const {orderId} = useParams();
 	const {pathname} = useLocation();
-	const marketplaceSpringBootOAuth2 = useMarketplaceSpringBootOAuth2();
 	const navigate = useNavigate();
 	const orderInfo = useGetProductByOrderId(orderId as string);
 
@@ -145,7 +144,7 @@ const CloudProvisioningOutlet = () => {
 
 		navigate('installation');
 
-		await marketplaceSpringBootOAuth2.provisioningCloudApp(placedOrder.id, {
+		await consoleOAuth2.provisioning(placedOrder.id, {
 			orderItemId: placedOrder.placedOrderItems[0].id,
 			projectId: environment.projectId,
 		});

diff --git a/.../src/pages/CustomerDashboard/pages/Apps/App/Licenses/CreateLicense/SelectSubscription.tsx b/.../src/pages/CustomerDashboard/pages/Apps/App/Licenses/CreateLicense/SelectSubscription.tsx
@@ -9,8 +9,8 @@ import {useParams} from 'react-router-dom';
 import useSWR from 'swr';
 
 import RadioCardList from '../../../../../../../components/RadioCardList/RadioCardList';
-import useMarketplaceSpringBootOAuth2 from '../../../../../../../hooks/useMarketplaceSpringBootOAuth2';
 import i18n from '../../../../../../../i18n';
+import koroneikiOAuth2 from '../../../../../../../services/oauth/Koroneiki';
 import {formatDate} from '../../../../../../PublisherDashboard/PublisherDashboardPageUtil';
 
 type SubscriptionSelectionProps = {
@@ -24,14 +24,13 @@ const SelectSubscription = ({
 }: SubscriptionSelectionProps) => {
 	const params = useParams();
 	const orderId = Number(params.orderId);
-	const marketplaceSpringBootOAuth2 = useMarketplaceSpringBootOAuth2();
 
 	const {
 		data: subscriptions = [],
 		isLoading,
 		isValidating,
 	} = useSWR(`/subcriptions/${orderId}`, () =>
-		marketplaceSpringBootOAuth2.getSubscriptions(orderId)
+		koroneikiOAuth2.getSubscriptions(orderId)
 	);
 
 	return (

diff --git a/...ustom-element/src/pages/CustomerDashboard/pages/Apps/App/Licenses/CreateLicense/index.tsx b/...ustom-element/src/pages/CustomerDashboard/pages/Apps/App/Licenses/CreateLicense/index.tsx
@@ -4,9 +4,6 @@
  */
 
 import {useCallback, useEffect, useMemo, useState} from 'react';
-
-import './index.scss';
-
 import {useForm} from 'react-hook-form';
 import {useNavigate, useParams} from 'react-router-dom';
 import {z} from 'zod';
@@ -15,9 +12,9 @@ import FooterButtons from '../../../../../../../components/FooterButtons';
 import {useMarketplaceContext} from '../../../../../../../context/MarketplaceContext';
 import {Analytics} from '../../../../../../../core/Analytics';
 import useGetProductByOrderId from '../../../../../../../hooks/useGetProductByOrderId';
-import useMarketplaceSpringBootOAuth2 from '../../../../../../../hooks/useMarketplaceSpringBootOAuth2';
 import {Liferay} from '../../../../../../../liferay/liferay';
 import zodSchema from '../../../../../../../schema/zod';
+import provisioningOAuth2 from '../../../../../../../services/oauth/Provisioning';
 import {getValueFromDeliverySpecifications} from '../../../../../../../utils/util';
 import ProductCard from '../../../../../../GetApp/components/ProductCard/ProductCard';
 import StepWizard from '../../../../../../GetApp/components/StepWizard/StepWizard';
@@ -27,6 +24,8 @@ import LicenseDetails from './LicenseDetails';
 import SelectSubscription from './SelectSubscription';
 import {CreateLicenseForm, StepCreateLicense, StepsInformation} from './types';
 
+import './index.scss';
+
 type ExtendBannerProps = {
 	subscription: {
 		endDate?: string;
@@ -86,7 +85,6 @@ const CreateLicense = () => {
 	const product = data?.product;
 
 	const productCreatorAccountName = product?.catalogName || '';
-	const marketplaceSpringBootOAuth2 = useMarketplaceSpringBootOAuth2();
 
 	const {
 		formState: {errors},
@@ -141,28 +139,27 @@ const CreateLicense = () => {
 			);
 
 			try {
-				const licenseKey =
-					await marketplaceSpringBootOAuth2.createLicenseKey({
-						licenseEntry: {
-							description: form.description,
-							hostName: form.hostname,
-							ipAddresses: form.ipAddress,
-							macAddresses: form.macAddress,
-							orderId: orderId as string,
-							productId: appEntryUUID || undefined,
-							productPurchaseKey: form.subscription
-								?.productPurchasedKey as string,
-							productVersion:
-								form.subscription?.productVersion ||
-								getValueFromDeliverySpecifications(
-									producSpecifications,
-									'latest-version'
-								) ||
-								'1.0.0',
-						},
-						skuId: form.subscription?.skuId as number,
-						type: form.subscription?.name as string,
-					});
+				const licenseKey = await provisioningOAuth2.createLicenseKey({
+					licenseEntry: {
+						description: form.description,
+						hostName: form.hostname,
+						ipAddresses: form.ipAddress,
+						macAddresses: form.macAddress,
+						orderId: orderId as string,
+						productId: appEntryUUID || undefined,
+						productPurchaseKey: form.subscription
+							?.productPurchasedKey as string,
+						productVersion:
+							form.subscription?.productVersion ||
+							getValueFromDeliverySpecifications(
+								producSpecifications,
+								'latest-version'
+							) ||
+							'1.0.0',
+					},
+					skuId: form.subscription?.skuId as number,
+					type: form.subscription?.name as string,
+				});
 
 				Liferay.Util.openToast({
 					message: 'License Key created successfully',
@@ -177,9 +174,7 @@ const CreateLicense = () => {
 
 				navigate(`/order/${orderId}/licenses`);
 
-				await marketplaceSpringBootOAuth2.downloadLicenseKey(
-					licenseKey.id
-				);
+				await provisioningOAuth2.downloadLicenseKey(licenseKey.id);
 
 				Analytics.track('DOWNLOAD_LICENSE_KEY', {
 					licenseType: licenseKey.licenseType,
@@ -195,7 +190,7 @@ const CreateLicense = () => {
 
 			setLoading(false);
 		},
-		[marketplaceSpringBootOAuth2, orderId, product, navigate]
+		[navigate, orderId, product]
 	);
 
 	const buttonsInfo = useMemo(

diff --git a/...App/Licenses/CreateLicense/Types/index.ts → .../Apps/App/Licenses/CreateLicense/types.ts b/...App/Licenses/CreateLicense/Types/index.ts → .../Apps/App/Licenses/CreateLicense/types.ts
diff --git a/...rketplace-custom-element/src/pages/CustomerDashboard/pages/Apps/App/Licenses/Licenses.tsx b/...rketplace-custom-element/src/pages/CustomerDashboard/pages/Apps/App/Licenses/Licenses.tsx
@@ -3,31 +3,27 @@
  * SPDX-License-Identifier: LGPL-2.1-or-later OR LicenseRef-Liferay-DXP-EULA-2.0.0-2023-06
  */
 
+import ClayButton from '@clayui/button';
 import ClayIcon from '@clayui/icon';
+import ClayLoadingIndicator from '@clayui/loading-indicator';
+import {useModal} from '@clayui/modal';
+import {ClayTooltipProvider} from '@clayui/tooltip';
+import classNames from 'classnames';
 import {format, isBefore} from 'date-fns';
 import {useMemo, useState} from 'react';
 import {Link, useOutletContext, useParams} from 'react-router-dom';
 import useSWR from 'swr';
 
 import {DashboardEmptyTable} from '../../../../../../components/DashboardTable/DashboardEmptyTable';
-import StatusCell from '../../../../../../components/Table/StatusCell';
-import Table from '../../../../../../components/Table/Table';
-import i18n from '../../../../../../i18n';
-
-import './Licenses.scss';
-
-import ClayButton from '@clayui/button';
-import ClayLoadingIndicator from '@clayui/loading-indicator';
-import {useModal} from '@clayui/modal';
-import {ClayTooltipProvider} from '@clayui/tooltip';
-import classNames from 'classnames';
-
 import Modal from '../../../../../../components/Modal';
 import {Statuses as OrderStatuses} from '../../../../../../components/OrderStatus';
+import StatusCell from '../../../../../../components/Table/StatusCell';
+import Table from '../../../../../../components/Table/Table';
 import {useMarketplaceContext} from '../../../../../../context/MarketplaceContext';
 import {OrderType} from '../../../../../../enums/OrderType';
 import useGetProductByOrderId from '../../../../../../hooks/useGetProductByOrderId';
-import useMarketplaceSpringBootOAuth2 from '../../../../../../hooks/useMarketplaceSpringBootOAuth2';
+import i18n from '../../../../../../i18n';
+import provisioningOAuth2 from '../../../../../../services/oauth/Provisioning';
 import {LicenseKey} from '../../../../../../services/oauth/types';
 import DeactivateKeysModal from '../../../../components/DeactivateKeysModal/DeactivateKeysModal';
 import LicenseDetailsModalHeader from '../../../../components/LicenseDetailsModalHeader';
@@ -36,6 +32,8 @@ import TableActions from '../../../../components/TableActions';
 import TitleSubtitleHeader from '../../../../components/TitleSubtitleHeader';
 import useLicenseActions from './useLicensesActions';
 
+import './Licenses.scss';
+
 type OutletContext = ReturnType<typeof useGetProductByOrderId>;
 
 const PAGE_SIZES = [
@@ -57,7 +55,6 @@ const Licenses = () => {
 	const {orderId} = useParams();
 	const deactivateLicenseModal = useModal();
 	const licenseKeyModal = useModal();
-	const marketplaceSpringBootOAuth2 = useMarketplaceSpringBootOAuth2();
 	const outletContext = useOutletContext<OutletContext['data']>();
 
 	const placedOrder = outletContext?.placedOrder;
@@ -76,7 +73,7 @@ const Licenses = () => {
 		`/order-license-keys/${orderId}/${page}/${pageSize}`,
 		async () => {
 			try {
-				return marketplaceSpringBootOAuth2.getOrderLicenseKeys(
+				return provisioningOAuth2.getOrderLicenseKeys(
 					orderId as string,
 					new URLSearchParams({
 						page: page.toString(),
@@ -103,7 +100,6 @@ const Licenses = () => {
 			deactivateLicenseModal,
 			keyType,
 			licenseKeyModal,
-			marketplaceSpringBootOAuth2,
 			mutate,
 			product,
 			setModal: setModalData,