Skip to content

Commit

Permalink
Review updates
Browse files Browse the repository at this point in the history
  • Loading branch information
@prateek3255
prateek3255 committed Apr 12, 2024
1 parent 0623e46 commit e099b9a
Show file tree
Hide file tree
Showing 7 changed files with 49 additions and 49 deletions.
4 changes: 1 addition & 3 deletions src/api/tenants/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ export const useTenantCreateService = () => {
status: "INVALID_TENANT_ID_ERROR";
message: string;
}
| undefined
> => {
const response = await fetchData({
url: getApiUrl("/api/tenant"),
Expand All @@ -49,7 +48,7 @@ export const useTenantCreateService = () => {
return body;
}

return undefined;
throw new Error("Unknown error");
};

return createOrUpdateTenant;
Expand All @@ -68,7 +67,6 @@ export const useTenantGetService = () => {
| {
status: "UNKNOWN_TENANT_ERROR";
}
| undefined
> => {
const response = await fetchData({
url: getApiUrl("/api/tenant", tenantId),
Expand Down
10 changes: 5 additions & 5 deletions src/ui/components/tenants/creatNewTenant/CreateNewTenant.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import { useTenantCreateService } from "../../../../api/tenants";
import "./createNewTenant.scss";

export const CreateNewTenantDialog = ({ onCloseDialog }: { onCloseDialog: () => void }) => {
const createOrUpdateTenant = useTenantCreateService();
const createTenant = useTenantCreateService();
const navigate = useNavigate();
const [tenantCreationError, setTenantCreationError] = useState<string | undefined>(undefined);
const [isCreatingTenant, setIsCreatingTenant] = useState(false);
Expand All @@ -38,19 +38,19 @@ export const CreateNewTenantDialog = ({ onCloseDialog }: { onCloseDialog: () =>
}
try {
setIsCreatingTenant(true);
const resp = await createOrUpdateTenant(tenantId);
if (resp?.status === "OK") {
const resp = await createTenant(tenantId);
if (resp.status === "OK") {
if (resp.createdNew) {
navigate(`?tenantId=${tenantId.toLowerCase()}`);
onCloseDialog();
} else {
setTenantCreationError("Tenant already exists");
}
} else if (resp?.status === "MULTITENANCY_NOT_ENABLED_IN_CORE_ERROR") {
} else if (resp.status === "MULTITENANCY_NOT_ENABLED_IN_CORE_ERROR") {
setTenantCreationError(
"Multitenancy is not enabled for your SuperTokens instance. Please add a license key to enable it."
);
} else if (resp?.status === "INVALID_TENANT_ID_ERROR") {
} else if (resp.status === "INVALID_TENANT_ID_ERROR") {
setTenantCreationError(resp.message);
} else {
throw new Error("Failed to create tenant");
Expand Down
9 changes: 3 additions & 6 deletions src/ui/components/tenants/tenantDetail/CoreConfigSection.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@ import { ReactComponent as InfoIcon } from "../../../../assets/info-icon.svg";
import { ReactComponent as QuestionMarkIcon } from "../../../../assets/question-mark.svg";
import { PUBLIC_TENANT_ID } from "../../../../constants";
import { getConnectionUri } from "../../../../utils";
// import { Checkbox } from "../../checkbox/Checkbox";
// import InputField from "../../inputField/InputField";
// import { NativeSelect } from "../../nativeSelect/NativeSelect";
// import { Toggle } from "../../toggle/Toggle";
import TooltipContainer from "../../tooltip/tooltip";
import { EditCoreConfigPropertyDialog } from "./editCoreConfigPropertyDialog/EditCoreConfigPropertyDialog";
import { EditPluginPropertyDialog } from "./editPluginPropertyDialog/EditPluginPropertyDialog";
Expand Down Expand Up @@ -159,7 +155,8 @@ type CoreConfigTableRowProps = {
isPluginPropertyEditable: boolean;
};

const isUsingSaaS = localStorage.getItem("isUsingSaaS") === "true";
// TODO: Use the connectionURI to determine if the user is using SaaS
const isUsingSaaS = false;
const isUsingNonPublicApp = /appid-.*$/.test(getConnectionUri());

const CoreConfigTableRow = ({
Expand Down Expand Up @@ -200,7 +197,7 @@ const CoreConfigTableRow = ({
if ((isPublicTenant && !isUsingNonPublicApp) || isModifyableOnlyViaConfigYaml) {
return isUsingSaaS
? "To modify this property, please visit the dashboard on supertokens.com and click on the edit configuration button."
: "This property is modifyable only via the config.yaml file or via Docker env variables.";
: "This property is modifiable only via the config.yaml file or via Docker env variables.";
}

if (isUsingNonPublicApp && isPublicTenant) {
Expand Down
12 changes: 5 additions & 7 deletions src/ui/components/tenants/tenantDetail/LoginMethodsSection.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,7 @@ export const LoginMethodsSection = () => {

const doesTenantHasEmailPasswordAndPasswordlessEnabled =
tenantInfo.firstFactors?.includes(FactorIds.EMAILPASSWORD) &&
doesTenantHasPasswordlessEnabled(tenantInfo.firstFactors) &&
!tenantInfo.firstFactors?.includes(FactorIds.THIRDPARTY);
doesTenantHasPasswordlessEnabled(tenantInfo.firstFactors);

return (
<>
Expand Down Expand Up @@ -68,7 +67,6 @@ export const LoginMethodsSection = () => {
label={method.label}
description={method.description}
checked={tenantInfo?.firstFactors.includes(method.id)}
setMfaError={setMfaError}
/>
))}
</div>
Expand Down Expand Up @@ -136,7 +134,7 @@ const LoginFactor = ({
checked: boolean;
fixedGap?: boolean;
type: "first-factor" | "secondary-factor";
setMfaError: (error: null | "MFA_NOT_INITIALIZED" | "MFA_REQUIREMENTS_FOR_AUTH_OVERRIDDEN") => void;
setMfaError?: (error: null | "MFA_NOT_INITIALIZED" | "MFA_REQUIREMENTS_FOR_AUTH_OVERRIDDEN") => void;
}) => {
const [isLoading, setIsLoading] = useState(false);
const [error, setError] = useState<string | null>(null);
Expand Down Expand Up @@ -168,7 +166,7 @@ const LoginFactor = ({
if (res.status === "RECIPE_NOT_CONFIGURED_ON_BACKEND_SDK_ERROR") {
setError(res.message);
} else if (res.status === "MFA_NOT_INITIALIZED_ERROR") {
setMfaError("MFA_NOT_INITIALIZED");
setMfaError?.("MFA_NOT_INITIALIZED");
} else {
throw new Error(res.status);
}
Expand All @@ -177,15 +175,15 @@ const LoginFactor = ({
}

if (res.status === "OK" && res.isMFARequirementsForAuthOverridden) {
setMfaError("MFA_REQUIREMENTS_FOR_AUTH_OVERRIDDEN");
setMfaError?.("MFA_REQUIREMENTS_FOR_AUTH_OVERRIDDEN");
}

// If this is not a MFA related error then clear the error
if (
(res.status === "OK" && !res.isMFARequirementsForAuthOverridden) ||
res.status === "RECIPE_NOT_CONFIGURED_ON_BACKEND_SDK_ERROR"
) {
setMfaError(null);
setMfaError?.(null);
}
}
} catch (error) {
Expand Down
19 changes: 13 additions & 6 deletions src/ui/components/tenants/tenantDetail/TenantDetail.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,13 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
import { useEffect, useState } from "react";
import { useContext, useEffect, useState } from "react";
import { useTenantGetService } from "../../../../api/tenants";
import { TenantDashboardView, TenantInfo } from "../../../../api/tenants/types";
import { ReactComponent as NoTenantFound } from "../../../../assets/no-tenants.svg";
import { FactorIds, PUBLIC_TENANT_ID } from "../../../../constants";
import { getImageUrl, usePrevious } from "../../../../utils";
import { PopupContentContext } from "../../../contexts/PopupContentContext";
import Button from "../../button";
import { Loader } from "../../loader/Loader";
import { AddNewProviderDialog } from "./addNewProviderDialog/AddNewProviderDialog";
Expand Down Expand Up @@ -47,13 +48,14 @@ export const TenantDetail = ({
const [viewObj, setViewObj] = useState<TenantDashboardView>({
view: "tenant-detail",
});
const { showToast } = useContext(PopupContentContext);

const tenantHasThirdPartyEnabled = tenant?.firstFactors?.includes(FactorIds.THIRDPARTY);
const prevTenantHasThirdPartyEnabled = usePrevious(tenantHasThirdPartyEnabled);

const getTenant = async () => {
const response = await getTenantInfo(tenantId);
if (response?.status === "OK") {
if (response.status === "OK") {
setTenant(response.tenant);
}
};
Expand All @@ -63,7 +65,12 @@ export const TenantDetail = ({
try {
setIsLoading(true);
await getTenant();
} catch (_) {
} catch (error) {
showToast({
iconImage: getImageUrl("form-field-error-icon.svg"),
toastType: "error",
children: <>Something went wrong please try refreshing the page</>,
});
} finally {
setIsLoading(false);
}
Expand Down Expand Up @@ -120,8 +127,9 @@ export const TenantDetail = ({
if (viewObj.view === "add-or-edit-third-party-provider") {
return (
<ThirdPartyPage
viewObj={viewObj}
setViewObj={setViewObj}
providerId={viewObj.thirdPartyId}
isAddingNewProvider={viewObj.isAddingNewProvider}
handleGoBack={() => setViewObj({ view: "tenant-detail" })}
/>
);
}
Expand Down Expand Up @@ -196,7 +204,6 @@ export const TenantDetail = ({
return (
<TenantDetailContextProvider
tenantInfo={tenant}
setTenantInfo={setTenant}
refetchTenant={refetchTenant}>
{renderView()}
{isNoProviderAddedDialogVisible && (
Expand Down
6 changes: 1 addition & 5 deletions src/ui/components/tenants/tenantDetail/TenantDetailContext.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,12 @@
* under the License.
*/

import { createContext, Dispatch, SetStateAction, useContext } from "react";
import { createContext, useContext } from "react";
import { TenantInfo } from "../../../../api/tenants/types";

type TenantDetailContextType = {
tenantInfo: TenantInfo;
refetchTenant: () => Promise<void>;
setTenantInfo: Dispatch<SetStateAction<TenantInfo | undefined>>;
};

const TenantDetailContext = createContext<TenantDetailContextType | undefined>(undefined);
Expand All @@ -28,19 +27,16 @@ export const TenantDetailContextProvider = ({
children,
tenantInfo,
refetchTenant,
setTenantInfo,
}: {
children: React.ReactNode;
tenantInfo: TenantInfo;
refetchTenant: () => Promise<void>;
setTenantInfo: Dispatch<SetStateAction<TenantInfo | undefined>>;
}) => {
return (
<TenantDetailContext.Provider
value={{
tenantInfo,
refetchTenant,
setTenantInfo,
}}>
{children}
</TenantDetailContext.Provider>
Expand Down
38 changes: 21 additions & 17 deletions src/ui/components/tenants/tenantDetail/thirdPartyPage/ThirdPartyPage.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,11 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
import { Dispatch, SetStateAction, useEffect, useState } from "react";
import { useContext, useEffect, useState } from "react";
import { useGetThirdPartyProviderInfo } from "../../../../../api/tenants";
import { ProviderConfigResponse, TenantDashboardView } from "../../../../../api/tenants/types";
import { ProviderConfigResponse } from "../../../../../api/tenants/types";
import { getImageUrl, isValidHttpUrl } from "../../../../../utils";
import { PopupContentContext } from "../../../../contexts/PopupContentContext";
import Button from "../../../button";
import { Loader } from "../../../loader/Loader";
import { useTenantDetailContext } from "../TenantDetailContext";
Expand All @@ -26,20 +27,19 @@ import { ThirdPartyProviderInput } from "../thirdPartyProviderInput/ThirdPartyPr
import "./thirdPartyPage.scss";

export const ThirdPartyPage = ({
viewObj,
setViewObj,
providerId,
isAddingNewProvider,
handleGoBack,
}: {
viewObj: TenantDashboardView;
setViewObj: Dispatch<SetStateAction<TenantDashboardView>>;
providerId?: string;
isAddingNewProvider: boolean;
handleGoBack: () => void;
}) => {
const handleProviderInfoBack = () => {
setViewObj({ view: "tenant-detail" });
};
return (
<div className="third-party-section">
<button
className="button flat"
onClick={() => handleProviderInfoBack()}>
onClick={() => handleGoBack()}>
<img
src={getImageUrl("left-arrow-dark.svg")}
alt="Go back"
Expand All @@ -48,13 +48,11 @@ export const ThirdPartyPage = ({
</button>
<div className="third-party-section__cards">
<TenantDetailHeader onlyShowTenantId />
{viewObj.view === "add-or-edit-third-party-provider" && (
<ProviderInfo
providerId={viewObj.thirdPartyId}
isAddingNewProvider={viewObj.isAddingNewProvider}
handleGoBack={handleProviderInfoBack}
/>
)}
<ProviderInfo
providerId={providerId}
isAddingNewProvider={isAddingNewProvider}
handleGoBack={handleGoBack}
/>
</div>
</div>
);
Expand All @@ -78,6 +76,7 @@ const ProviderInfo = ({
const [providerConfigResponse, setProviderConfigResponse] = useState<ProviderConfigResponse | undefined>(undefined);
const providerHasCustomFields =
typeof providerId === "string" && PROVIDERS_WITH_ADDITIONAL_CONFIG.includes(providerId);
const { showToast } = useContext(PopupContentContext);

const fetchProviderInfo = async (id: string, additionalConfig?: Record<string, string>) => {
setHasFilledCustomFieldsForProvider(true);
Expand All @@ -88,6 +87,11 @@ const ProviderInfo = ({
setProviderConfigResponse(response.providerConfig);
}
} catch (error) {
showToast({
iconImage: getImageUrl("form-field-error-icon.svg"),
toastType: "error",
children: <>Something went wrong please try refreshing the page</>,
});
} finally {
setIsProviderInfoLoading(false);
}
Expand Down

0 comments on commit e099b9a

Please sign in to comment.