fix(app-admin-users-cognito): don't render permissions error in syste…

…m installer
webiny · Oct 19, 2023 · 4442db5 · 4442db5
1 parent cc23cbd
commit 4442db5
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 17 deletions.
diff --git a/packages/app-admin-users-cognito/src/createAuthentication/createAuthentication.tsx b/packages/app-admin-users-cognito/src/createAuthentication/createAuthentication.tsx
@@ -4,9 +4,10 @@ import {
     createAuthentication as baseCreateAuthentication,
     AuthenticationFactoryConfig as BaseConfig
 } from "@webiny/app-admin-cognito";
+import { useTags } from "@webiny/app-admin";
+import { useTenancy, withTenant } from "@webiny/app-tenancy";
 import { NotAuthorizedError } from "./NotAuthorizedError";
 import { createGetIdentityData, LOGIN_ST, LOGIN_MT } from "~/createGetIdentityData";
-import { useTenancy, withTenant } from "@webiny/app-tenancy";
 import { GetIdentityDataCallable } from "~/createGetIdentityData/createGetIdentityData";
 
 export interface CreateAuthenticationConfig extends Partial<BaseConfig> {
@@ -42,6 +43,7 @@ export const createAuthentication = (config: CreateAuthenticationConfig = {}) =>
     };
 
     const Authentication: React.FC<AuthenticationProps> = ({ getIdentityData, children }) => {
+        const { installer } = useTags();
         const [error, setError] = useState<string | null>(null);
         const BaseAuthentication = useMemo(() => {
             return baseCreateAuthentication({
@@ -53,7 +55,7 @@ export const createAuthentication = (config: CreateAuthenticationConfig = {}) =>
             });
         }, []);
 
-        if (error) {
+        if (error && !installer) {
             return <NotAuthorizedError />;
         }
 

diff --git a/packages/app-admin/src/base/ui/Tags.tsx b/packages/app-admin/src/base/ui/Tags.tsx
@@ -11,7 +11,13 @@ interface TagsProps {
 }
 
 export const Tags: React.FC<TagsProps> = ({ tags, children }) => {
-    return <TagsContext.Provider value={tags}>{children}</TagsContext.Provider>;
+    const parentContext = useContext(TagsContext);
+
+    return (
+        <TagsContext.Provider value={{ ...parentContext, ...tags }}>
+            {children}
+        </TagsContext.Provider>
+    );
 };
 
 export const useTags = () => {

diff --git a/packages/app-admin/src/components/AppInstaller/AppInstaller.tsx b/packages/app-admin/src/components/AppInstaller/AppInstaller.tsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useState } from "react";
 import { default as localStorage } from "store";
-import { LoginScreen } from "~/index";
+import { LoginScreen, Tags } from "~/index";
 import { useSecurity } from "@webiny/app-security";
 import { CircularProgress } from "@webiny/ui/Progress";
 import { ButtonPrimary } from "@webiny/ui/Button";
@@ -55,19 +55,21 @@ export const AppInstaller: React.FC = ({ children }) => {
 
     const renderLayout = (content: React.ReactNode, secure = false): React.ReactElement => {
         return (
-            <SplitView className={installerSplitView}>
-                <LeftPanel span={2}>
-                    <Sidebar
-                        allInstallers={installers}
-                        installer={installer}
-                        showLogin={showLogin}
-                    />
-                </LeftPanel>
-                <RightPanel span={10}>
-                    {!showLogin && !secure && content}
-                    {(showLogin || secure) && <LoginScreen>{content}</LoginScreen>}
-                </RightPanel>
-            </SplitView>
+            <Tags tags={{ installer: true }}>
+                <SplitView className={installerSplitView}>
+                    <LeftPanel span={2}>
+                        <Sidebar
+                            allInstallers={installers}
+                            installer={installer}
+                            showLogin={showLogin}
+                        />
+                    </LeftPanel>
+                    <RightPanel span={10}>
+                        {!showLogin && !secure && content}
+                        {(showLogin || secure) && <LoginScreen>{content}</LoginScreen>}
+                    </RightPanel>
+                </SplitView>
+            </Tags>
         );
     };