zudoku 0.66.4 → 0.66.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/app/main.d.ts +6 -6
- package/dist/config/validators/InputNavigationSchema.d.ts +2 -0
- package/dist/config/validators/InputNavigationSchema.js +1 -0
- package/dist/config/validators/InputNavigationSchema.js.map +1 -1
- package/dist/config/validators/NavigationSchema.js +6 -1
- package/dist/config/validators/NavigationSchema.js.map +1 -1
- package/dist/flat-config.d.ts +1 -0
- package/dist/lib/authentication/components/CallbackHandler.js +1 -1
- package/dist/lib/authentication/components/CallbackHandler.js.map +1 -1
- package/dist/lib/authentication/providers/auth0.js +11 -7
- package/dist/lib/authentication/providers/auth0.js.map +1 -1
- package/dist/lib/authentication/providers/clerk.js +0 -22
- package/dist/lib/authentication/providers/clerk.js.map +1 -1
- package/dist/lib/authentication/providers/supabase.js +6 -15
- package/dist/lib/authentication/providers/supabase.js.map +1 -1
- package/dist/lib/core/RouteGuard.js +12 -7
- package/dist/lib/core/RouteGuard.js.map +1 -1
- package/dist/lib/oas/graphql/circular.d.ts +1 -0
- package/dist/lib/oas/graphql/circular.js +20 -5
- package/dist/lib/oas/graphql/circular.js.map +1 -1
- package/dist/lib/plugins/api-keys/index.d.ts +9 -5
- package/dist/lib/plugins/api-keys/index.js +18 -8
- package/dist/lib/plugins/api-keys/index.js.map +1 -1
- package/dist/lib/plugins/api-keys/settings/ApiKeyList.js +3 -0
- package/dist/lib/plugins/api-keys/settings/ApiKeyList.js.map +1 -1
- package/dist/lib/plugins/openapi/OperationList.js +5 -1
- package/dist/lib/plugins/openapi/OperationList.js.map +1 -1
- package/dist/lib/plugins/openapi/schema/utils.js +11 -3
- package/dist/lib/plugins/openapi/schema/utils.js.map +1 -1
- package/dist/lib/util/invariant.d.ts +1 -1
- package/dist/lib/util/invariant.js +2 -2
- package/dist/lib/util/invariant.js.map +1 -1
- package/dist/vite/api/SchemaManager.d.ts +1 -0
- package/dist/vite/api/SchemaManager.js +9 -3
- package/dist/vite/api/SchemaManager.js.map +1 -1
- package/dist/vite/mdx/remark-link-rewrite.js +1 -1
- package/dist/vite/plugin-api-keys.js +1 -0
- package/dist/vite/plugin-api-keys.js.map +1 -1
- package/dist/vite/prerender/utils.js +9 -3
- package/dist/vite/prerender/utils.js.map +1 -1
- package/lib/{ActionButton-BSM2oNHF.js → ActionButton-B0CXL1Lq.js} +3 -3
- package/lib/{ActionButton-BSM2oNHF.js.map → ActionButton-B0CXL1Lq.js.map} +1 -1
- package/lib/{Button-IOAeVaIH.js → Button-GUVe7pmt.js} +2 -2
- package/lib/{Button-IOAeVaIH.js.map → Button-GUVe7pmt.js.map} +1 -1
- package/lib/{Card-KFniaZn5.js → Card-DCdq37aA.js} +2 -2
- package/lib/{Card-KFniaZn5.js.map → Card-DCdq37aA.js.map} +1 -1
- package/lib/{ClaudeLogo-DgjivS8A.js → ClaudeLogo-BpqHBMS8.js} +4 -4
- package/lib/{ClaudeLogo-DgjivS8A.js.map → ClaudeLogo-BpqHBMS8.js.map} +1 -1
- package/lib/{Command-BpT1iBE6.js → Command-N6VujV30.js} +3 -3
- package/lib/{Command-BpT1iBE6.js.map → Command-N6VujV30.js.map} +1 -1
- package/lib/{Dialog-BQciPiHN.js → Dialog-hlvmmQ_c.js} +2 -2
- package/lib/{Dialog-BQciPiHN.js.map → Dialog-hlvmmQ_c.js.map} +1 -1
- package/lib/{Drawer-BRMcpfuF.js → Drawer-Ch7927PF.js} +2 -2
- package/lib/{Drawer-BRMcpfuF.js.map → Drawer-Ch7927PF.js.map} +1 -1
- package/lib/{DropdownMenu-C8SX_-S_.js → DropdownMenu-DN0jNrjj.js} +2 -2
- package/lib/{DropdownMenu-C8SX_-S_.js.map → DropdownMenu-DN0jNrjj.js.map} +1 -1
- package/lib/{Frame-DxlznfVd.js → Frame-DKlOmSkU.js} +2 -2
- package/lib/{Frame-DxlznfVd.js.map → Frame-DKlOmSkU.js.map} +1 -1
- package/lib/{IndexingDialog-DZWj_3cU.js → IndexingDialog-D0YdGfbn.js} +3 -3
- package/lib/{IndexingDialog-DZWj_3cU.js.map → IndexingDialog-D0YdGfbn.js.map} +1 -1
- package/lib/{Input-D-kqEQ5M.js → Input-B6YcAPv-.js} +39 -18
- package/lib/Input-B6YcAPv-.js.map +1 -0
- package/lib/{MdxPage-BL-HbZrv.js → MdxPage-CeFSxGb_.js} +11 -11
- package/lib/{MdxPage-BL-HbZrv.js.map → MdxPage-CeFSxGb_.js.map} +1 -1
- package/lib/{Mermaid-BjSczjLW.js → Mermaid-COVtAqcZ.js} +4 -4
- package/lib/{Mermaid-BjSczjLW.js.map → Mermaid-COVtAqcZ.js.map} +1 -1
- package/lib/{OAuthErrorPage-DQtg28Go.js → OAuthErrorPage-XTPBOMN8.js} +9 -9
- package/lib/OAuthErrorPage-XTPBOMN8.js.map +1 -0
- package/lib/{OasProvider--qcZwrKS.js → OasProvider-BS4rdzZC.js} +4 -4
- package/lib/{OasProvider--qcZwrKS.js.map → OasProvider-BS4rdzZC.js.map} +1 -1
- package/lib/{OperationList-CSJYzxQY.js → OperationList-Dg0Nm1tg.js} +136 -133
- package/lib/{OperationList-CSJYzxQY.js.map → OperationList-Dg0Nm1tg.js.map} +1 -1
- package/lib/RouteGuard-kCicqF3x.js +77 -0
- package/lib/RouteGuard-kCicqF3x.js.map +1 -0
- package/lib/{SchemaList-DtyuDrQA.js → SchemaList-DZKBH2WC.js} +9 -9
- package/lib/{SchemaList-DtyuDrQA.js.map → SchemaList-DZKBH2WC.js.map} +1 -1
- package/lib/{SchemaView-G-SVXxAG.js → SchemaView-DBaqV2yU.js} +95 -92
- package/lib/SchemaView-DBaqV2yU.js.map +1 -0
- package/lib/{Secret-BxGpIhDP.js → Secret-BDBqq4p3.js} +2 -2
- package/lib/{Secret-BxGpIhDP.js.map → Secret-BDBqq4p3.js.map} +1 -1
- package/lib/{Separator-CTPSeW1S.js → Separator-BXt1LYnm.js} +2 -2
- package/lib/{Separator-CTPSeW1S.js.map → Separator-BXt1LYnm.js.map} +1 -1
- package/lib/{SignUp-CDl7bQj3.js → SignUp-DNmOFbLD.js} +5 -5
- package/lib/{SignUp-CDl7bQj3.js.map → SignUp-DNmOFbLD.js.map} +1 -1
- package/lib/{SyntaxHighlight-Dgd0AaaX.js → SyntaxHighlight-C75W8uCn.js} +374 -365
- package/lib/SyntaxHighlight-C75W8uCn.js.map +1 -0
- package/lib/{Toc-D_Rj4jVx.js → Toc-ICilS65g.js} +3 -3
- package/lib/{Toc-D_Rj4jVx.js.map → Toc-ICilS65g.js.map} +1 -1
- package/lib/{ZudokuContext-DNHMZfcP.js → ZudokuContext-Ea7gxmGq.js} +542 -469
- package/lib/ZudokuContext-Ea7gxmGq.js.map +1 -0
- package/lib/{___vite-browser-external_commonjs-proxy-Cga3HsWk.js → ___vite-browser-external_commonjs-proxy-BttVsNON.js} +2 -2
- package/lib/___vite-browser-external_commonjs-proxy-BttVsNON.js.map +1 -0
- package/lib/chunk-EPOLDU6W-C6C8jAwd.js +8558 -0
- package/lib/chunk-EPOLDU6W-C6C8jAwd.js.map +1 -0
- package/lib/{circular-BxODTa7z.js → circular-DleWPaPP.js} +767 -747
- package/lib/{circular-BxODTa7z.js.map → circular-DleWPaPP.js.map} +1 -1
- package/lib/{cn-dYga0KKN.js → cn-5-Gd1Dss.js} +531 -498
- package/lib/cn-5-Gd1Dss.js.map +1 -0
- package/lib/{createServer-BpreIXp6.js → createServer-nqMW9kro.js} +6 -6
- package/lib/{createServer-BpreIXp6.js.map → createServer-nqMW9kro.js.map} +1 -1
- package/lib/{createVariantComponent-CQVt-H3r.js → createVariantComponent-Dc0vtOvr.js} +2 -2
- package/lib/{createVariantComponent-CQVt-H3r.js.map → createVariantComponent-Dc0vtOvr.js.map} +1 -1
- package/lib/{errors-DliW1dED.js → errors-D2FbERKl.js} +3 -3
- package/lib/{errors-DliW1dED.js.map → errors-D2FbERKl.js.map} +1 -1
- package/lib/{firebase-D4tbaCYB.js → firebase-Cn9CmB6h.js} +21 -21
- package/lib/{firebase-D4tbaCYB.js.map → firebase-Cn9CmB6h.js.map} +1 -1
- package/lib/{hook-CHw_R_xu.js → hook-B2nmfmYN.js} +3 -3
- package/lib/{hook-CHw_R_xu.js.map → hook-B2nmfmYN.js.map} +1 -1
- package/lib/{index-DXXZDuSJ.js → index-CC4L3gtM.js} +4 -4
- package/lib/{index-DXXZDuSJ.js.map → index-CC4L3gtM.js.map} +1 -1
- package/lib/{index-9MxNUgg4.js → index-CSDW7CHl.js} +21 -21
- package/lib/{index-9MxNUgg4.js.map → index-CSDW7CHl.js.map} +1 -1
- package/lib/{index-CboxZOVW.js → index-D5NeW2z6.js} +12 -12
- package/lib/{index-CboxZOVW.js.map → index-D5NeW2z6.js.map} +1 -1
- package/lib/{index-1TbL0HXQ.js → index-DSKBOdpT.js} +2 -2
- package/lib/{index-1TbL0HXQ.js.map → index-DSKBOdpT.js.map} +1 -1
- package/lib/{index.esm-ti5zvZS_.js → index.esm-B35e7P83.js} +2 -2
- package/lib/index.esm-B35e7P83.js.map +1 -0
- package/lib/{index.esm-DtzT_KoE.js → index.esm-B_0dvNjB.js} +2 -2
- package/lib/{index.esm-DtzT_KoE.js.map → index.esm-B_0dvNjB.js.map} +1 -1
- package/lib/{invariant-CGOLuIIz.js → invariant-BJAl77rw.js} +4 -4
- package/lib/invariant-BJAl77rw.js.map +1 -0
- package/lib/{mutation-DMHWqmFp.js → mutation-BOYnEDf6.js} +70 -44
- package/lib/mutation-BOYnEDf6.js.map +1 -0
- package/lib/ui/Accordion.js +1 -1
- package/lib/ui/ActionButton.js +2 -2
- package/lib/ui/Alert.js +1 -1
- package/lib/ui/AlertDialog.js +1 -1
- package/lib/ui/Badge.js +1 -1
- package/lib/ui/Breadcrumb.js +1 -1
- package/lib/ui/Button.js +1 -1
- package/lib/ui/ButtonGroup.js +1 -1
- package/lib/ui/Callout.js +1 -1
- package/lib/ui/Card.js +1 -1
- package/lib/ui/Carousel.js +1 -1
- package/lib/ui/Checkbox.js +1 -1
- package/lib/ui/CodeBlock.js +1 -1
- package/lib/ui/Command.js +2 -2
- package/lib/ui/Dialog.js +1 -1
- package/lib/ui/Drawer.js +2 -2
- package/lib/ui/DropdownMenu.js +1 -1
- package/lib/ui/EmbeddedCodeBlock.js +1 -1
- package/lib/ui/Form.js +1 -1
- package/lib/ui/Frame.js +1 -1
- package/lib/ui/HoverCard.js +1 -1
- package/lib/ui/Input.js +1 -1
- package/lib/ui/Item.js +1 -1
- package/lib/ui/Label.js +1 -1
- package/lib/ui/NativeSelect.js +1 -1
- package/lib/ui/Pagination.js +1 -1
- package/lib/ui/Popover.js +1 -1
- package/lib/ui/Progress.js +1 -1
- package/lib/ui/RadioGroup.js +1 -1
- package/lib/ui/ScrollArea.js +1 -1
- package/lib/ui/Secret.js +1 -1
- package/lib/ui/Separator.js +1 -1
- package/lib/ui/Skeleton.js +1 -1
- package/lib/ui/Slider.js +1 -1
- package/lib/ui/Switch.js +1 -1
- package/lib/ui/SyntaxHighlight.js +3 -3
- package/lib/ui/Tabs.js +1 -1
- package/lib/ui/Textarea.js +1 -1
- package/lib/ui/Toggle.js +1 -1
- package/lib/ui/ToggleGroup.js +1 -1
- package/lib/ui/Value.js +1 -1
- package/lib/ui/util.js +1 -1
- package/lib/zudoku.__internal.js +604 -602
- package/lib/zudoku.__internal.js.map +1 -1
- package/lib/zudoku.auth-auth0.js +16 -16
- package/lib/zudoku.auth-auth0.js.map +1 -1
- package/lib/zudoku.auth-azureb2c.js +4 -4
- package/lib/zudoku.auth-clerk.js +52 -75
- package/lib/zudoku.auth-clerk.js.map +1 -1
- package/lib/zudoku.auth-firebase.js +5 -5
- package/lib/zudoku.auth-openid.js +5 -5
- package/lib/zudoku.auth-supabase.js +31 -40
- package/lib/zudoku.auth-supabase.js.map +1 -1
- package/lib/zudoku.components.js +6 -6
- package/lib/zudoku.hooks.js +3 -3
- package/lib/zudoku.mermaid.js +3 -3
- package/lib/zudoku.plugin-api-catalog.js +5 -5
- package/lib/zudoku.plugin-api-keys.js +258 -240
- package/lib/zudoku.plugin-api-keys.js.map +1 -1
- package/lib/zudoku.plugin-custom-pages.js +1 -1
- package/lib/zudoku.plugin-markdown.js +1 -1
- package/lib/zudoku.plugin-openapi.js +3 -3
- package/lib/zudoku.plugin-redirect.js +1 -1
- package/lib/zudoku.plugin-search-pagefind.js +7 -7
- package/lib/zudoku.router.js +1130 -1404
- package/lib/zudoku.router.js.map +1 -1
- package/package.json +12 -12
- package/src/lib/authentication/components/CallbackHandler.tsx +1 -1
- package/src/lib/authentication/providers/auth0.tsx +15 -9
- package/src/lib/authentication/providers/clerk.tsx +0 -26
- package/src/lib/authentication/providers/supabase.tsx +6 -15
- package/src/lib/core/RouteGuard.tsx +30 -24
- package/src/lib/oas/graphql/circular.ts +36 -3
- package/src/lib/plugins/api-keys/index.tsx +46 -16
- package/src/lib/plugins/api-keys/settings/ApiKeyList.tsx +3 -0
- package/src/lib/plugins/openapi/OperationList.tsx +6 -1
- package/src/lib/plugins/openapi/schema/utils.ts +15 -4
- package/src/lib/util/invariant.ts +2 -1
- package/lib/Input-D-kqEQ5M.js.map +0 -1
- package/lib/OAuthErrorPage-DQtg28Go.js.map +0 -1
- package/lib/RouteGuard-D0f743SM.js +0 -77
- package/lib/RouteGuard-D0f743SM.js.map +0 -1
- package/lib/SchemaView-G-SVXxAG.js.map +0 -1
- package/lib/SyntaxHighlight-Dgd0AaaX.js.map +0 -1
- package/lib/ZudokuContext-DNHMZfcP.js.map +0 -1
- package/lib/___vite-browser-external_commonjs-proxy-Cga3HsWk.js.map +0 -1
- package/lib/chunk-PVWAREVJ-ClM0m2aJ.js +0 -7965
- package/lib/chunk-PVWAREVJ-ClM0m2aJ.js.map +0 -1
- package/lib/cn-dYga0KKN.js.map +0 -1
- package/lib/index.esm-ti5zvZS_.js.map +0 -1
- package/lib/invariant-CGOLuIIz.js.map +0 -1
- package/lib/mutation-DMHWqmFp.js.map +0 -1
package/dist/app/main.d.ts
CHANGED
|
@@ -9,7 +9,7 @@ export declare const getRoutesByOptions: (options: ZudokuContextOptions, enableS
|
|
|
9
9
|
caseSensitive?: boolean | undefined;
|
|
10
10
|
path?: string | undefined;
|
|
11
11
|
id?: string | undefined;
|
|
12
|
-
|
|
12
|
+
middleware?: import("react-router").MiddlewareFunction<unknown>[] | undefined;
|
|
13
13
|
loader?: boolean | import("react-router").LoaderFunction<any> | undefined;
|
|
14
14
|
action?: boolean | import("react-router").ActionFunction<any> | undefined;
|
|
15
15
|
hasErrorBoundary?: boolean | undefined;
|
|
@@ -23,7 +23,7 @@ export declare const getRoutesByOptions: (options: ZudokuContextOptions, enableS
|
|
|
23
23
|
HydrateFallback?: React.ComponentType | null;
|
|
24
24
|
ErrorBoundary?: React.ComponentType | null;
|
|
25
25
|
lazy?: ({
|
|
26
|
-
|
|
26
|
+
middleware?: (() => Promise<import("react-router").MiddlewareFunction<unknown>[] | null | undefined>) | undefined;
|
|
27
27
|
loader?: (() => Promise<boolean | import("react-router").LoaderFunction<any> | null | undefined>) | undefined;
|
|
28
28
|
action?: (() => Promise<boolean | import("react-router").ActionFunction<any> | null | undefined>) | undefined;
|
|
29
29
|
hasErrorBoundary?: (() => Promise<boolean | null | undefined>) | undefined;
|
|
@@ -36,7 +36,7 @@ export declare const getRoutesByOptions: (options: ZudokuContextOptions, enableS
|
|
|
36
36
|
HydrateFallback?: (() => Promise<import("react").ComponentType<{}> | null | undefined>) | undefined;
|
|
37
37
|
ErrorBoundary?: (() => Promise<import("react").ComponentType<{}> | null | undefined>) | undefined;
|
|
38
38
|
} | {
|
|
39
|
-
|
|
39
|
+
middleware?: (() => Promise<import("react-router").MiddlewareFunction<unknown>[] | null | undefined>) | undefined;
|
|
40
40
|
loader?: (() => Promise<boolean | import("react-router").LoaderFunction<any> | null | undefined>) | undefined;
|
|
41
41
|
action?: (() => Promise<boolean | import("react-router").ActionFunction<any> | null | undefined>) | undefined;
|
|
42
42
|
hasErrorBoundary?: (() => Promise<boolean | null | undefined>) | undefined;
|
|
@@ -54,7 +54,7 @@ export declare const getRoutesByOptions: (options: ZudokuContextOptions, enableS
|
|
|
54
54
|
caseSensitive?: boolean | undefined;
|
|
55
55
|
path?: string | undefined;
|
|
56
56
|
id?: string | undefined;
|
|
57
|
-
|
|
57
|
+
middleware?: import("react-router").MiddlewareFunction<unknown>[] | undefined;
|
|
58
58
|
loader?: boolean | import("react-router").LoaderFunction<any> | undefined;
|
|
59
59
|
action?: boolean | import("react-router").ActionFunction<any> | undefined;
|
|
60
60
|
hasErrorBoundary?: boolean | undefined;
|
|
@@ -68,7 +68,7 @@ export declare const getRoutesByOptions: (options: ZudokuContextOptions, enableS
|
|
|
68
68
|
HydrateFallback?: React.ComponentType | null;
|
|
69
69
|
ErrorBoundary?: React.ComponentType | null;
|
|
70
70
|
lazy?: ({
|
|
71
|
-
|
|
71
|
+
middleware?: (() => Promise<import("react-router").MiddlewareFunction<unknown>[] | null | undefined>) | undefined;
|
|
72
72
|
loader?: (() => Promise<boolean | import("react-router").LoaderFunction<any> | null | undefined>) | undefined;
|
|
73
73
|
action?: (() => Promise<boolean | import("react-router").ActionFunction<any> | null | undefined>) | undefined;
|
|
74
74
|
hasErrorBoundary?: (() => Promise<boolean | null | undefined>) | undefined;
|
|
@@ -81,7 +81,7 @@ export declare const getRoutesByOptions: (options: ZudokuContextOptions, enableS
|
|
|
81
81
|
HydrateFallback?: (() => Promise<import("react").ComponentType<{}> | null | undefined>) | undefined;
|
|
82
82
|
ErrorBoundary?: (() => Promise<import("react").ComponentType<{}> | null | undefined>) | undefined;
|
|
83
83
|
} | {
|
|
84
|
-
|
|
84
|
+
middleware?: (() => Promise<import("react-router").MiddlewareFunction<unknown>[] | null | undefined>) | undefined;
|
|
85
85
|
loader?: (() => Promise<boolean | import("react-router").LoaderFunction<any> | null | undefined>) | undefined;
|
|
86
86
|
action?: (() => Promise<boolean | import("react-router").ActionFunction<any> | null | undefined>) | undefined;
|
|
87
87
|
hasErrorBoundary?: (() => Promise<boolean | null | undefined>) | undefined;
|
|
@@ -5,6 +5,7 @@ declare const InputNavigationCategoryLinkDocSchema: z.ZodUnion<readonly [z.ZodSt
|
|
|
5
5
|
type: z.ZodLiteral<"doc">;
|
|
6
6
|
file: z.ZodString;
|
|
7
7
|
label: z.ZodOptional<z.ZodString>;
|
|
8
|
+
path: z.ZodOptional<z.ZodString>;
|
|
8
9
|
}, z.core.$strip>]>;
|
|
9
10
|
export declare const DisplaySchema: z.ZodOptional<z.ZodDefault<z.ZodUnion<readonly [z.ZodEnum<{
|
|
10
11
|
hide: "hide";
|
|
@@ -7617,6 +7618,7 @@ declare const BaseInputNavigationCategorySchema: z.ZodObject<{
|
|
|
7617
7618
|
type: z.ZodLiteral<"doc">;
|
|
7618
7619
|
file: z.ZodString;
|
|
7619
7620
|
label: z.ZodOptional<z.ZodString>;
|
|
7621
|
+
path: z.ZodOptional<z.ZodString>;
|
|
7620
7622
|
}, z.core.$strip>]>>;
|
|
7621
7623
|
display: z.ZodOptional<z.ZodDefault<z.ZodUnion<readonly [z.ZodEnum<{
|
|
7622
7624
|
hide: "hide";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"InputNavigationSchema.js","sourceRoot":"","sources":["../../../src/config/validators/InputNavigationSchema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,MAAM,UAAU,GAAG,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;AAErC,MAAM,WAAW,GAAG,CAAC,CAAC,MAAM,CAAC;IAC3B,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE;IACjB,uCAAuC;IACvC,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;IACxF,MAAM,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;IAC9B,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CACjC,CAAC,CAAC;AAEH,MAAM,oCAAoC,GAAG,CAAC,CAAC,KAAK,CAAC;IACnD,CAAC,CAAC,MAAM,EAAE;IACV,CAAC,CAAC,MAAM,CAAC;QACP,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC;QACtB,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;QAChB,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;
|
|
1
|
+
{"version":3,"file":"InputNavigationSchema.js","sourceRoot":"","sources":["../../../src/config/validators/InputNavigationSchema.ts"],"names":[],"mappings":"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"}
|
|
@@ -58,7 +58,12 @@ export class NavigationResolver {
|
|
|
58
58
|
}
|
|
59
59
|
const doc = await this.resolveDoc(item.file);
|
|
60
60
|
return doc
|
|
61
|
-
? {
|
|
61
|
+
? {
|
|
62
|
+
...item,
|
|
63
|
+
label: doc.label,
|
|
64
|
+
icon: doc.icon,
|
|
65
|
+
path: item.path ?? doc.path,
|
|
66
|
+
}
|
|
62
67
|
: undefined;
|
|
63
68
|
}
|
|
64
69
|
async resolveNavigationItemDoc(item, categoryLabel) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NavigationSchema.js","sourceRoot":"","sources":["../../../src/config/validators/NavigationSchema.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"NavigationSchema.js","sourceRoot":"","sources":["../../../src/config/validators/NavigationSchema.ts"],"names":[],"mappings":"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"}
|
package/dist/flat-config.d.ts
CHANGED
|
@@ -9,7 +9,7 @@ export function CallbackHandler({ handleCallback, }) {
|
|
|
9
9
|
const { options } = useZudoku();
|
|
10
10
|
const executeCallback = useSuspenseQuery({
|
|
11
11
|
retry: false,
|
|
12
|
-
queryKey: ["oauth-callback"],
|
|
12
|
+
queryKey: ["oauth-callback", window.location.search],
|
|
13
13
|
queryFn: async () => {
|
|
14
14
|
const url = new URL(window.location.href);
|
|
15
15
|
const errorParam = url.searchParams.get("error");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CallbackHandler.js","sourceRoot":"","sources":["../../../../src/lib/authentication/components/CallbackHandler.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAChD,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,uBAAuB,EAAuB,MAAM,cAAc,CAAC;AAE5E,MAAM,UAAU,eAAe,CAAC,EAC9B,cAAc,GAGf;IACC,MAAM,EAAE,OAAO,EAAE,GAAG,SAAS,EAAE,CAAC;IAChC,MAAM,eAAe,GAAG,gBAAgB,CAAC;QACvC,KAAK,EAAE,KAAK;QACZ,QAAQ,EAAE,CAAC,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"CallbackHandler.js","sourceRoot":"","sources":["../../../../src/lib/authentication/components/CallbackHandler.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAChD,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,uBAAuB,EAAuB,MAAM,cAAc,CAAC;AAE5E,MAAM,UAAU,eAAe,CAAC,EAC9B,cAAc,GAGf;IACC,MAAM,EAAE,OAAO,EAAE,GAAG,SAAS,EAAE,CAAC;IAChC,MAAM,eAAe,GAAG,gBAAgB,CAAC;QACvC,KAAK,EAAE,KAAK;QACZ,QAAQ,EAAE,CAAC,gBAAgB,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC;QACpD,OAAO,EAAE,KAAK,IAAI,EAAE;YAClB,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YAE1C,MAAM,UAAU,GAAG,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YACjD,MAAM,gBAAgB,GACpB,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,mBAAmB,CAAC,IAAI,SAAS,CAAC;YACzD,MAAM,QAAQ,GAAG,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,SAAS,CAAC;YAChE,IAAI,UAAU,EAAE,CAAC;gBACf,MAAM,IAAI,uBAAuB,CAC/B,gBAAgB,UAAU,MAAM,gBAAgB,EAAE,EAClD;oBACE,KAAK,EAAE,UAA4B;oBACnC,iBAAiB,EAAE,gBAAgB;oBACnC,SAAS,EAAE,QAAQ;iBACpB,CACF,CAAC;YACJ,CAAC;YACD,OAAO,OAAO,CACZ,oBAAoB,CAClB,MAAM,cAAc,EAAE,EACtB,MAAM,CAAC,QAAQ,CAAC,MAAM,EACtB,OAAO,CAAC,QAAQ,CACjB,CACF,CAAC;QACJ,CAAC;KACF,CAAC,CAAC;IAEH,OAAO,KAAC,QAAQ,IAAC,EAAE,EAAE,eAAe,CAAC,IAAI,EAAE,OAAO,SAAG,CAAC;AACxD,CAAC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { joinUrl } from "../../util/joinUrl.js";
|
|
1
2
|
import { useAuthState } from "../state.js";
|
|
2
3
|
import { OpenIDAuthenticationProvider } from "./openid.js";
|
|
3
4
|
class Auth0AuthenticationProvider extends OpenIDAuthenticationProvider {
|
|
@@ -28,7 +29,9 @@ class Auth0AuthenticationProvider extends OpenIDAuthenticationProvider {
|
|
|
28
29
|
};
|
|
29
30
|
signOut = async (_) => {
|
|
30
31
|
const as = await this.getAuthServer();
|
|
31
|
-
|
|
32
|
+
// biome-ignore lint/suspicious/noExplicitAny: We don't have a good way for typing provider-data yet.
|
|
33
|
+
const providerData = useAuthState.getState().providerData;
|
|
34
|
+
const idToken = providerData?.idToken;
|
|
32
35
|
useAuthState.setState({
|
|
33
36
|
isAuthenticated: false,
|
|
34
37
|
isPending: false,
|
|
@@ -36,24 +39,25 @@ class Auth0AuthenticationProvider extends OpenIDAuthenticationProvider {
|
|
|
36
39
|
providerData: undefined,
|
|
37
40
|
});
|
|
38
41
|
const redirectUrl = new URL(window.location.origin);
|
|
39
|
-
redirectUrl.pathname = this.redirectToAfterSignOut;
|
|
42
|
+
redirectUrl.pathname = joinUrl(import.meta.env.BASE_URL, this.redirectToAfterSignOut);
|
|
40
43
|
// SEE: https://auth0.com/docs/authenticate/login/logout/log-users-out-of-auth0
|
|
41
44
|
// For Auth0 tenants created on or after 14 November 2023, RP-Initiated
|
|
42
45
|
// Logout End Session Endpoint Discovery is enabled by default.
|
|
43
46
|
// Otherwise we fallback to the old non-compliant logout
|
|
44
|
-
// The
|
|
45
|
-
// so we use
|
|
47
|
+
// The end_session_endpoint is set, the IdP supports some form of logout,
|
|
48
|
+
// so we use auth0 logout. Otherwise, just redirect the user to home
|
|
46
49
|
if (as.end_session_endpoint) {
|
|
47
50
|
const logoutUrl = new URL(as.end_session_endpoint);
|
|
48
51
|
if (idToken) {
|
|
49
52
|
logoutUrl.searchParams.set("id_token_hint", idToken);
|
|
50
53
|
}
|
|
51
54
|
logoutUrl.searchParams.set("post_logout_redirect_uri", redirectUrl.toString());
|
|
52
|
-
|
|
55
|
+
window.location.href = logoutUrl.toString();
|
|
53
56
|
}
|
|
54
57
|
else {
|
|
55
|
-
const
|
|
56
|
-
//
|
|
58
|
+
// const logoutUrl = new URL(`${this.issuer.replace(/\/$/, "")}/v2/logout`);
|
|
59
|
+
// logoutUrl.searchParams.set("returnTo", redirectUrl.toString());
|
|
60
|
+
// don't support the deprecated logout today
|
|
57
61
|
}
|
|
58
62
|
};
|
|
59
63
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth0.js","sourceRoot":"","sources":["../../../../src/lib/authentication/providers/auth0.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"auth0.js","sourceRoot":"","sources":["../../../../src/lib/authentication/providers/auth0.tsx"],"names":[],"mappings":"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"}
|
|
@@ -12,28 +12,6 @@ const clerkAuth = ({ clerkPubKey, jwtTemplateName, redirectToAfterSignOut = "/",
|
|
|
12
12
|
const { Clerk } = await import("@clerk/clerk-js");
|
|
13
13
|
clerkApi = new Clerk(clerkPubKey);
|
|
14
14
|
await clerkApi.load();
|
|
15
|
-
if (clerkApi.user) {
|
|
16
|
-
const verifiedEmail = clerkApi.user.emailAddresses.find((email) => email.verification.status === "verified");
|
|
17
|
-
useAuthState.getState().setLoggedIn({
|
|
18
|
-
profile: {
|
|
19
|
-
sub: clerkApi.user.id,
|
|
20
|
-
name: clerkApi.user.fullName ?? undefined,
|
|
21
|
-
email: verifiedEmail?.emailAddress ??
|
|
22
|
-
clerkApi.user.emailAddresses[0]?.emailAddress,
|
|
23
|
-
emailVerified: verifiedEmail !== undefined,
|
|
24
|
-
pictureUrl: clerkApi.user.imageUrl,
|
|
25
|
-
},
|
|
26
|
-
providerData: {
|
|
27
|
-
user: {
|
|
28
|
-
publicMetadata: clerkApi.user.publicMetadata,
|
|
29
|
-
id: clerkApi.user.id,
|
|
30
|
-
emailAddresses: clerkApi.user.emailAddresses,
|
|
31
|
-
imageUrl: clerkApi.user.imageUrl,
|
|
32
|
-
fullName: clerkApi.user.fullName,
|
|
33
|
-
},
|
|
34
|
-
},
|
|
35
|
-
});
|
|
36
|
-
}
|
|
37
15
|
return clerkApi;
|
|
38
16
|
})();
|
|
39
17
|
async function getAccessToken() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clerk.js","sourceRoot":"","sources":["../../../../src/lib/authentication/providers/clerk.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAQ1C,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AACjD,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,MAAM,SAAS,GAEX,CAAC,EACH,WAAW,EACX,eAAe,EACf,sBAAsB,GAAG,GAAG,EAC5B,qBAAqB,EACrB,qBAAqB,GACtB,EAAuC,EAAE;IACxC,IAAI,QAA2B,CAAC;IAChC,MAAM,YAAY,GAAG,CAAC,KAAK,IAAI,EAAE;QAC/B,IAAI,OAAO,MAAM,KAAK,WAAW;YAAE,OAAO;QAC1C,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,MAAM,CAAC,iBAAiB,CAAC,CAAC;QAClD,QAAQ,GAAG,IAAI,KAAK,CAAC,WAAW,CAAC,CAAC;QAElC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;QAEtB,
|
|
1
|
+
{"version":3,"file":"clerk.js","sourceRoot":"","sources":["../../../../src/lib/authentication/providers/clerk.tsx"],"names":[],"mappings":"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"}
|
|
@@ -80,21 +80,12 @@ class SupabaseAuthenticationProvider extends CoreAuthenticationPlugin {
|
|
|
80
80
|
];
|
|
81
81
|
};
|
|
82
82
|
signOut = async () => {
|
|
83
|
-
await
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
});
|
|
90
|
-
void this.client.auth.signOut();
|
|
91
|
-
});
|
|
92
|
-
useAuthState.setState({
|
|
93
|
-
isAuthenticated: false,
|
|
94
|
-
isPending: false,
|
|
95
|
-
profile: undefined,
|
|
96
|
-
providerData: undefined,
|
|
97
|
-
});
|
|
83
|
+
const { error } = await this.client.auth.signOut({ scope: "local" });
|
|
84
|
+
if (error) {
|
|
85
|
+
// biome-ignore lint/suspicious: Logging is better than not doing anything
|
|
86
|
+
console.error("Error signing out", error);
|
|
87
|
+
}
|
|
88
|
+
useAuthState.getState().setLoggedOut();
|
|
98
89
|
};
|
|
99
90
|
onPageLoad = async () => {
|
|
100
91
|
const { data, error } = await this.client.auth.getSession();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"supabase.js","sourceRoot":"","sources":["../../../../src/lib/authentication/providers/supabase.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"supabase.js","sourceRoot":"","sources":["../../../../src/lib/authentication/providers/supabase.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { jsx as _jsx,
|
|
1
|
+
import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
|
|
2
2
|
import { Helmet } from "@zudoku/react-helmet-async";
|
|
3
3
|
import { use } from "react";
|
|
4
4
|
import { matchPath, Outlet, useLocation, useNavigate } from "react-router";
|
|
@@ -18,17 +18,22 @@ export const RouteGuard = () => {
|
|
|
18
18
|
const latestPath = useLatest(location.pathname);
|
|
19
19
|
const shouldBypass = use(BypassProtectedRoutesContext);
|
|
20
20
|
const { protectedRoutes } = zudoku.options;
|
|
21
|
-
const
|
|
22
|
-
? Object.entries(protectedRoutes).find(([path]) => matchPath({ path, end: true }, location.pathname))
|
|
21
|
+
const protectedRouteEntry = protectedRoutes
|
|
22
|
+
? Object.entries(protectedRoutes).find(([path]) => matchPath({ path, end: true }, location.pathname))
|
|
23
23
|
: undefined;
|
|
24
|
-
const isProtectedRoute =
|
|
25
|
-
|
|
24
|
+
const isProtectedRoute = protectedRouteEntry !== undefined;
|
|
25
|
+
// SSR/prerendering mode: render content with search meta tag, skip all auth
|
|
26
|
+
if (shouldBypass) {
|
|
27
|
+
return (_jsxs(_Fragment, { children: [isProtectedRoute && (_jsx(Helmet, { children: _jsx("meta", { name: "pagefind", "data-pagefind-filter": `section:${SEARCH_PROTECTED_SECTION}`, content: "true" }) })), _jsx(Outlet, {})] }));
|
|
28
|
+
}
|
|
26
29
|
if (isProtectedRoute && !auth.isAuthEnabled) {
|
|
27
30
|
throw new ZudokuError("Authentication is not enabled", {
|
|
28
31
|
title: "Authentication is not enabled",
|
|
29
32
|
developerHint: "To use protectedRoutes you need authentication to be enabled",
|
|
30
33
|
});
|
|
31
34
|
}
|
|
35
|
+
const authCheckFn = protectedRouteEntry?.[1];
|
|
36
|
+
const needsToSignIn = isProtectedRoute && !authCheckFn?.({ auth, context: zudoku });
|
|
32
37
|
if (needsToSignIn && auth.isPending && typeof window !== "undefined") {
|
|
33
38
|
return null;
|
|
34
39
|
}
|
|
@@ -37,8 +42,8 @@ export const RouteGuard = () => {
|
|
|
37
42
|
if (!open) {
|
|
38
43
|
void navigate(-1);
|
|
39
44
|
}
|
|
40
|
-
}, children: _jsxs(DialogContent, { children: [_jsx(DialogHeader, { children: _jsx(DialogTitle, { children: "Login to continue" }) }), _jsx(DialogDescription, { children: "Please wait while we log you in." }), _jsxs(DialogFooter, { children: [_jsx(Button, { variant: "outline", onClick: () => void navigate(-1), children: "Cancel" }), _jsx("div", { className: "w-full" }), _jsx(Button, { variant: "secondary", onClick: () => void zudoku.authentication?.signUp({ navigate }, { redirectTo: latestPath.current }), children: "Register" }),
|
|
45
|
+
}, children: _jsxs(DialogContent, { children: [_jsx(DialogHeader, { children: _jsx(DialogTitle, { children: "Login to continue" }) }), _jsx(DialogDescription, { children: "Please wait while we log you in." }), _jsxs(DialogFooter, { children: [_jsx(Button, { variant: "outline", onClick: () => void navigate(-1), children: "Cancel" }), _jsx("div", { className: "w-full" }), _jsx(Button, { variant: "secondary", onClick: () => void zudoku.authentication?.signUp({ navigate }, { redirectTo: latestPath.current }), children: "Register" }), _jsx(Button, { onClick: () => void zudoku.authentication?.signIn({ navigate }, { redirectTo: latestPath.current }), children: "Login" })] })] }) }));
|
|
41
46
|
}
|
|
42
|
-
return
|
|
47
|
+
return _jsx(Outlet, {});
|
|
43
48
|
};
|
|
44
49
|
//# sourceMappingURL=RouteGuard.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RouteGuard.js","sourceRoot":"","sources":["../../../src/lib/core/RouteGuard.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;AACpD,OAAO,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AAC5B,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3E,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAC7C,OAAO,EACL,MAAM,EACN,aAAa,EACb,iBAAiB,EACjB,YAAY,EACZ,YAAY,EACZ,WAAW,GACZ,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AACpD,OAAO,EAAE,4BAA4B,EAAE,MAAM,uDAAuD,CAAC;AACrG,OAAO,EAAE,SAAS,EAAE,MAAM,wCAAwC,CAAC;AACnE,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEjD,MAAM,CAAC,MAAM,wBAAwB,GAAG,WAAW,CAAC;AAEpD,MAAM,CAAC,MAAM,UAAU,GAAG,GAAG,EAAE;IAC7B,MAAM,IAAI,GAAG,OAAO,EAAE,CAAC;IACvB,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;IAC3B,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAC/B,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAC/B,MAAM,UAAU,GAAG,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAChD,MAAM,YAAY,GAAG,GAAG,CAAC,4BAA4B,CAAC,CAAC;IACvD,MAAM,EAAE,eAAe,EAAE,GAAG,MAAM,CAAC,OAAO,CAAC;IAE3C,MAAM,
|
|
1
|
+
{"version":3,"file":"RouteGuard.js","sourceRoot":"","sources":["../../../src/lib/core/RouteGuard.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { GraphQLScalarType } from "graphql/index.js";
|
|
2
2
|
import { GraphQLJSON } from "graphql-type-json";
|
|
3
3
|
export const CIRCULAR_REF = "$[Circular Reference]";
|
|
4
|
+
export const SCHEMA_REF_PREFIX = "$ref:";
|
|
4
5
|
const OPENAPI_PROPS = new Set([
|
|
5
6
|
"properties",
|
|
6
7
|
"items",
|
|
@@ -11,27 +12,41 @@ const OPENAPI_PROPS = new Set([
|
|
|
11
12
|
]);
|
|
12
13
|
const handleCircularRefs = (
|
|
13
14
|
// biome-ignore lint/suspicious/noExplicitAny: Allow any type
|
|
14
|
-
obj, visited = new WeakSet(), refs = new WeakMap(), path = []) => {
|
|
15
|
+
obj, visited = new WeakSet(), refs = new WeakMap(), path = [], seenRefPaths = new Set()) => {
|
|
15
16
|
if (obj === null || typeof obj !== "object")
|
|
16
17
|
return obj;
|
|
18
|
+
const refPath = obj.__$ref;
|
|
19
|
+
// Check if this object has a __$ref marker (set during schema code generation)
|
|
20
|
+
// If we've already fully processed this ref path, return a reference marker
|
|
21
|
+
// instead of the full data to avoid JSON.stringify serializing duplicates
|
|
22
|
+
if (typeof refPath === "string" && seenRefPaths.has(refPath)) {
|
|
23
|
+
return SCHEMA_REF_PREFIX + refPath;
|
|
24
|
+
}
|
|
17
25
|
if (visited.has(obj)) {
|
|
18
26
|
const cached = refs.get(obj);
|
|
19
|
-
if (cached)
|
|
20
|
-
return
|
|
27
|
+
if (cached) {
|
|
28
|
+
return typeof refPath === "string"
|
|
29
|
+
? // If already processed, return ref marker to avoid duplicate serialization
|
|
30
|
+
SCHEMA_REF_PREFIX + refPath
|
|
31
|
+
: cached;
|
|
32
|
+
}
|
|
21
33
|
const circularProp = path.find((p) => !OPENAPI_PROPS.has(p)) || path[0];
|
|
22
34
|
return [CIRCULAR_REF, circularProp].filter(Boolean).join(":");
|
|
23
35
|
}
|
|
24
36
|
visited.add(obj);
|
|
25
37
|
if (Array.isArray(obj)) {
|
|
26
|
-
const result = obj.map((item, index) => handleCircularRefs(item, visited, refs, [...path, index.toString()]));
|
|
38
|
+
const result = obj.map((item, index) => handleCircularRefs(item, visited, refs, [...path, index.toString()], seenRefPaths));
|
|
27
39
|
refs.set(obj, result);
|
|
28
40
|
return result;
|
|
29
41
|
}
|
|
30
42
|
const result = {};
|
|
31
43
|
for (const [key, value] of Object.entries(obj)) {
|
|
32
|
-
result[key] = handleCircularRefs(value, visited, refs, [...path, key]);
|
|
44
|
+
result[key] = handleCircularRefs(value, visited, refs, [...path, key], seenRefPaths);
|
|
33
45
|
}
|
|
34
46
|
refs.set(obj, result);
|
|
47
|
+
if (typeof refPath === "string") {
|
|
48
|
+
seenRefPaths.add(refPath);
|
|
49
|
+
}
|
|
35
50
|
return result;
|
|
36
51
|
};
|
|
37
52
|
export const GraphQLJSONSchema = new GraphQLScalarType({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"circular.js","sourceRoot":"","sources":["../../../../src/lib/oas/graphql/circular.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAGhD,MAAM,CAAC,MAAM,YAAY,GAAG,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"circular.js","sourceRoot":"","sources":["../../../../src/lib/oas/graphql/circular.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,9 +20,10 @@ export type ApiKeyService = {
|
|
|
20
20
|
auth: UseAuthReturn;
|
|
21
21
|
}) => Promise<void>;
|
|
22
22
|
};
|
|
23
|
-
export type ApiKeyPluginOptions = ApiKeyService |
|
|
24
|
-
|
|
25
|
-
|
|
23
|
+
export type ApiKeyPluginOptions = ApiKeyService | DefaultApiKeyServiceOptions;
|
|
24
|
+
type DefaultApiKeyServiceOptions = {
|
|
25
|
+
deploymentName?: string;
|
|
26
|
+
} & Partial<ApiKeyService>;
|
|
26
27
|
export interface ApiKey {
|
|
27
28
|
id: string;
|
|
28
29
|
description?: string;
|
|
@@ -42,6 +43,9 @@ export interface ApiConsumer {
|
|
|
42
43
|
key?: ApiKey;
|
|
43
44
|
}
|
|
44
45
|
export declare const createApiKeyService: <T extends ApiKeyService>(service: T) => T;
|
|
45
|
-
|
|
46
|
+
type InternalApiKeyPluginOptions = {
|
|
46
47
|
deploymentName?: string;
|
|
47
|
-
|
|
48
|
+
isZuplo?: boolean;
|
|
49
|
+
};
|
|
50
|
+
export declare const apiKeyPlugin: ({ deploymentName, isZuplo, ...options }: Omit<ApiKeysOptions, "enabled"> & InternalApiKeyPluginOptions) => ZudokuPlugin & ApiIdentityPlugin & ProfileMenuPlugin;
|
|
51
|
+
export {};
|
|
@@ -20,9 +20,14 @@ const throwIfProblemJson = async (response) => {
|
|
|
20
20
|
}
|
|
21
21
|
}
|
|
22
22
|
};
|
|
23
|
-
const
|
|
23
|
+
const developerHintOptions = {
|
|
24
|
+
developerHint: "This project is not linked to a Zuplo deployment. Run `zuplo link` to get started with API Keys.",
|
|
25
|
+
title: "Not linked to a Zuplo deployment",
|
|
26
|
+
};
|
|
27
|
+
const createZuploService = ({ deploymentName, ...options }) => {
|
|
24
28
|
return {
|
|
25
29
|
deleteKey: async (consumerId, keyId, context) => {
|
|
30
|
+
invariant(deploymentName, "Cannot delete API key.", developerHintOptions);
|
|
26
31
|
const request = new Request(DEFAULT_API_KEY_ENDPOINT +
|
|
27
32
|
`/${deploymentName}/consumers/${consumerId}/keys/${keyId}`, {
|
|
28
33
|
method: "DELETE",
|
|
@@ -32,8 +37,8 @@ const createDefaultHandler = (deploymentName, options) => {
|
|
|
32
37
|
invariant(response.ok, "Failed to delete API key");
|
|
33
38
|
},
|
|
34
39
|
updateConsumer: async (consumer, context) => {
|
|
35
|
-
|
|
36
|
-
|
|
40
|
+
invariant(deploymentName, "Cannot update API key description.", developerHintOptions);
|
|
41
|
+
const response = await fetch(await context.signRequest(new Request(`${DEFAULT_API_KEY_ENDPOINT}/${deploymentName}/consumers/${consumer.id}`, {
|
|
37
42
|
method: "PATCH",
|
|
38
43
|
headers: {
|
|
39
44
|
"Content-Type": "application/json",
|
|
@@ -46,8 +51,8 @@ const createDefaultHandler = (deploymentName, options) => {
|
|
|
46
51
|
invariant(response.ok, "Failed to update API key description");
|
|
47
52
|
},
|
|
48
53
|
rollKey: async (consumerId, context) => {
|
|
49
|
-
|
|
50
|
-
|
|
54
|
+
invariant(deploymentName, "Cannot roll API key.", developerHintOptions);
|
|
55
|
+
const response = await fetch(await context.signRequest(new Request(`${DEFAULT_API_KEY_ENDPOINT}/${deploymentName}/consumers/${consumerId}/roll-key`, {
|
|
51
56
|
method: "POST",
|
|
52
57
|
headers: {
|
|
53
58
|
"Content-Type": "application/json",
|
|
@@ -58,6 +63,7 @@ const createDefaultHandler = (deploymentName, options) => {
|
|
|
58
63
|
invariant(response.ok, "Failed to roll API key");
|
|
59
64
|
},
|
|
60
65
|
getConsumers: async (context) => {
|
|
66
|
+
invariant(deploymentName, "Cannot get API keys.", developerHintOptions);
|
|
61
67
|
const request = new Request(`${DEFAULT_API_KEY_ENDPOINT}/${deploymentName}/consumers`);
|
|
62
68
|
await context.signRequest(request);
|
|
63
69
|
const keys = await fetch(request);
|
|
@@ -78,9 +84,13 @@ const createDefaultHandler = (deploymentName, options) => {
|
|
|
78
84
|
};
|
|
79
85
|
};
|
|
80
86
|
export const createApiKeyService = (service) => service;
|
|
81
|
-
export const apiKeyPlugin = ({ deploymentName, ...options }) => {
|
|
82
|
-
|
|
83
|
-
|
|
87
|
+
export const apiKeyPlugin = ({ deploymentName, isZuplo, ...options }) => {
|
|
88
|
+
if (isZuplo && !deploymentName) {
|
|
89
|
+
// biome-ignore lint/suspicious/noConsole: Important warning
|
|
90
|
+
console.warn("This project is not linked to a Zuplo deployment. Run `zuplo link` to get started.");
|
|
91
|
+
}
|
|
92
|
+
const service = isZuplo
|
|
93
|
+
? createZuploService({ deploymentName, ...options })
|
|
84
94
|
: options;
|
|
85
95
|
if (!service.getConsumers) {
|
|
86
96
|
throw new Error("getConsumers is required when using the apiKeyPlugin");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/lib/plugins/api-keys/index.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAU5C,OAAO,SAAS,MAAM,yBAAyB,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,MAAM,wBAAwB,GAAG,qCAAqC,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/lib/plugins/api-keys/index.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAU5C,OAAO,SAAS,MAAM,yBAAyB,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,MAAM,wBAAwB,GAAG,qCAAqC,CAAC;AAoDvE,MAAM,aAAa,GAAG,KAAK,EAAE,QAAkB,EAAE,EAAE;IACjD,IAAI,CAAC;QACH,OAAO,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;IAC/B,CAAC;IAAC,MAAM,CAAC;QACP,OAAO;IACT,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,kBAAkB,GAAG,KAAK,EAAE,QAAkB,EAAE,EAAE;IACtD,MAAM,WAAW,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IACzD,IAAI,CAAC,QAAQ,CAAC,EAAE,IAAI,WAAW,EAAE,QAAQ,CAAC,0BAA0B,CAAC,EAAE,CAAC;QACtE,MAAM,IAAI,GAAG,MAAM,aAAa,CAAC,QAAQ,CAAC,CAAC;QAC3C,IAAI,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YAC5B,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC;QAC7C,CAAC;IACH,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,oBAAoB,GAAG;IAC3B,aAAa,EACX,kGAAkG;IACpG,KAAK,EAAE,kCAAkC;CAC1C,CAAC;AAEF,MAAM,kBAAkB,GAAG,CAAC,EAC1B,cAAc,EACd,GAAG,OAAO,EACkB,EAAiB,EAAE;IAC/C,OAAO;QACL,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;YAC9C,SAAS,CAAC,cAAc,EAAE,wBAAwB,EAAE,oBAAoB,CAAC,CAAC;YAC1E,MAAM,OAAO,GAAG,IAAI,OAAO,CACzB,wBAAwB;gBACtB,IAAI,cAAc,cAAc,UAAU,SAAS,KAAK,EAAE,EAC5D;gBACE,MAAM,EAAE,QAAQ;aACjB,CACF,CAAC;YACF,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,MAAM,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC;YACjE,MAAM,kBAAkB,CAAC,QAAQ,CAAC,CAAC;YACnC,SAAS,CAAC,QAAQ,CAAC,EAAE,EAAE,0BAA0B,CAAC,CAAC;QACrD,CAAC;QACD,cAAc,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE;YAC1C,SAAS,CACP,cAAc,EACd,oCAAoC,EACpC,oBAAoB,CACrB,CAAC;YACF,MAAM,QAAQ,GAAG,MAAM,KAAK,CAC1B,MAAM,OAAO,CAAC,WAAW,CACvB,IAAI,OAAO,CACT,GAAG,wBAAwB,IAAI,cAAc,cAAc,QAAQ,CAAC,EAAE,EAAE,EACxE;gBACE,MAAM,EAAE,OAAO;gBACf,OAAO,EAAE;oBACP,cAAc,EAAE,kBAAkB;iBACnC;gBACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;oBACnB,KAAK,EAAE,QAAQ,CAAC,KAAK;iBACtB,CAAC;aACH,CACF,CACF,CACF,CAAC;YACF,MAAM,kBAAkB,CAAC,QAAQ,CAAC,CAAC;YACnC,SAAS,CAAC,QAAQ,CAAC,EAAE,EAAE,sCAAsC,CAAC,CAAC;QACjE,CAAC;QACD,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,OAAO,EAAE,EAAE;YACrC,SAAS,CAAC,cAAc,EAAE,sBAAsB,EAAE,oBAAoB,CAAC,CAAC;YACxE,MAAM,QAAQ,GAAG,MAAM,KAAK,CAC1B,MAAM,OAAO,CAAC,WAAW,CACvB,IAAI,OAAO,CACT,GAAG,wBAAwB,IAAI,cAAc,cAAc,UAAU,WAAW,EAChF;gBACE,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE;oBACP,cAAc,EAAE,kBAAkB;iBACnC;gBACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC;aACzB,CACF,CACF,CACF,CAAC;YACF,MAAM,kBAAkB,CAAC,QAAQ,CAAC,CAAC;YACnC,SAAS,CAAC,QAAQ,CAAC,EAAE,EAAE,wBAAwB,CAAC,CAAC;QACnD,CAAC;QACD,YAAY,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;YAC9B,SAAS,CAAC,cAAc,EAAE,sBAAsB,EAAE,oBAAoB,CAAC,CAAC;YACxE,MAAM,OAAO,GAAG,IAAI,OAAO,CACzB,GAAG,wBAAwB,IAAI,cAAc,YAAY,CAC1D,CAAC;YACF,MAAM,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;YAEnC,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,OAAO,CAAC,CAAC;YAClC,MAAM,kBAAkB,CAAC,IAAI,CAAC,CAAC;YAC/B,SAAS,CAAC,IAAI,CAAC,EAAE,EAAE,0BAA0B,CAAC,CAAC;YAE/C,MAAM,IAAI,GAAG,CAAC,MAAM,IAAI,CAAC,IAAI,EAAE,CAc9B,CAAC;YAEF,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;gBAClC,EAAE,EAAE,QAAQ,CAAC,EAAE;gBACf,SAAS,EAAE,QAAQ,CAAC,SAAS;gBAC7B,SAAS,EAAE,QAAQ,CAAC,SAAS;gBAC7B,SAAS,EAAE,QAAQ,CAAC,SAAS;gBAC7B,KAAK,EAAE,QAAQ,CAAC,KAAK,IAAI,QAAQ,CAAC,OAAO,IAAI,SAAS;gBACtD,OAAO,EAAE,QAAQ,CAAC,OAAO,CAAC,IAAI;gBAC9B,GAAG,EAAE,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;aACjC,CAAC,CAAC,CAAC;QACN,CAAC;QACD,GAAG,OAAO;KACX,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAA0B,OAAU,EAAK,EAAE,CAC5E,OAAO,CAAC;AASV,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,EAC3B,cAAc,EACd,OAAO,EACP,GAAG,OAAO,EAEiB,EAET,EAAE;IACpB,IAAI,OAAO,IAAI,CAAC,cAAc,EAAE,CAAC;QAC/B,4DAA4D;QAC5D,OAAO,CAAC,IAAI,CACV,oFAAoF,CACrF,CAAC;IACJ,CAAC;IAED,MAAM,OAAO,GAAG,OAAO;QACrB,CAAC,CAAC,kBAAkB,CAAC,EAAE,cAAc,EAAE,GAAG,OAAO,EAAE,CAAC;QACpD,CAAC,CAAC,OAAO,CAAC;IAEZ,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC;QAC1B,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAC;IAC1E,CAAC;IAED,MAAM,eAAe,GAAkB;QACrC,GAAG,OAAO;QACV,YAAY,EAAE,OAAO,CAAC,YAAY;KACnC,CAAC;IAEF,OAAO;QACL,mBAAmB,EAAE,GAAG,EAAE,CAAC;YACzB;gBACE,KAAK,EAAE,UAAU;gBACjB,IAAI,EAAE,oBAAoB;gBAC1B,QAAQ,EAAE,QAAQ;gBAClB,IAAI,EAAE,YAAY;aACnB;SACF;QAED,aAAa,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;YAC/B,IAAI,CAAC;gBACH,MAAM,SAAS,GAAG,MAAM,eAAe,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;gBAE9D,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;oBAClC,gBAAgB,EAAE,CAAC,OAAO,EAAE,EAAE;wBAC5B,OAAO,CAAC,OAAO,CAAC,GAAG,CACjB,eAAe,EACf,UAAU,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,CACxC,CAAC;wBACF,OAAO,OAAO,CAAC;oBACjB,CAAC;oBACD,EAAE,EAAE,QAAQ,CAAC,EAAE;oBACf,KAAK,EAAE,QAAQ,CAAC,KAAK;iBACtB,CAAC,CAAC,CAAC;YACN,CAAC;YAAC,MAAM,CAAC;gBACP,OAAO,EAAE,CAAC;YACZ,CAAC;QACH,CAAC;QAED,SAAS,EAAE,GAAkB,EAAE;YAC7B,OAAO;gBACL;oBACE,IAAI,EAAE,oBAAoB;oBAC1B,OAAO,EAAE,KAAC,eAAe,IAAC,OAAO,EAAE,eAAe,GAAI;iBACvD;aACF,CAAC;QACJ,CAAC;QAED,kBAAkB,EAAE,GAAG,EAAE;YACvB,OAAO,CAAC,oBAAoB,CAAC,CAAC;QAChC,CAAC;KACF,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -14,6 +14,9 @@ export const ApiKeyList = ({ service }) => {
|
|
|
14
14
|
return await service.getConsumers(context);
|
|
15
15
|
}
|
|
16
16
|
catch (error) {
|
|
17
|
+
if (error instanceof ZudokuError) {
|
|
18
|
+
throw error;
|
|
19
|
+
}
|
|
17
20
|
throw new ZudokuError("Cannot get API keys", {
|
|
18
21
|
cause: error,
|
|
19
22
|
title: "Error getting API keys",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ApiKeyList.js","sourceRoot":"","sources":["../../../../../src/lib/plugins/api-keys/settings/ApiKeyList.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACjC,OAAO,EAAE,SAAS,EAAE,MAAM,8CAA8C,CAAC;AACzE,OAAO,EAAE,EAAE,EAAE,MAAM,qBAAqB,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAE9D,OAAO,UAAU,MAAM,iBAAiB,CAAC;AAEzC,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,EAAE,OAAO,EAA8B,EAAE,EAAE;IACpE,MAAM,OAAO,GAAG,SAAS,EAAE,CAAC;IAE5B,MAAM,EAAE,IAAI,EAAE,GAAG,gBAAgB,CAAC;QAChC,OAAO,EAAE,KAAK,IAAI,EAAE;YAClB,IAAI,CAAC;gBACH,OAAO,MAAM,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;YAC7C,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,IAAI,WAAW,CAAC,qBAAqB,EAAE;oBAC3C,KAAK,EAAE,KAAK;oBACZ,KAAK,EAAE,wBAAwB;oBAC/B,aAAa,EACX,6DAA6D;iBAChE,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QACD,QAAQ,EAAE,CAAC,UAAU,CAAC;QACtB,KAAK,EAAE,KAAK;KACb,CAAC,CAAC;IAEH,MAAM,CAAC,kBAAkB,EAAE,qBAAqB,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAEpE,OAAO,CACL,cAAK,SAAS,EAAC,MAAM,YAClB,IAAI,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,CACnB,eAAK,SAAS,EAAC,uHAAuH,aACpI,aAAG,SAAS,EAAC,aAAa,0CAExB,cAAM,EACL,OAAO,CAAC,SAAS,IAAI,wCAAwC,IAC5D,EACH,OAAO,CAAC,SAAS,IAAI,CACpB,KAAC,kBAAkB,IACjB,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,kBAAkB,EAC1B,YAAY,EAAE,qBAAqB,GACnC,CACH,IACG,CACP,CAAC,CAAC,CAAC,CACF,aAAI,SAAS,EAAE,EAAE,CAAC,6CAA6C,CAAC,YAC7D,IAAI,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CACtB,KAAC,UAAU,IAET,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,OAAO,CAAC,cAAc,EAChC,SAAS,EAAE,OAAO,CAAC,OAAO,EAC1B,WAAW,EAAE,OAAO,CAAC,SAAS,IAJzB,QAAQ,CAAC,EAAE,CAKhB,CACH,CAAC,GACC,CACN,GACG,CACP,CAAC;AACJ,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"ApiKeyList.js","sourceRoot":"","sources":["../../../../../src/lib/plugins/api-keys/settings/ApiKeyList.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACjC,OAAO,EAAE,SAAS,EAAE,MAAM,8CAA8C,CAAC;AACzE,OAAO,EAAE,EAAE,EAAE,MAAM,qBAAqB,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAE9D,OAAO,UAAU,MAAM,iBAAiB,CAAC;AAEzC,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,EAAE,OAAO,EAA8B,EAAE,EAAE;IACpE,MAAM,OAAO,GAAG,SAAS,EAAE,CAAC;IAE5B,MAAM,EAAE,IAAI,EAAE,GAAG,gBAAgB,CAAC;QAChC,OAAO,EAAE,KAAK,IAAI,EAAE;YAClB,IAAI,CAAC;gBACH,OAAO,MAAM,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;YAC7C,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,IAAI,KAAK,YAAY,WAAW,EAAE,CAAC;oBACjC,MAAM,KAAK,CAAC;gBACd,CAAC;gBACD,MAAM,IAAI,WAAW,CAAC,qBAAqB,EAAE;oBAC3C,KAAK,EAAE,KAAK;oBACZ,KAAK,EAAE,wBAAwB;oBAC/B,aAAa,EACX,6DAA6D;iBAChE,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QACD,QAAQ,EAAE,CAAC,UAAU,CAAC;QACtB,KAAK,EAAE,KAAK;KACb,CAAC,CAAC;IAEH,MAAM,CAAC,kBAAkB,EAAE,qBAAqB,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAEpE,OAAO,CACL,cAAK,SAAS,EAAC,MAAM,YAClB,IAAI,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,CACnB,eAAK,SAAS,EAAC,uHAAuH,aACpI,aAAG,SAAS,EAAC,aAAa,0CAExB,cAAM,EACL,OAAO,CAAC,SAAS,IAAI,wCAAwC,IAC5D,EACH,OAAO,CAAC,SAAS,IAAI,CACpB,KAAC,kBAAkB,IACjB,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,kBAAkB,EAC1B,YAAY,EAAE,qBAAqB,GACnC,CACH,IACG,CACP,CAAC,CAAC,CAAC,CACF,aAAI,SAAS,EAAE,EAAE,CAAC,6CAA6C,CAAC,YAC7D,IAAI,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CACtB,KAAC,UAAU,IAET,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,OAAO,CAAC,cAAc,EAChC,SAAS,EAAE,OAAO,CAAC,OAAO,EAC1B,WAAW,EAAE,OAAO,CAAC,SAAS,IAJzB,QAAQ,CAAC,EAAE,CAKhB,CACH,CAAC,GACC,CACN,GACG,CACP,CAAC;AACJ,CAAC,CAAC"}
|