Add pre auth and tenant switch improvement for central deployment related authentication #7291
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| --- | ||
| "@wso2is/admin.tenants.v1": minor | ||
| "@wso2is/admin.administration.v1": minor | ||
| "@wso2is/admin.base.v1": minor | ||
| "@wso2is/admin.core.v1": minor | ||
| "@wso2is/myaccount": minor | ||
| "@wso2is/console": minor | ||
| "@wso2is/core": minor | ||
| "@wso2is/i18n": minor | ||
| --- | ||
|
|
||
| Introduce deployment units to tenant dropdown and tenant creation. | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -55,6 +55,7 @@ export const commonConfigReducerInitialState: CommonConfigReducerStateInterface< | |
| appHomePath: "", | ||
| appLoginPath: "", | ||
| appLogoutPath: "", | ||
| centralDeploymentEnabled: undefined, | ||
| clientHost: "", | ||
| clientID: "", | ||
| clientOrigin: "", | ||
|
|
@@ -108,6 +109,7 @@ export const commonConfigReducerInitialState: CommonConfigReducerStateInterface< | |
| dcrConfiguration: "", | ||
| deleteSecret: "", | ||
| deleteSecretType: "", | ||
| deploymentUnit: "", | ||
| entitlementPoliciesApi: "", | ||
| entitlementPolicyCombiningAlgorithmApi: "", | ||
| entitlementPolicyPublishApi: "", | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,7 +21,7 @@ import { store } from "@wso2is/admin.core.v1/store"; | |
| import { OrganizationType } from "@wso2is/admin.organizations.v1/constants"; | ||
| import { HttpMethods } from "@wso2is/core/models"; | ||
| import { AxiosError, AxiosRequestConfig, AxiosResponse } from "axios"; | ||
| import { DeploymentUnit, DeploymentUnitResponse, TenantRequestResponse } from "../models"; | ||
|
|
||
| const getDomainQueryParam = (): string => { | ||
| const tenantDomain: string = store.getState().auth.tenantDomain; | ||
|
|
@@ -47,9 +47,10 @@ const httpClient: HttpClientInstance = AsgardeoSPAClient.getInstance() | |
| * | ||
| * @param tenantName - new tenant name | ||
| */ | ||
| export const addNewTenant = (tenantName: string, deploymentUnit?: DeploymentUnit): Promise<AxiosResponse> => { | ||
| const requestConfig: AxiosRequestConfig = { | ||
| data: { | ||
| deploymentUnit: deploymentUnit?.name, | ||
| domain: tenantName | ||
| }, | ||
| headers: { | ||
|
|
@@ -160,3 +161,25 @@ export const getAssociatedTenants = ( | |
| return Promise.reject(error?.response?.data); | ||
| }); | ||
| }; | ||
|
|
||
| /** | ||
| * Get the deployment units. | ||
| * | ||
| * @returns - A promise that resolves with the Deployment response object. | ||
| */ | ||
| export const getDeploymentUnits = ( | ||
|
There was a problem hiding this comment. we use SWR for http get requests. Therefore, shall we refactor this method to a separate hook that utilize useRequest hook? |
||
| ): Promise<DeploymentUnitResponse> => { | ||
|
|
||
| const requestConfig: AxiosRequestConfig = { | ||
| method: HttpMethods.GET, | ||
| url: store.getState().config.endpoints.deploymentUnit + getDomainQueryParam() | ||
| }; | ||
|
|
||
| return httpClient(requestConfig) | ||
| .then((response: AxiosResponse) => { | ||
| return Promise.resolve(response?.data); | ||
| }) | ||
| .catch((error: AxiosError) => { | ||
| return Promise.reject(error?.response?.data); | ||
| }); | ||
| }; | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -29,6 +29,7 @@ import { useDispatch } from "react-redux"; | |
| import { Dispatch } from "redux"; | ||
| import { Grid, Modal } from "semantic-ui-react"; | ||
| import { addNewTenant, checkDuplicateTenants } from "../../api"; | ||
| import { DeploymentUnit } from "../../models"; | ||
| import { handleTenantSwitch } from "../../utils"; | ||
| import { AddTenantWizardForm, AddTenantWizardFormValuesInterface } from "../forms"; | ||
|
|
||
|
|
@@ -38,6 +39,7 @@ import { AddTenantWizardForm, AddTenantWizardFormValuesInterface } from "../form | |
| interface AddTenantWizardPropsInterface extends TestableComponentInterface { | ||
| openModal: boolean; | ||
| onCloseHandler: () => void; | ||
| deploymentUnits: DeploymentUnit[]; | ||
| } | ||
|
|
||
| /** | ||
|
|
@@ -52,6 +54,7 @@ export const AddTenantWizard: FunctionComponent<AddTenantWizardPropsInterface> = | |
|
|
||
| const { | ||
| openModal, | ||
| deploymentUnits, | ||
| onCloseHandler, | ||
| [ "data-testid" ]: testId | ||
| } = props; | ||
|
|
@@ -99,7 +102,10 @@ export const AddTenantWizard: FunctionComponent<AddTenantWizardPropsInterface> = | |
| .catch((error: AxiosError) => { | ||
| if (error.response.status == 404) { | ||
| // Proceed to tenant creation if tenant does not exist. | ||
| addTenant( | ||
| submissionValue.tenantName, | ||
| submissionValue.deploymentUnitJson ?? JSON.parse(submissionValue.deploymentUnitJson) | ||
| ); | ||
| } else { | ||
| setIsNewTenantLoading(false); | ||
| setAlert({ | ||
|
|
@@ -134,16 +140,17 @@ export const AddTenantWizard: FunctionComponent<AddTenantWizardPropsInterface> = | |
| setTenantDuplicate={ setIsTenantDuplicate } | ||
| isCheckingTenantExistence={ isCheckingTenantExistence } | ||
| setCheckingTenantExistence={ setCheckingTenantExistence } | ||
| deploymentUnits={ deploymentUnits } | ||
| /> | ||
| ), | ||
| icon: "", // TODO: Add icon | ||
| title: t("extensions:manage.features.tenant.wizards.addTenant.heading") | ||
| } ]; | ||
|
|
||
| const addTenant = (tenantName: string, deploymentUnit?: DeploymentUnit): void => { | ||
| setIsNewTenantLoading(true); | ||
| setTenantLoaderText(t("extensions:manage.features.tenant.wizards.addTenant.forms.loaderMessages.tenantCreate")); | ||
| addNewTenant(tenantName, deploymentUnit) | ||
| .then((response: AxiosResponse) => { | ||
| if (response.status === 201) { | ||
| eventPublisher.publish("create-new-organization"); | ||
|
|
@@ -162,7 +169,7 @@ export const AddTenantWizard: FunctionComponent<AddTenantWizardPropsInterface> = | |
| delay(() => { | ||
| setIsNewTenantLoading(false); | ||
| onCloseHandler(); | ||
| handleTenantSwitch(tenantName, deploymentUnit?.consoleHostname); | ||
| }, 5000); | ||
| } | ||
| }) | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
there's no changes to this administrators package in this pr, hence we can remove it I guess.