Skip to content

Commit

Permalink
Merge branch 'feat/mfa/tests' into feat/mfa/storybook
Browse files Browse the repository at this point in the history
  • Loading branch information
porcellus committed Nov 13, 2023
2 parents 7ec4790 + ae7ee82 commit d5e0321
Show file tree
Hide file tree
Showing 12 changed files with 152 additions and 196 deletions.
12 changes: 0 additions & 12 deletions lib/build/components/errorBoundary.d.ts

This file was deleted.

89 changes: 30 additions & 59 deletions lib/build/index2.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

41 changes: 41 additions & 0 deletions lib/build/passwordless-shared2.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

33 changes: 4 additions & 29 deletions lib/build/passwordless-shared4.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/build/recipe/multifactorauth/index.d.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions lib/build/recipe/passwordless/utils.d.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 14 additions & 2 deletions lib/build/recipe/totp/index.d.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

49 changes: 0 additions & 49 deletions lib/ts/components/errorBoundary.tsx

This file was deleted.

18 changes: 7 additions & 11 deletions lib/ts/components/featureWrapper.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@ import { TranslationContextProvider } from "../translation/translationContext";
import { useUserContext } from "../usercontext";
import { mergeObjects } from "../utils";

import ErrorBoundary from "./errorBoundary";

import type { GetLoginMethodsResponseNormalized } from "../recipe/multitenancy/types";
import type { TranslationStore } from "../translation/translationHelpers";
import type { PropsWithChildren } from "react";
Expand Down Expand Up @@ -74,15 +72,13 @@ export default function FeatureWrapper({

return (
<DynamicLoginMethodsProvider value={loadedDynamicLoginMethods}>
<ErrorBoundary>
<TranslationContextProvider
defaultLanguage={st.languageTranslations.defaultLanguage}
defaultStore={mergeObjects(defaultStore, st.languageTranslations.userTranslationStore)}
translationControlEventSource={st.languageTranslations.translationEventSource}
userTranslationFunc={st.languageTranslations.userTranslationFunc}>
<WithOrWithoutShadowDom useShadowDom={useShadowDom}>{children}</WithOrWithoutShadowDom>
</TranslationContextProvider>
</ErrorBoundary>
<TranslationContextProvider
defaultLanguage={st.languageTranslations.defaultLanguage}
defaultStore={mergeObjects(defaultStore, st.languageTranslations.userTranslationStore)}
translationControlEventSource={st.languageTranslations.translationEventSource}
userTranslationFunc={st.languageTranslations.userTranslationFunc}>
<WithOrWithoutShadowDom useShadowDom={useShadowDom}>{children}</WithOrWithoutShadowDom>
</TranslationContextProvider>
</DynamicLoginMethodsProvider>
);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
* under the License.
*/
import { ComponentOverrideContext } from "../../../../../components/componentOverride/componentOverrideContext";
import ErrorBoundary from "../../../../../components/errorBoundary";
import { WithOrWithoutShadowDom } from "../../../../../components/featureWrapper";
import { useRecipeComponentOverrideContext } from "../../../componentOverrideContext";
import Multitenancy from "../../../recipe";
Expand All @@ -28,11 +27,9 @@ const DynamicLoginMethodsSpinner: React.FC = () => {

return (
<ComponentOverrideContext.Provider value={recipeComponentOverrides}>
<ErrorBoundary>
<WithOrWithoutShadowDom useShadowDom={recipe.config.useShadowDom}>
<DynamicLoginMethodsSpinnerTheme config={recipe.config} />
</WithOrWithoutShadowDom>
</ErrorBoundary>
<WithOrWithoutShadowDom useShadowDom={recipe.config.useShadowDom}>
<DynamicLoginMethodsSpinnerTheme config={recipe.config} />
</WithOrWithoutShadowDom>
</ComponentOverrideContext.Provider>
);
};
Expand Down
Loading

0 comments on commit d5e0321

Please sign in to comment.