From 4765cee05dc448da0e5697ffdea3b189afa890e1 Mon Sep 17 00:00:00 2001 From: Agnieszka Gancarczyk Date: Mon, 28 Aug 2023 12:01:44 +0100 Subject: [PATCH 1/4] backporting issue-22570 --- ....timestamp-1692706113964-2fef89a421da7.mjs | 36 +++++++++++++++++++ package-lock.json | 6 ++++ 2 files changed, 42 insertions(+) create mode 100644 js/libs/keycloak-masthead/vite.config.ts.timestamp-1692706113964-2fef89a421da7.mjs create mode 100644 package-lock.json diff --git a/js/libs/keycloak-masthead/vite.config.ts.timestamp-1692706113964-2fef89a421da7.mjs b/js/libs/keycloak-masthead/vite.config.ts.timestamp-1692706113964-2fef89a421da7.mjs new file mode 100644 index 000000000000..77a236e94287 --- /dev/null +++ b/js/libs/keycloak-masthead/vite.config.ts.timestamp-1692706113964-2fef89a421da7.mjs @@ -0,0 +1,36 @@ +// vite.config.ts +import react from "file:///Users/agnieszkagancarczyk/redhat/projects/my/keycloak/js/node_modules/.pnpm/@vitejs+plugin-react-swc@3.3.2_vite@4.4.7/node_modules/@vitejs/plugin-react-swc/index.mjs"; +import path from "node:path"; +import peerDepsExternal from "file:///Users/agnieszkagancarczyk/redhat/projects/my/keycloak/js/node_modules/.pnpm/rollup-plugin-peer-deps-external@2.2.4_rollup@3.26.3/node_modules/rollup-plugin-peer-deps-external/dist/rollup-plugin-peer-deps-external.js"; +import { defineConfig } from "file:///Users/agnieszkagancarczyk/redhat/projects/my/keycloak/js/node_modules/.pnpm/vite@4.4.7_@types+node@20.4.5/node_modules/vite/dist/node/index.js"; +import { checker } from "file:///Users/agnieszkagancarczyk/redhat/projects/my/keycloak/js/node_modules/.pnpm/vite-plugin-checker@0.6.1_eslint@8.45.0_typescript@5.1.6_vite@4.4.7/node_modules/vite-plugin-checker/dist/esm/main.js"; +import dts from "file:///Users/agnieszkagancarczyk/redhat/projects/my/keycloak/js/node_modules/.pnpm/vite-plugin-dts@3.3.1_@types+node@20.4.5_rollup@3.26.3_typescript@5.1.6_vite@4.4.7/node_modules/vite-plugin-dts/dist/index.mjs"; +var __vite_injected_original_dirname = "/Users/agnieszkagancarczyk/redhat/projects/my/keycloak/js/libs/keycloak-masthead"; +var vite_config_default = defineConfig({ + resolve: { + mainFields: ["module"] + }, + build: { + target: "ES2022", + lib: { + entry: path.resolve(__vite_injected_original_dirname, "src/main.ts"), + formats: ["es"] + }, + rollupOptions: { + plugins: [ + peerDepsExternal({ + includeDependencies: true + }) + ] + } + }, + plugins: [ + react(), + checker({ typescript: true }), + dts({ insertTypesEntry: true }) + ] +}); +export { + vite_config_default as default +}; +//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsidml0ZS5jb25maWcudHMiXSwKICAic291cmNlc0NvbnRlbnQiOiBbImNvbnN0IF9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9kaXJuYW1lID0gXCIvVXNlcnMvYWduaWVzemthZ2FuY2FyY3p5ay9yZWRoYXQvcHJvamVjdHMvbXkva2V5Y2xvYWsvanMvbGlicy9rZXljbG9hay1tYXN0aGVhZFwiO2NvbnN0IF9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9maWxlbmFtZSA9IFwiL1VzZXJzL2Fnbmllc3prYWdhbmNhcmN6eWsvcmVkaGF0L3Byb2plY3RzL215L2tleWNsb2FrL2pzL2xpYnMva2V5Y2xvYWstbWFzdGhlYWQvdml0ZS5jb25maWcudHNcIjtjb25zdCBfX3ZpdGVfaW5qZWN0ZWRfb3JpZ2luYWxfaW1wb3J0X21ldGFfdXJsID0gXCJmaWxlOi8vL1VzZXJzL2Fnbmllc3prYWdhbmNhcmN6eWsvcmVkaGF0L3Byb2plY3RzL215L2tleWNsb2FrL2pzL2xpYnMva2V5Y2xvYWstbWFzdGhlYWQvdml0ZS5jb25maWcudHNcIjtpbXBvcnQgcmVhY3QgZnJvbSBcIkB2aXRlanMvcGx1Z2luLXJlYWN0LXN3Y1wiO1xuaW1wb3J0IHBhdGggZnJvbSBcIm5vZGU6cGF0aFwiO1xuaW1wb3J0IHBlZXJEZXBzRXh0ZXJuYWwgZnJvbSBcInJvbGx1cC1wbHVnaW4tcGVlci1kZXBzLWV4dGVybmFsXCI7XG5pbXBvcnQgeyBkZWZpbmVDb25maWcgfSBmcm9tIFwidml0ZVwiO1xuaW1wb3J0IHsgY2hlY2tlciB9IGZyb20gXCJ2aXRlLXBsdWdpbi1jaGVja2VyXCI7XG5pbXBvcnQgZHRzIGZyb20gXCJ2aXRlLXBsdWdpbi1kdHNcIjtcblxuLy8gaHR0cHM6Ly92aXRlanMuZGV2L2NvbmZpZy9cbmV4cG9ydCBkZWZhdWx0IGRlZmluZUNvbmZpZyh7XG4gIHJlc29sdmU6IHtcbiAgICBtYWluRmllbGRzOiBbXCJtb2R1bGVcIl0sXG4gIH0sXG4gIGJ1aWxkOiB7XG4gICAgdGFyZ2V0OiBcIkVTMjAyMlwiLFxuICAgIGxpYjoge1xuICAgICAgZW50cnk6IHBhdGgucmVzb2x2ZShfX2Rpcm5hbWUsIFwic3JjL21haW4udHNcIiksXG4gICAgICBmb3JtYXRzOiBbXCJlc1wiXSxcbiAgICB9LFxuICAgIHJvbGx1cE9wdGlvbnM6IHtcbiAgICAgIHBsdWdpbnM6IFtcbiAgICAgICAgcGVlckRlcHNFeHRlcm5hbCh7XG4gICAgICAgICAgaW5jbHVkZURlcGVuZGVuY2llczogdHJ1ZSxcbiAgICAgICAgfSksXG4gICAgICBdLFxuICAgIH0sXG4gIH0sXG4gIHBsdWdpbnM6IFtcbiAgICByZWFjdCgpLFxuICAgIGNoZWNrZXIoeyB0eXBlc2NyaXB0OiB0cnVlIH0pLFxuICAgIGR0cyh7IGluc2VydFR5cGVzRW50cnk6IHRydWUgfSksXG4gIF0sXG59KTtcbiJdLAogICJtYXBwaW5ncyI6ICI7QUFBa2EsT0FBTyxXQUFXO0FBQ3BiLE9BQU8sVUFBVTtBQUNqQixPQUFPLHNCQUFzQjtBQUM3QixTQUFTLG9CQUFvQjtBQUM3QixTQUFTLGVBQWU7QUFDeEIsT0FBTyxTQUFTO0FBTGhCLElBQU0sbUNBQW1DO0FBUXpDLElBQU8sc0JBQVEsYUFBYTtBQUFBLEVBQzFCLFNBQVM7QUFBQSxJQUNQLFlBQVksQ0FBQyxRQUFRO0FBQUEsRUFDdkI7QUFBQSxFQUNBLE9BQU87QUFBQSxJQUNMLFFBQVE7QUFBQSxJQUNSLEtBQUs7QUFBQSxNQUNILE9BQU8sS0FBSyxRQUFRLGtDQUFXLGFBQWE7QUFBQSxNQUM1QyxTQUFTLENBQUMsSUFBSTtBQUFBLElBQ2hCO0FBQUEsSUFDQSxlQUFlO0FBQUEsTUFDYixTQUFTO0FBQUEsUUFDUCxpQkFBaUI7QUFBQSxVQUNmLHFCQUFxQjtBQUFBLFFBQ3ZCLENBQUM7QUFBQSxNQUNIO0FBQUEsSUFDRjtBQUFBLEVBQ0Y7QUFBQSxFQUNBLFNBQVM7QUFBQSxJQUNQLE1BQU07QUFBQSxJQUNOLFFBQVEsRUFBRSxZQUFZLEtBQUssQ0FBQztBQUFBLElBQzVCLElBQUksRUFBRSxrQkFBa0IsS0FBSyxDQUFDO0FBQUEsRUFDaEM7QUFDRixDQUFDOyIsCiAgIm5hbWVzIjogW10KfQo= diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 000000000000..8cc8817c1e60 --- /dev/null +++ b/package-lock.json @@ -0,0 +1,6 @@ +{ + "name": "keycloak", + "lockfileVersion": 2, + "requires": true, + "packages": {} +} From ba0084cfbb3a2ac1d3725575b78b4039a05b503e Mon Sep 17 00:00:00 2001 From: agagancarczyk <4890675+agagancarczyk@users.noreply.github.com> Date: Fri, 25 Aug 2023 09:34:31 +0100 Subject: [PATCH 2/4] fixed removing attributes (#22693) Co-authored-by: Agnieszka Gancarczyk --- js/apps/admin-ui/src/user/EditUser.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/apps/admin-ui/src/user/EditUser.tsx b/js/apps/admin-ui/src/user/EditUser.tsx index 4a211ea6312d..e0edfd30e936 100644 --- a/js/apps/admin-ui/src/user/EditUser.tsx +++ b/js/apps/admin-ui/src/user/EditUser.tsx @@ -152,7 +152,7 @@ const EditUserForm = ({ user, bruteForced, refresh }: EditUserFormProps) => { const attributes = "key" in (formUser.attributes?.[0] || []) ? keyValueToArray(formUser.attributes as KeyValueType[]) - : user.attributes; + : []; try { await adminClient.users.update( { id: user.id! }, From 85bea0f8eec615fc2ef598f717726aa3f74a7e85 Mon Sep 17 00:00:00 2001 From: agagancarczyk <4890675+agagancarczyk@users.noreply.github.com> Date: Fri, 25 Aug 2023 09:34:31 +0100 Subject: [PATCH 3/4] backporting #22570 From 7a8ff131d99144350926b04896d522ca77afeae8 Mon Sep 17 00:00:00 2001 From: Agnieszka Gancarczyk Date: Mon, 28 Aug 2023 14:31:40 +0100 Subject: [PATCH 4/4] removed unwanted files from PR --- ....timestamp-1692706113964-2fef89a421da7.mjs | 36 ------------------- package-lock.json | 6 ---- 2 files changed, 42 deletions(-) delete mode 100644 js/libs/keycloak-masthead/vite.config.ts.timestamp-1692706113964-2fef89a421da7.mjs delete mode 100644 package-lock.json diff --git a/js/libs/keycloak-masthead/vite.config.ts.timestamp-1692706113964-2fef89a421da7.mjs b/js/libs/keycloak-masthead/vite.config.ts.timestamp-1692706113964-2fef89a421da7.mjs deleted file mode 100644 index 77a236e94287..000000000000 --- a/js/libs/keycloak-masthead/vite.config.ts.timestamp-1692706113964-2fef89a421da7.mjs +++ /dev/null @@ -1,36 +0,0 @@ -// vite.config.ts -import react from "file:///Users/agnieszkagancarczyk/redhat/projects/my/keycloak/js/node_modules/.pnpm/@vitejs+plugin-react-swc@3.3.2_vite@4.4.7/node_modules/@vitejs/plugin-react-swc/index.mjs"; -import path from "node:path"; -import peerDepsExternal from "file:///Users/agnieszkagancarczyk/redhat/projects/my/keycloak/js/node_modules/.pnpm/rollup-plugin-peer-deps-external@2.2.4_rollup@3.26.3/node_modules/rollup-plugin-peer-deps-external/dist/rollup-plugin-peer-deps-external.js"; -import { defineConfig } from "file:///Users/agnieszkagancarczyk/redhat/projects/my/keycloak/js/node_modules/.pnpm/vite@4.4.7_@types+node@20.4.5/node_modules/vite/dist/node/index.js"; -import { checker } from "file:///Users/agnieszkagancarczyk/redhat/projects/my/keycloak/js/node_modules/.pnpm/vite-plugin-checker@0.6.1_eslint@8.45.0_typescript@5.1.6_vite@4.4.7/node_modules/vite-plugin-checker/dist/esm/main.js"; -import dts from "file:///Users/agnieszkagancarczyk/redhat/projects/my/keycloak/js/node_modules/.pnpm/vite-plugin-dts@3.3.1_@types+node@20.4.5_rollup@3.26.3_typescript@5.1.6_vite@4.4.7/node_modules/vite-plugin-dts/dist/index.mjs"; -var __vite_injected_original_dirname = "/Users/agnieszkagancarczyk/redhat/projects/my/keycloak/js/libs/keycloak-masthead"; -var vite_config_default = defineConfig({ - resolve: { - mainFields: ["module"] - }, - build: { - target: "ES2022", - lib: { - entry: path.resolve(__vite_injected_original_dirname, "src/main.ts"), - formats: ["es"] - }, - rollupOptions: { - plugins: [ - peerDepsExternal({ - includeDependencies: true - }) - ] - } - }, - plugins: [ - react(), - checker({ typescript: true }), - dts({ insertTypesEntry: true }) - ] -}); -export { - vite_config_default as default -}; -//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsidml0ZS5jb25maWcudHMiXSwKICAic291cmNlc0NvbnRlbnQiOiBbImNvbnN0IF9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9kaXJuYW1lID0gXCIvVXNlcnMvYWduaWVzemthZ2FuY2FyY3p5ay9yZWRoYXQvcHJvamVjdHMvbXkva2V5Y2xvYWsvanMvbGlicy9rZXljbG9hay1tYXN0aGVhZFwiO2NvbnN0IF9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9maWxlbmFtZSA9IFwiL1VzZXJzL2Fnbmllc3prYWdhbmNhcmN6eWsvcmVkaGF0L3Byb2plY3RzL215L2tleWNsb2FrL2pzL2xpYnMva2V5Y2xvYWstbWFzdGhlYWQvdml0ZS5jb25maWcudHNcIjtjb25zdCBfX3ZpdGVfaW5qZWN0ZWRfb3JpZ2luYWxfaW1wb3J0X21ldGFfdXJsID0gXCJmaWxlOi8vL1VzZXJzL2Fnbmllc3prYWdhbmNhcmN6eWsvcmVkaGF0L3Byb2plY3RzL215L2tleWNsb2FrL2pzL2xpYnMva2V5Y2xvYWstbWFzdGhlYWQvdml0ZS5jb25maWcudHNcIjtpbXBvcnQgcmVhY3QgZnJvbSBcIkB2aXRlanMvcGx1Z2luLXJlYWN0LXN3Y1wiO1xuaW1wb3J0IHBhdGggZnJvbSBcIm5vZGU6cGF0aFwiO1xuaW1wb3J0IHBlZXJEZXBzRXh0ZXJuYWwgZnJvbSBcInJvbGx1cC1wbHVnaW4tcGVlci1kZXBzLWV4dGVybmFsXCI7XG5pbXBvcnQgeyBkZWZpbmVDb25maWcgfSBmcm9tIFwidml0ZVwiO1xuaW1wb3J0IHsgY2hlY2tlciB9IGZyb20gXCJ2aXRlLXBsdWdpbi1jaGVja2VyXCI7XG5pbXBvcnQgZHRzIGZyb20gXCJ2aXRlLXBsdWdpbi1kdHNcIjtcblxuLy8gaHR0cHM6Ly92aXRlanMuZGV2L2NvbmZpZy9cbmV4cG9ydCBkZWZhdWx0IGRlZmluZUNvbmZpZyh7XG4gIHJlc29sdmU6IHtcbiAgICBtYWluRmllbGRzOiBbXCJtb2R1bGVcIl0sXG4gIH0sXG4gIGJ1aWxkOiB7XG4gICAgdGFyZ2V0OiBcIkVTMjAyMlwiLFxuICAgIGxpYjoge1xuICAgICAgZW50cnk6IHBhdGgucmVzb2x2ZShfX2Rpcm5hbWUsIFwic3JjL21haW4udHNcIiksXG4gICAgICBmb3JtYXRzOiBbXCJlc1wiXSxcbiAgICB9LFxuICAgIHJvbGx1cE9wdGlvbnM6IHtcbiAgICAgIHBsdWdpbnM6IFtcbiAgICAgICAgcGVlckRlcHNFeHRlcm5hbCh7XG4gICAgICAgICAgaW5jbHVkZURlcGVuZGVuY2llczogdHJ1ZSxcbiAgICAgICAgfSksXG4gICAgICBdLFxuICAgIH0sXG4gIH0sXG4gIHBsdWdpbnM6IFtcbiAgICByZWFjdCgpLFxuICAgIGNoZWNrZXIoeyB0eXBlc2NyaXB0OiB0cnVlIH0pLFxuICAgIGR0cyh7IGluc2VydFR5cGVzRW50cnk6IHRydWUgfSksXG4gIF0sXG59KTtcbiJdLAogICJtYXBwaW5ncyI6ICI7QUFBa2EsT0FBTyxXQUFXO0FBQ3BiLE9BQU8sVUFBVTtBQUNqQixPQUFPLHNCQUFzQjtBQUM3QixTQUFTLG9CQUFvQjtBQUM3QixTQUFTLGVBQWU7QUFDeEIsT0FBTyxTQUFTO0FBTGhCLElBQU0sbUNBQW1DO0FBUXpDLElBQU8sc0JBQVEsYUFBYTtBQUFBLEVBQzFCLFNBQVM7QUFBQSxJQUNQLFlBQVksQ0FBQyxRQUFRO0FBQUEsRUFDdkI7QUFBQSxFQUNBLE9BQU87QUFBQSxJQUNMLFFBQVE7QUFBQSxJQUNSLEtBQUs7QUFBQSxNQUNILE9BQU8sS0FBSyxRQUFRLGtDQUFXLGFBQWE7QUFBQSxNQUM1QyxTQUFTLENBQUMsSUFBSTtBQUFBLElBQ2hCO0FBQUEsSUFDQSxlQUFlO0FBQUEsTUFDYixTQUFTO0FBQUEsUUFDUCxpQkFBaUI7QUFBQSxVQUNmLHFCQUFxQjtBQUFBLFFBQ3ZCLENBQUM7QUFBQSxNQUNIO0FBQUEsSUFDRjtBQUFBLEVBQ0Y7QUFBQSxFQUNBLFNBQVM7QUFBQSxJQUNQLE1BQU07QUFBQSxJQUNOLFFBQVEsRUFBRSxZQUFZLEtBQUssQ0FBQztBQUFBLElBQzVCLElBQUksRUFBRSxrQkFBa0IsS0FBSyxDQUFDO0FBQUEsRUFDaEM7QUFDRixDQUFDOyIsCiAgIm5hbWVzIjogW10KfQo= diff --git a/package-lock.json b/package-lock.json deleted file mode 100644 index 8cc8817c1e60..000000000000 --- a/package-lock.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name": "keycloak", - "lockfileVersion": 2, - "requires": true, - "packages": {} -}