@team-codeme/crud-forge 0.0.0-stage → 1.0.1
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/.cursor/agents/generator-engineer.md +31 -0
- package/.cursor/agents/keycloak-engineer.md +33 -0
- package/.cursor/agents/qa-engineer.md +32 -0
- package/.cursor/agents/security-reviewer.md +30 -0
- package/.cursor/mcp.json +13 -0
- package/.cursor/rules/crudforge-precautions.mdc +16 -0
- package/.cursor/rules/playwright-browser.mdc +30 -0
- package/.cursor/rules/readme-todo-sync.mdc +13 -0
- package/.env.qa.example +19 -0
- package/.github/workflows/qa-live.yml +32 -0
- package/.github/workflows/qa.yml +27 -0
- package/.vscode/settings.json +32 -0
- package/QA/IAM-PLAN.md +25 -0
- package/QA/IAM-RESULTS.md +39 -0
- package/QA/IAM-TESTCASES.md +36 -0
- package/QA/IAM-TODO.md +7 -0
- package/QA/KEYCLOAK-BOOTSTRAP.md +105 -0
- package/QA/PLAN.md +43 -0
- package/QA/RESULTS.md +59 -0
- package/QA/TESTCASES.md +65 -0
- package/QA/TODO.md +14 -0
- package/QA/pmb-dev/README.md +49 -0
- package/QA/pmb-dev/config/config.yml +152 -0
- package/QA/pmb-dev/gdl/i.gdl +17 -0
- package/README.md +851 -2
- package/Todo.md +207 -0
- package/assets/branding/crudforge-logo.png +0 -0
- package/assets/branding/crudforge-mark.png +0 -0
- package/branding/poster-crudforge.jpg +0 -0
- package/chat/last-chat/Investigating Mock Data Configuration.md +428 -0
- package/cli.js +167 -0
- package/config/default-config.yml +245 -0
- package/docs/performance/README.md +217 -0
- package/docs/performance/after.json +111 -0
- package/docs/performance/before.json +111 -0
- package/docs/quality/README.md +276 -0
- package/e2e/crudforge.e2e.yml +47 -0
- package/e2e/crudforge.field-profile.yml +33 -0
- package/e2e/crudforge.iam-live.yml +124 -0
- package/e2e/crudforge.iam.yml +62 -0
- package/e2e/tests/field-profile.spec.js +152 -0
- package/e2e/tests/generated-crud.spec.js +251 -0
- package/e2e/tests/iam-live.spec.js +149 -0
- package/e2e/tests/iam-pack.spec.js +151 -0
- package/e2e/tests/list-state.spec.js +73 -0
- package/features.csv +27 -0
- package/fuse-starter-pack/branding/crudforge-mark-source.jpg +0 -0
- package/fuse-starter-pack/branding/crudforge-mark-source.png +0 -0
- package/fuse-starter-pack/branding/crudforge-mark.png +0 -0
- package/fuse-starter-pack/branding/crudforge-wordmark-source.jpg +0 -0
- package/fuse-starter-pack/branding/crudforge-wordmark-source.png +0 -0
- package/fuse-starter-pack/branding/crudforge-wordmark.png +0 -0
- package/fuse-starter-pack/fuse-v21.1/Dockerfile +14 -0
- package/fuse-starter-pack/fuse-v21.1/LICENSE.md +6 -0
- package/fuse-starter-pack/fuse-v21.1/README.md +59 -0
- package/fuse-starter-pack/fuse-v21.1/angular.json +113 -0
- package/fuse-starter-pack/fuse-v21.1/eslint.config.ts +150 -0
- package/fuse-starter-pack/fuse-v21.1/nginx.conf +23 -0
- package/fuse-starter-pack/fuse-v21.1/nginx.dev.conf +18 -0
- package/fuse-starter-pack/fuse-v21.1/package-lock.json +11513 -0
- package/fuse-starter-pack/fuse-v21.1/package.json +69 -0
- package/fuse-starter-pack/fuse-v21.1/postcss.config.json +5 -0
- package/fuse-starter-pack/fuse-v21.1/prettier.config.ts +15 -0
- package/fuse-starter-pack/fuse-v21.1/proxy.conf.json +8 -0
- package/fuse-starter-pack/fuse-v21.1/proxy.dev.conf.json +8 -0
- package/fuse-starter-pack/fuse-v21.1/public/favicon.png +0 -0
- package/fuse-starter-pack/fuse-v21.1/public/fonts/geist/Geist-Italic.woff2 +0 -0
- package/fuse-starter-pack/fuse-v21.1/public/fonts/geist/Geist.woff2 +0 -0
- package/fuse-starter-pack/fuse-v21.1/public/fonts/geist/GeistMono-Italic.woff2 +0 -0
- package/fuse-starter-pack/fuse-v21.1/public/fonts/geist/GeistMono.woff2 +0 -0
- package/fuse-starter-pack/fuse-v21.1/public/i18n/en.json +8 -0
- package/fuse-starter-pack/fuse-v21.1/public/i18n/es.json +8 -0
- package/fuse-starter-pack/fuse-v21.1/public/images/flags/ES.svg +79 -0
- package/fuse-starter-pack/fuse-v21.1/public/images/flags/US.svg +14 -0
- package/fuse-starter-pack/fuse-v21.1/public/images/flags/where-to-find-other-flags.txt +5 -0
- package/fuse-starter-pack/fuse-v21.1/public/images/logo/logo-mark.png +0 -0
- package/fuse-starter-pack/fuse-v21.1/public/images/logo/logo.png +0 -0
- package/fuse-starter-pack/fuse-v21.1/push.sh +27 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/app.config.server.ts +10 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/app.config.ts +64 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/app.routes.server.ts +8 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/app.routes.ts +39 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/app.ts +22 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/core/icons/index.ts +1 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/core/icons/lucide.ts +1 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/core/icons/provider.ts +23 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/core/local-storage/index.ts +2 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/core/local-storage/local-storage.ts +109 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/core/local-storage/provider.ts +15 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/core/media/index.ts +2 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/core/media/media.ts +64 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/core/media/provider.ts +15 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/core/theming/index.ts +3 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/core/theming/models/theming.ts +13 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/core/theming/palette.ts +209 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/core/theming/provider.ts +24 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/core/theming/theming.ts +129 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/core/transloco/transloco-http-loader.ts +12 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/domains/admin/layout/data/navigation.ts +176 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/domains/admin/layout/layout.ts +77 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/domains/admin/layout/ui/language-switcher.ts +91 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/domains/admin/layout/ui/navigation.ts +238 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/domains/admin/layout/ui/notifications.ts +252 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/domains/admin/layout/ui/scheme-switcher.ts +58 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/domains/admin/layout/ui/sidebar.ts +31 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/domains/admin/layout/ui/user.ts +132 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/domains/admin/modules/apps/academy/data/academy.ts +753 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/domains/admin/modules/apps/academy/data/model.ts +27 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/domains/admin/modules/apps/academy/features/course.ts +318 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/domains/admin/modules/apps/academy/features/courses.ts +228 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/domains/admin/modules/apps/academy/routes.ts +14 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/domains/admin/modules/apps/contacts/data/contacts.ts +4372 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/domains/admin/modules/apps/contacts/data/model.ts +34 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/domains/admin/modules/apps/contacts/features/contact.ts +239 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/domains/admin/modules/apps/contacts/features/contacts.ts +185 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/domains/admin/modules/apps/contacts/routes.ts +16 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/domains/admin/modules/apps/file-manager/data/file-manager.ts +261 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/domains/admin/modules/apps/file-manager/data/model.ts +12 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/domains/admin/modules/apps/file-manager/features/file-manager.ts +131 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/domains/admin/modules/apps/file-manager/routes.ts +15 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/domains/admin/modules/apps/file-manager/ui/list.ts +164 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/domains/admin/modules/apps/help-center/features/faq.ts +288 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/domains/admin/modules/apps/help-center/features/guide.ts +134 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/domains/admin/modules/apps/help-center/features/home.ts +219 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/domains/admin/modules/apps/help-center/features/support.ts +161 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/domains/admin/modules/apps/help-center/routes.ts +33 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/domains/admin/modules/apps/notes/data/model.ts +18 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/domains/admin/modules/apps/notes/data/notes.ts +324 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/domains/admin/modules/apps/notes/features/note.ts +152 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/domains/admin/modules/apps/notes/features/notes.ts +118 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/domains/admin/modules/apps/notes/routes.ts +16 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/domains/admin/modules/apps/tasks/data/model.ts +17 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/domains/admin/modules/apps/tasks/data/tasks.ts +562 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/domains/admin/modules/apps/tasks/features/task.ts +195 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/domains/admin/modules/apps/tasks/features/tasks.ts +271 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/domains/admin/modules/apps/tasks/routes.ts +16 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/domains/admin/modules/dashboards/data/analytics.ts +1620 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/domains/admin/modules/dashboards/data/finance.ts +1065 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/domains/admin/modules/dashboards/data/project.ts +376 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/domains/admin/modules/dashboards/features/analytics/analytics.ts +1096 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/domains/admin/modules/dashboards/features/finance/finance.ts +658 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/domains/admin/modules/dashboards/features/project/budget-table.ts +188 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/domains/admin/modules/dashboards/features/project/project.ts +565 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/domains/admin/modules/dashboards/routes.ts +23 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/domains/admin/modules/documentation/features/changelog/changelog.ts +932 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/domains/admin/modules/documentation/features/getting-started/building.ts +33 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/domains/admin/modules/documentation/features/getting-started/development.ts +42 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/domains/admin/modules/documentation/features/getting-started/installation.ts +47 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/domains/admin/modules/documentation/layout.ts +9 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/domains/admin/modules/documentation/routes.ts +45 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/domains/admin/modules/extras/error/features/error-page.ts +70 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/domains/admin/modules/extras/error/routes.ts +21 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/domains/admin/modules/extras/notifications/features/notifications.ts +262 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/domains/admin/modules/extras/notifications/routes.ts +10 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/domains/admin/modules/extras/settings/features/account.ts +238 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/domains/admin/modules/extras/settings/features/notifications.ts +134 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/domains/admin/modules/extras/settings/features/plan-and-billing.ts +238 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/domains/admin/modules/extras/settings/features/security.ts +211 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/domains/admin/modules/extras/settings/features/team.ts +188 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/domains/admin/modules/extras/settings/layout.ts +109 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/domains/admin/modules/extras/settings/routes.ts +37 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/domains/admin/modules/extras/welcome/welcome.component.ts +22 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/domains/admin/routes.ts +95 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/domains/auth/features/forgot-password/forgot-password.html +54 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/domains/auth/features/forgot-password/forgot-password.ts +51 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/domains/auth/features/reset-password/reset-password.html +82 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/domains/auth/features/reset-password/reset-password.ts +69 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/domains/auth/features/sign-in/sign-in.html +132 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/domains/auth/features/sign-in/sign-in.ts +54 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/domains/auth/features/sign-up/sign-up.html +183 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/domains/auth/features/sign-up/sign-up.ts +56 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/domains/auth/layout.ts +9 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/domains/auth/routes.ts +34 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/domains/coming-soon/features/coming-soon.ts +156 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/domains/coming-soon/layout.ts +9 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/domains/coming-soon/routes.ts +16 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/domains/website/layout/layout.ts +9 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/domains/website/modules/home/features/home.ts +23 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/domains/website/modules/home/routes.ts +10 -0
- package/fuse-starter-pack/fuse-v21.1/src/app/domains/website/routes.ts +30 -0
- package/fuse-starter-pack/fuse-v21.1/src/environments/environment.mock.ts +5 -0
- package/fuse-starter-pack/fuse-v21.1/src/environments/environment.prod.ts +5 -0
- package/fuse-starter-pack/fuse-v21.1/src/environments/environment.ts +5 -0
- package/fuse-starter-pack/fuse-v21.1/src/index.html +66 -0
- package/fuse-starter-pack/fuse-v21.1/src/main.server.ts +11 -0
- package/fuse-starter-pack/fuse-v21.1/src/main.ts +5 -0
- package/fuse-starter-pack/fuse-v21.1/src/server.ts +70 -0
- package/fuse-starter-pack/fuse-v21.1/src/styles/base/base.css +63 -0
- package/fuse-starter-pack/fuse-v21.1/src/styles/base/typography.css +54 -0
- package/fuse-starter-pack/fuse-v21.1/src/styles/components/a.css +18 -0
- package/fuse-starter-pack/fuse-v21.1/src/styles/components/input.css +22 -0
- package/fuse-starter-pack/fuse-v21.1/src/styles/components/kbd.css +55 -0
- package/fuse-starter-pack/fuse-v21.1/src/styles/components/material.css +1149 -0
- package/fuse-starter-pack/fuse-v21.1/src/styles/styles.css +31 -0
- package/fuse-starter-pack/fuse-v21.1/src/styles/tailwind/theme.css +147 -0
- package/fuse-starter-pack/fuse-v21.1/src/styles/tailwind/utilities.css +563 -0
- package/fuse-starter-pack/fuse-v21.1/src/styles/tailwind/variants.css +4 -0
- package/fuse-starter-pack/fuse-v21.1/src/styles/third-party/lucide-icons.css +12 -0
- package/fuse-starter-pack/fuse-v21.1/tsconfig.app.json +16 -0
- package/fuse-starter-pack/fuse-v21.1/tsconfig.json +37 -0
- package/fuse-starter-pack/fuse-v21.1/tsconfig.spec.json +10 -0
- package/generator/README.md +12 -0
- package/generator/issues/.gitkeep +0 -0
- package/package.json +56 -4
- package/playwright.config.js +29 -0
- package/playwright.field-profile.config.js +6 -0
- package/playwright.iam-live.config.js +31 -0
- package/playwright.iam.config.js +29 -0
- package/playwright.list-state.config.js +6 -0
- package/playwright.performance.config.js +1 -0
- package/run-config-tests.sh +5 -0
- package/scripts/e2e-paths.js +89 -0
- package/scripts/e2e-prepare-field-profile.js +17 -0
- package/scripts/e2e-prepare-iam-live.js +135 -0
- package/scripts/e2e-prepare-iam.js +65 -0
- package/scripts/e2e-prepare.js +72 -0
- package/scripts/e2e-serve-iam-live.js +28 -0
- package/scripts/e2e-serve-iam.js +28 -0
- package/scripts/e2e-serve.js +28 -0
- package/scripts/performance/generate.js +17 -0
- package/scripts/performance/measure.js +55 -0
- package/scripts/postinstall.js +9 -0
- package/scripts/prepare-quality-apps.js +34 -0
- package/scripts/run-config-tests.js +63 -0
- package/src/assets/logo-with-lable.jpeg +0 -0
- package/src/assets/logo.jpeg +0 -0
- package/src/commands/bootstrap.js +92 -0
- package/src/commands/doctor.js +403 -0
- package/src/commands/generate.js +301 -0
- package/src/commands/init-config.js +310 -0
- package/src/commands/keycloak-options.js +182 -0
- package/src/commands/validate.js +52 -0
- package/src/config/auth-config.js +183 -0
- package/src/config/default-values.js +235 -0
- package/src/config/env-refs.js +71 -0
- package/src/config/field-preferences.js +99 -0
- package/src/config/input-sources.js +104 -0
- package/src/config/load-config.js +166 -0
- package/src/config/proxy-routes.js +44 -0
- package/src/generator/access-control-tools.js +334 -0
- package/src/generator/ai-docs.js +691 -0
- package/src/generator/application-tests.js +252 -0
- package/src/generator/auth-pack.js +965 -0
- package/src/generator/embed-config.js +431 -0
- package/src/generator/entity-layout.js +30 -0
- package/src/generator/fuse-build.js +57 -0
- package/src/generator/fuse-runtime.js +344 -0
- package/src/generator/generated-banner.js +137 -0
- package/src/generator/index.js +874 -0
- package/src/generator/project-output.js +126 -0
- package/src/generator/team-pack.js +220 -0
- package/src/index.js +68 -0
- package/src/parser/gdl-parser.js +169 -0
- package/src/parser/jdl-parser.js +171 -0
- package/src/presets/pmb-test.js +139 -0
- package/src/presets/static-source.js +73 -0
- package/src/presets/store.js +96 -0
- package/src/provision/admin-service.js +148 -0
- package/src/provision/bootstrap.js +147 -0
- package/src/provision/http.js +123 -0
- package/src/provision/keycloak-admin-rest.js +335 -0
- package/src/provision/state.js +51 -0
- package/src/provision/token.js +52 -0
- package/src/templates/angular/auth/access-control.service.ts.ejs +179 -0
- package/src/templates/angular/auth/access-ctrl.pipe.ts.ejs +20 -0
- package/src/templates/angular/auth/auth.guard.ts.ejs +27 -0
- package/src/templates/angular/auth/auth.interceptor.ts.ejs +53 -0
- package/src/templates/angular/auth/auth.service.ts.ejs +594 -0
- package/src/templates/angular/auth/auth.utils.ts.ejs +28 -0
- package/src/templates/angular/auth/current-user.ts.ejs +24 -0
- package/src/templates/angular/auth/disabled-account-overlay.component.css.ejs +95 -0
- package/src/templates/angular/auth/disabled-account-overlay.component.html.ejs +33 -0
- package/src/templates/angular/auth/disabled-account-overlay.component.ts.ejs +23 -0
- package/src/templates/angular/auth/fuse-account.ts.ejs +234 -0
- package/src/templates/angular/auth/fuse-user.ts.ejs +264 -0
- package/src/templates/angular/auth/has-permission.directive.ts.ejs +51 -0
- package/src/templates/angular/auth/index.ts.ejs +24 -0
- package/src/templates/angular/auth/keycloak-admin.service.ts.ejs +670 -0
- package/src/templates/angular/auth/landing.guard.ts.ejs +61 -0
- package/src/templates/angular/auth/no-auth.guard.ts.ejs +19 -0
- package/src/templates/angular/auth/permission-attribute.util.ts.ejs +182 -0
- package/src/templates/angular/auth/sign-in.ts.ejs +60 -0
- package/src/templates/angular/entity/_entity_.model.ts.ejs +64 -0
- package/src/templates/angular/entity/_entity_.routes.ts.ejs +9 -0
- package/src/templates/angular/entity/components/forms/form/_entity_-form.component.html.ejs +168 -0
- package/src/templates/angular/entity/components/forms/form/_entity_-form.component.ts.ejs +175 -0
- package/src/templates/angular/entity/components/forms/form-page/_entity_-form-page.component.html.ejs +10 -0
- package/src/templates/angular/entity/components/forms/form-page/_entity_-form-page.component.ts.ejs +86 -0
- package/src/templates/angular/entity/components/forms/update/_entity_-form.service.ts.ejs +136 -0
- package/src/templates/angular/entity/components/interaction/actions/_entity_-actions.component.html.ejs +68 -0
- package/src/templates/angular/entity/components/interaction/actions/_entity_-actions.component.ts.ejs +69 -0
- package/src/templates/angular/entity/components/interaction/filter/_entity_-filter.component.html.ejs +111 -0
- package/src/templates/angular/entity/components/interaction/filter/_entity_-filter.component.ts.ejs +102 -0
- package/src/templates/angular/entity/components/presentation/card/_entity_-card.component.css.ejs +33 -0
- package/src/templates/angular/entity/components/presentation/card/_entity_-card.component.html.ejs +29 -0
- package/src/templates/angular/entity/components/presentation/card/_entity_-card.component.ts.ejs +93 -0
- package/src/templates/angular/entity/components/presentation/detail/_entity_-detail.component.css.ejs +54 -0
- package/src/templates/angular/entity/components/presentation/detail/_entity_-detail.component.html.ejs +58 -0
- package/src/templates/angular/entity/components/presentation/detail/_entity_-detail.component.ts.ejs +47 -0
- package/src/templates/angular/entity/components/presentation/list/_entity_-list.component.html.ejs +419 -0
- package/src/templates/angular/entity/components/presentation/list/_entity_-list.component.scss.ejs +48 -0
- package/src/templates/angular/entity/components/presentation/list/_entity_-list.component.ts.ejs +592 -0
- package/src/templates/angular/entity/service/_entity_.service.ts.ejs +153 -0
- package/src/templates/angular/entity/settings/_entity_.settings.ts.ejs +49 -0
- package/src/templates/angular/enums/_enum_.model.ts.ejs +11 -0
- package/src/templates/angular/iam/change-password.component.html.ejs +39 -0
- package/src/templates/angular/iam/change-password.component.ts.ejs +44 -0
- package/src/templates/angular/iam/no-access.component.ts.ejs +17 -0
- package/src/templates/angular/iam/role-list.component.html.ejs +331 -0
- package/src/templates/angular/iam/role-list.component.scss.ejs +107 -0
- package/src/templates/angular/iam/role-list.component.ts.ejs +597 -0
- package/src/templates/angular/iam/role-management/role-header.component.html.ejs +51 -0
- package/src/templates/angular/iam/role-management/role-header.component.ts.ejs +45 -0
- package/src/templates/angular/iam/role-management/role-inheritance.component.html.ejs +15 -0
- package/src/templates/angular/iam/role-management/role-inheritance.component.ts.ejs +19 -0
- package/src/templates/angular/iam/role-management/role-permissions-panel.component.css.ejs +24 -0
- package/src/templates/angular/iam/role-management/role-permissions-panel.component.html.ejs +108 -0
- package/src/templates/angular/iam/role-management/role-permissions-panel.component.ts.ejs +122 -0
- package/src/templates/angular/iam/role-management/role-users.component.html.ejs +104 -0
- package/src/templates/angular/iam/role-management/role-users.component.ts.ejs +53 -0
- package/src/templates/angular/iam/role-management/user-select-dialog.component.html.ejs +113 -0
- package/src/templates/angular/iam/role-management/user-select-dialog.component.ts.ejs +157 -0
- package/src/templates/angular/iam/role-permission-matrix.component.html.ejs +355 -0
- package/src/templates/angular/iam/role-permission-matrix.component.scss.ejs +217 -0
- package/src/templates/angular/iam/role-permission-matrix.component.ts.ejs +800 -0
- package/src/templates/angular/iam/screen-catalog.ts.ejs +147 -0
- package/src/templates/angular/iam/shared/confirm-dialog.component.ts.ejs +83 -0
- package/src/templates/angular/iam/shared/matrix-hierarchy.util.ts.ejs +196 -0
- package/src/templates/angular/iam/shared/permission-matrix-sound.ts.ejs +59 -0
- package/src/templates/angular/iam/shared/role-display.util.ts.ejs +43 -0
- package/src/templates/angular/iam/shared/role-permission-skeleton.component.ts.ejs +54 -0
- package/src/templates/angular/iam/shared/screen-matrix.util.ts.ejs +554 -0
- package/src/templates/angular/iam/shared/screen-navigation-map.ts.ejs +187 -0
- package/src/templates/angular/iam/shared/screen-navigation.registry.ts.ejs +64 -0
- package/src/templates/angular/iam/shared/text-highlight.pipe.ts.ejs +39 -0
- package/src/templates/angular/iam/user-access-matrix.component.html.ejs +212 -0
- package/src/templates/angular/iam/user-access-matrix.component.scss.ejs +34 -0
- package/src/templates/angular/iam/user-access-matrix.component.ts.ejs +239 -0
- package/src/templates/angular/iam/user-detail.component.html.ejs +143 -0
- package/src/templates/angular/iam/user-detail.component.ts.ejs +108 -0
- package/src/templates/angular/iam/user-form.component.html.ejs +63 -0
- package/src/templates/angular/iam/user-form.component.ts.ejs +100 -0
- package/src/templates/angular/iam/user-list.component.html.ejs +369 -0
- package/src/templates/angular/iam/user-list.component.scss.ejs +242 -0
- package/src/templates/angular/iam/user-list.component.ts.ejs +446 -0
- package/src/templates/angular/iam/user-management.routes.ts.ejs +47 -0
- package/src/templates/angular/iam/user-permission-matrix.component.html.ejs +231 -0
- package/src/templates/angular/iam/user-permission-matrix.component.scss.ejs +216 -0
- package/src/templates/angular/iam/user-permission-matrix.component.ts.ejs +516 -0
- package/src/templates/angular/shared/base/audit-user-name.pipe.ts.ejs +69 -0
- package/src/templates/angular/shared/base/base-filter.component.ts.ejs +245 -0
- package/src/templates/angular/shared/base/base-form.component.ts.ejs +109 -0
- package/src/templates/angular/shared/base/base-list.component.ts.ejs +507 -0
- package/src/templates/angular/shared/base/filter-types.ts.ejs +55 -0
- package/src/templates/angular/shared/base/input-format.directive.ts.ejs +47 -0
- package/src/templates/angular/shared/base/input-format.ts.ejs +15 -0
- package/src/templates/angular/shared/confirm-with-input-dialog.component.ts.ejs +91 -0
- package/src/templates/angular/shared/confirmation-dialog.component.ts.ejs +80 -0
- package/src/templates/angular/shared/list-styles.css.ejs +103 -0
- package/src/templates/angular/shared/loading-overlay.component.ts.ejs +24 -0
- package/src/templates/angular/shared/resizable.directive.ts.ejs +115 -0
- package/src/templates/angular/shared/snackbar-styles.css.ejs +11 -0
- package/src/templates/fuse-packs/access-control-tools/access-control-sync.js +819 -0
- package/src/templates/fuse-packs/access-control-tools/build-rename-map.js +67 -0
- package/src/templates/fuse-packs/access-control-tools/inject-qa-ids.js +14 -0
- package/src/templates/fuse-packs/access-control-tools/lib/hierarchy-scanner.js +628 -0
- package/src/templates/fuse-packs/access-control-tools/lib/hierarchy-scanner.test.js +323 -0
- package/src/templates/fuse-packs/access-control-tools/lib/html-scanner.js +362 -0
- package/src/templates/fuse-packs/access-control-tools/lib/id-rules.duplicate.test.js +136 -0
- package/src/templates/fuse-packs/access-control-tools/lib/id-rules.js +1095 -0
- package/src/templates/fuse-packs/access-control-tools/lib/ts-component-index.js +482 -0
- package/src/templates/fuse-packs/access-control-tools/output/.gitkeep +0 -0
- package/src/templates/fuse-packs/access-control-tools/run.sh +223 -0
- package/src/templates/fuse-packs/access-control-tools/scan-access-control.js +14 -0
- package/src/templates/fuse-packs/iam-assets/sound/apple-play.mp3 +0 -0
- package/src/templates/fuse-packs/iam-assets/sound/remove.mp3 +0 -0
- package/src/templates/generator/README.md +12 -0
- package/src/templates/testing/ci.cjs +45 -0
- package/src/templates/testing/mock.cjs +149 -0
- package/src/templates/testing/playwright.config.cjs +25 -0
- package/src/templates/testing/serve.cjs +22 -0
- package/src/templates/testing/smoke.spec.cjs +180 -0
- package/src/utils/branding.js +39 -0
- package/src/utils/colors.js +18 -0
- package/src/utils/diff.js +109 -0
- package/src/utils/merger.js +115 -0
- package/src/validator/backend-diagnostics.js +30 -0
- package/src/validator/blueprint-validator.js +276 -0
- package/src/validator/diagnostics.js +608 -0
- package/src/validator/pattern.js +28 -0
- package/test/auth-interceptor.js +84 -0
- package/test/auth-provision-checks.js +297 -0
- package/test/field-preferences.js +145 -0
- package/test/fixtures/field-profile.gdl +7 -0
- package/test/fixtures/mock.jdl +17 -0
- package/test/fixtures/mock.png +0 -0
- package/test/fixtures/performance/config.yml +33 -0
- package/test/fixtures/performance/large.gdl +199 -0
- package/test/fixtures/performance/small.gdl +7 -0
- package/test/fixtures/quality/custom.yml +22 -0
- package/test/fixtures/quality/go-duck.yml +22 -0
- package/test/fixtures/quality/jhipster.yml +30 -0
- package/test/fixtures/quality/representative.gdl +14 -0
- package/test/list-state.js +138 -0
- package/test/micro-functions-layout.js +95 -0
- package/test/performance-generation.js +32 -0
- package/test/pmb-preset.js +127 -0
- package/test/project-workflow.js +111 -0
- package/test/quality-features.js +250 -0
- package/test/verify-commands.js +83 -0
- package/test/verify.js +959 -0
- package/test-files/GDL/example.gdl +15 -0
- package/test-files/JDL/example.jdl +15 -0
- package/test-files/config/crudforge.config.yml +127 -0
- package/test-run.sh +272 -0
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
export { AuthService } from './services/auth.service';
|
|
2
|
+
export type { SignOutReason } from './services/auth.service';
|
|
3
|
+
export { AuthUtils } from './utils/auth.utils';
|
|
4
|
+
export { authInterceptor } from './interceptors/auth.interceptor';
|
|
5
|
+
export { AuthGuard } from './guards/auth.guard';
|
|
6
|
+
export { NoAuthGuard } from './guards/no-auth.guard';
|
|
7
|
+
export { LandingGuard } from './guards/landing.guard';
|
|
8
|
+
export { AccessControlService } from './services/access-control.service';
|
|
9
|
+
export { AccessCtrlPipe } from './pipes/access-ctrl.pipe';
|
|
10
|
+
export { HasPermissionDirective } from './directives/has-permission.directive';
|
|
11
|
+
export { KeycloakAdminService } from './services/keycloak-admin.service';
|
|
12
|
+
export type { UserRepresentation, RoleRepresentation } from './services/keycloak-admin.service';
|
|
13
|
+
export { DisabledAccountOverlayComponent } from './components/disabled-account-overlay/disabled-account-overlay.component';
|
|
14
|
+
export {
|
|
15
|
+
type UserAttributes,
|
|
16
|
+
PROTECTED_USER_ATTRIBUTE_KEYS,
|
|
17
|
+
isScreenPermissionGranted,
|
|
18
|
+
isComponentPermissionGranted,
|
|
19
|
+
mergePermissionAttributes,
|
|
20
|
+
normalizeUserAttributes,
|
|
21
|
+
revokeScreenGrant,
|
|
22
|
+
screenIdsMatch,
|
|
23
|
+
getScreenBaseId,
|
|
24
|
+
} from './utils/permission-attribute.util';
|
|
@@ -0,0 +1,670 @@
|
|
|
1
|
+
import { HttpClient, HttpParams } from '@angular/common/http';
|
|
2
|
+
import { Injectable, inject } from '@angular/core';
|
|
3
|
+
import { Observable, forkJoin, of, throwError } from 'rxjs';
|
|
4
|
+
import { catchError, map, switchMap } from 'rxjs/operators';
|
|
5
|
+
import { environment } from '@/environments/environment';
|
|
6
|
+
import {
|
|
7
|
+
UserAttributes,
|
|
8
|
+
collectParentRole,
|
|
9
|
+
mergePermissionAttributes,
|
|
10
|
+
normalizeUserAttributes,
|
|
11
|
+
PROTECTED_USER_ATTRIBUTE_KEYS,
|
|
12
|
+
revokeScreenGrant,
|
|
13
|
+
} from '../utils/permission-attribute.util';
|
|
14
|
+
|
|
15
|
+
export interface UserRepresentation {
|
|
16
|
+
id?: string;
|
|
17
|
+
username?: string;
|
|
18
|
+
email?: string;
|
|
19
|
+
firstName?: string;
|
|
20
|
+
lastName?: string;
|
|
21
|
+
enabled?: boolean;
|
|
22
|
+
attributes?: Record<string, string[]>;
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
export interface RoleRepresentation {
|
|
26
|
+
id?: string;
|
|
27
|
+
name?: string;
|
|
28
|
+
description?: string;
|
|
29
|
+
attributes?: Record<string, string[]>;
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
export interface CredentialRepresentation {
|
|
33
|
+
type: string;
|
|
34
|
+
value: string;
|
|
35
|
+
temporary?: boolean;
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
export interface UserPage {
|
|
39
|
+
users: UserRepresentation[];
|
|
40
|
+
totalCount: number;
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
const MOCK_STORE_KEY = 'cforge-iam-mock';
|
|
44
|
+
|
|
45
|
+
const defaultMockUsers: UserRepresentation[] = [
|
|
46
|
+
{
|
|
47
|
+
id: 'mock-admin',
|
|
48
|
+
username: 'admin',
|
|
49
|
+
email: 'demo@crudforge.com',
|
|
50
|
+
firstName: 'Demo',
|
|
51
|
+
lastName: 'Admin',
|
|
52
|
+
enabled: true,
|
|
53
|
+
attributes: { screens: ['user-management', 'role-management', 'role-permissions'] },
|
|
54
|
+
},
|
|
55
|
+
];
|
|
56
|
+
|
|
57
|
+
const defaultMockRoles: RoleRepresentation[] = [
|
|
58
|
+
{
|
|
59
|
+
name: 'ROLE_ADMIN',
|
|
60
|
+
description: 'Administrator',
|
|
61
|
+
attributes: { screens: ['user-management', 'role-management', 'role-permissions'] },
|
|
62
|
+
},
|
|
63
|
+
];
|
|
64
|
+
|
|
65
|
+
function readMockStore(): { users: UserRepresentation[]; roles: RoleRepresentation[]; userRoles: Record<string, string[]> } {
|
|
66
|
+
if (typeof sessionStorage === 'undefined') {
|
|
67
|
+
return { users: [...defaultMockUsers], roles: [...defaultMockRoles], userRoles: { 'mock-admin': ['ROLE_ADMIN'] } };
|
|
68
|
+
}
|
|
69
|
+
try {
|
|
70
|
+
const raw = sessionStorage.getItem(MOCK_STORE_KEY);
|
|
71
|
+
if (raw) {
|
|
72
|
+
return JSON.parse(raw);
|
|
73
|
+
}
|
|
74
|
+
} catch {
|
|
75
|
+
// fall through to defaults
|
|
76
|
+
}
|
|
77
|
+
return { users: [...defaultMockUsers], roles: [...defaultMockRoles], userRoles: { 'mock-admin': ['ROLE_ADMIN'] } };
|
|
78
|
+
}
|
|
79
|
+
|
|
80
|
+
function writeMockStore(): void {
|
|
81
|
+
if (typeof sessionStorage === 'undefined') {
|
|
82
|
+
return;
|
|
83
|
+
}
|
|
84
|
+
sessionStorage.setItem(MOCK_STORE_KEY, JSON.stringify({ users: mockUsers, roles: mockRoles, userRoles: mockUserRoles }));
|
|
85
|
+
}
|
|
86
|
+
|
|
87
|
+
const stored = readMockStore();
|
|
88
|
+
const mockUsers: UserRepresentation[] = stored.users;
|
|
89
|
+
const mockRoles: RoleRepresentation[] = stored.roles;
|
|
90
|
+
const mockUserRoles: Record<string, string[]> = stored.userRoles || { 'mock-admin': ['ROLE_ADMIN'] };
|
|
91
|
+
|
|
92
|
+
@Injectable({ providedIn: 'root' })
|
|
93
|
+
export class KeycloakAdminService {
|
|
94
|
+
private readonly http = inject(HttpClient);
|
|
95
|
+
|
|
96
|
+
/** Native Keycloak Admin REST (mock / legacy). */
|
|
97
|
+
private get realmUrl(): string {
|
|
98
|
+
return `${environment.adminBaseUrl}/admin/realms/${environment.kcRealm}`;
|
|
99
|
+
}
|
|
100
|
+
|
|
101
|
+
/** Custom Keycloak Admin Service middleware (`/api/v1/*`). */
|
|
102
|
+
private get adminServiceApi(): string {
|
|
103
|
+
return `${(environment as { kcAdminServiceUrl?: string }).kcAdminServiceUrl || '/services/keycloak-admin'}/api/v1`;
|
|
104
|
+
}
|
|
105
|
+
|
|
106
|
+
private get useAdminService(): boolean {
|
|
107
|
+
return !!(environment as { useKeycloakAdminService?: boolean }).useKeycloakAdminService;
|
|
108
|
+
}
|
|
109
|
+
|
|
110
|
+
searchUsers(searchTerm = '', page = 0, size = 20): Observable<UserPage> {
|
|
111
|
+
if (environment.useMockAuth) {
|
|
112
|
+
const query = searchTerm.toLowerCase();
|
|
113
|
+
const users = mockUsers.filter((user) =>
|
|
114
|
+
!query || [user.username, user.email, user.firstName, user.lastName].some((value) =>
|
|
115
|
+
String(value || '').toLowerCase().includes(query)
|
|
116
|
+
)
|
|
117
|
+
);
|
|
118
|
+
return of({
|
|
119
|
+
users: users.slice(page * size, page * size + size),
|
|
120
|
+
totalCount: users.length,
|
|
121
|
+
});
|
|
122
|
+
}
|
|
123
|
+
|
|
124
|
+
if (this.useAdminService) {
|
|
125
|
+
let params = new HttpParams().set('page', String(page)).set('size', String(size));
|
|
126
|
+
if (searchTerm) {
|
|
127
|
+
params = params.set('search', searchTerm);
|
|
128
|
+
}
|
|
129
|
+
return this.http.get<UserRepresentation[]>(`${this.adminServiceApi}/users`, { params }).pipe(
|
|
130
|
+
map((users) => ({ users: users || [], totalCount: users?.length || 0 })),
|
|
131
|
+
catchError(() => of({ users: [], totalCount: 0 }))
|
|
132
|
+
);
|
|
133
|
+
}
|
|
134
|
+
|
|
135
|
+
let params = new HttpParams()
|
|
136
|
+
.set('first', String(page * size))
|
|
137
|
+
.set('max', String(size));
|
|
138
|
+
if (searchTerm) {
|
|
139
|
+
params = params.set('search', searchTerm);
|
|
140
|
+
}
|
|
141
|
+
|
|
142
|
+
return this.http.get<UserRepresentation[]>(`${this.realmUrl}/users`, { params }).pipe(
|
|
143
|
+
map((users) => ({ users: users || [], totalCount: users?.length || 0 })),
|
|
144
|
+
catchError(() => of({ users: [], totalCount: 0 }))
|
|
145
|
+
);
|
|
146
|
+
}
|
|
147
|
+
|
|
148
|
+
getUserById(id: string): Observable<UserRepresentation | null> {
|
|
149
|
+
if (environment.useMockAuth) {
|
|
150
|
+
return of(mockUsers.find((user) => user.id === id) || mockUsers[0] || null);
|
|
151
|
+
}
|
|
152
|
+
const url = this.useAdminService
|
|
153
|
+
? `${this.adminServiceApi}/users/${id}`
|
|
154
|
+
: `${this.realmUrl}/users/${id}`;
|
|
155
|
+
return this.http.get<UserRepresentation>(url).pipe(catchError(() => of(null)));
|
|
156
|
+
}
|
|
157
|
+
|
|
158
|
+
getUserByUsername(username: string): Observable<UserRepresentation | null> {
|
|
159
|
+
const term = username.trim();
|
|
160
|
+
if (!term) {
|
|
161
|
+
return of(null);
|
|
162
|
+
}
|
|
163
|
+
return this.searchUsers(term, 0, 50).pipe(
|
|
164
|
+
map((page) => {
|
|
165
|
+
const normalized = term.toLowerCase();
|
|
166
|
+
return (
|
|
167
|
+
page.users.find((user) => (user.username || '').trim().toLowerCase() === normalized) || null
|
|
168
|
+
);
|
|
169
|
+
}),
|
|
170
|
+
catchError(() => of(null))
|
|
171
|
+
);
|
|
172
|
+
}
|
|
173
|
+
|
|
174
|
+
createUser(user: UserRepresentation): Observable<UserRepresentation> {
|
|
175
|
+
if (environment.useMockAuth) {
|
|
176
|
+
const created = { ...user, id: user.id || `mock-${Date.now()}` };
|
|
177
|
+
mockUsers.push(created);
|
|
178
|
+
writeMockStore();
|
|
179
|
+
return of(created);
|
|
180
|
+
}
|
|
181
|
+
if (this.useAdminService) {
|
|
182
|
+
return throwError(
|
|
183
|
+
() => new Error('Create user is not in the Keycloak Admin Service contract (GET /api/v1/*).')
|
|
184
|
+
);
|
|
185
|
+
}
|
|
186
|
+
return this.http.post<UserRepresentation>(`${this.realmUrl}/users`, user);
|
|
187
|
+
}
|
|
188
|
+
|
|
189
|
+
updateUser(user: Partial<UserRepresentation> & { id: string }): Observable<void> {
|
|
190
|
+
if (environment.useMockAuth) {
|
|
191
|
+
const index = mockUsers.findIndex((item) => item.id === user.id);
|
|
192
|
+
if (index >= 0) {
|
|
193
|
+
mockUsers[index] = { ...mockUsers[index], ...user };
|
|
194
|
+
writeMockStore();
|
|
195
|
+
}
|
|
196
|
+
return of(void 0);
|
|
197
|
+
}
|
|
198
|
+
const url = this.useAdminService
|
|
199
|
+
? `${this.adminServiceApi}/users/${user.id}`
|
|
200
|
+
: `${this.realmUrl}/users/${user.id}`;
|
|
201
|
+
return this.http.put<void>(url, user);
|
|
202
|
+
}
|
|
203
|
+
|
|
204
|
+
deleteUser(userId: string): Observable<void> {
|
|
205
|
+
if (environment.useMockAuth) {
|
|
206
|
+
const index = mockUsers.findIndex((item) => item.id === userId);
|
|
207
|
+
if (index >= 0) {
|
|
208
|
+
mockUsers.splice(index, 1);
|
|
209
|
+
delete mockUserRoles[userId];
|
|
210
|
+
writeMockStore();
|
|
211
|
+
}
|
|
212
|
+
return of(void 0);
|
|
213
|
+
}
|
|
214
|
+
if (this.useAdminService) {
|
|
215
|
+
return throwError(
|
|
216
|
+
() => new Error('Delete user is not in the Keycloak Admin Service contract.')
|
|
217
|
+
);
|
|
218
|
+
}
|
|
219
|
+
return this.http.delete<void>(`${this.realmUrl}/users/${userId}`);
|
|
220
|
+
}
|
|
221
|
+
|
|
222
|
+
resetPassword(userId: string, body: CredentialRepresentation): Observable<void> {
|
|
223
|
+
if (environment.useMockAuth) {
|
|
224
|
+
return of(void 0);
|
|
225
|
+
}
|
|
226
|
+
if (this.useAdminService) {
|
|
227
|
+
return this.http.post<void>(`${this.adminServiceApi}/users/${userId}/password`, {
|
|
228
|
+
value: body.value,
|
|
229
|
+
temporary: body.temporary ?? false,
|
|
230
|
+
});
|
|
231
|
+
}
|
|
232
|
+
return this.http.put<void>(`${this.realmUrl}/users/${userId}/reset-password`, body);
|
|
233
|
+
}
|
|
234
|
+
|
|
235
|
+
getRealmRoles(): Observable<RoleRepresentation[]> {
|
|
236
|
+
if (environment.useMockAuth) {
|
|
237
|
+
return of([...mockRoles]);
|
|
238
|
+
}
|
|
239
|
+
const url = this.useAdminService ? `${this.adminServiceApi}/roles` : `${this.realmUrl}/roles`;
|
|
240
|
+
return this.http.get<RoleRepresentation[]>(url).pipe(catchError(() => of([])));
|
|
241
|
+
}
|
|
242
|
+
|
|
243
|
+
createRealmRole(role: RoleRepresentation): Observable<void> {
|
|
244
|
+
if (environment.useMockAuth) {
|
|
245
|
+
mockRoles.push({ ...role, attributes: role.attributes || {} });
|
|
246
|
+
writeMockStore();
|
|
247
|
+
return of(void 0);
|
|
248
|
+
}
|
|
249
|
+
if (this.useAdminService) {
|
|
250
|
+
return throwError(
|
|
251
|
+
() => new Error('Create role is not in the Keycloak Admin Service contract.')
|
|
252
|
+
);
|
|
253
|
+
}
|
|
254
|
+
return this.http.post<void>(`${this.realmUrl}/roles`, role);
|
|
255
|
+
}
|
|
256
|
+
|
|
257
|
+
/** Create a realm role only (no ghost user). */
|
|
258
|
+
createRealmRoleOnly(roleName: string, description?: string): Observable<void> {
|
|
259
|
+
return this.createRealmRole({
|
|
260
|
+
name: roleName,
|
|
261
|
+
description: description || `Role for ${roleName}`,
|
|
262
|
+
});
|
|
263
|
+
}
|
|
264
|
+
|
|
265
|
+
/**
|
|
266
|
+
* Duplicate an existing role — create the target and copy source permission attributes.
|
|
267
|
+
*/
|
|
268
|
+
duplicateRole(sourceRoleName: string, targetRoleName: string, description?: string): Observable<void> {
|
|
269
|
+
return this.createRealmRoleOnly(targetRoleName, description).pipe(
|
|
270
|
+
switchMap(() => this.getRealmRolePermissionAttributes(sourceRoleName)),
|
|
271
|
+
switchMap((attrs) => this.updateRoleAttributes(targetRoleName, { ...attrs })),
|
|
272
|
+
map(() => void 0),
|
|
273
|
+
catchError((err) => throwError(() => err))
|
|
274
|
+
);
|
|
275
|
+
}
|
|
276
|
+
|
|
277
|
+
getUsersByRealmRole(role: string, page = 0, size = 20): Observable<UserPage> {
|
|
278
|
+
const roleName = String(role ?? '').trim();
|
|
279
|
+
if (!roleName) {
|
|
280
|
+
return of({ users: [], totalCount: 0 });
|
|
281
|
+
}
|
|
282
|
+
|
|
283
|
+
if (environment.useMockAuth) {
|
|
284
|
+
const users = mockUsers.filter((user) => (mockUserRoles[user.id || ''] || []).includes(roleName));
|
|
285
|
+
return of({
|
|
286
|
+
users: users.slice(page * size, page * size + size),
|
|
287
|
+
totalCount: users.length,
|
|
288
|
+
});
|
|
289
|
+
}
|
|
290
|
+
|
|
291
|
+
const holdersUrl = this.useAdminService
|
|
292
|
+
? `${this.adminServiceApi}/roles/${encodeURIComponent(roleName)}/users`
|
|
293
|
+
: `${this.realmUrl}/roles/${encodeURIComponent(roleName)}/users`;
|
|
294
|
+
const params = this.useAdminService
|
|
295
|
+
? new HttpParams().set('page', String(page)).set('size', String(size))
|
|
296
|
+
: new HttpParams().set('first', String(page * size)).set('max', String(size));
|
|
297
|
+
|
|
298
|
+
return this.http.get<UserRepresentation[] | { users?: UserRepresentation[]; data?: UserRepresentation[]; totalCount?: number; total?: number }>(holdersUrl, { params }).pipe(
|
|
299
|
+
map((response) => {
|
|
300
|
+
const rawUsers: UserRepresentation[] = Array.isArray(response)
|
|
301
|
+
? response
|
|
302
|
+
: response.users || response.data || [];
|
|
303
|
+
return {
|
|
304
|
+
users: rawUsers,
|
|
305
|
+
totalCount: Array.isArray(response)
|
|
306
|
+
? rawUsers.length
|
|
307
|
+
: response.totalCount || response.total || rawUsers.length,
|
|
308
|
+
};
|
|
309
|
+
}),
|
|
310
|
+
catchError(() => of({ users: [], totalCount: 0 }))
|
|
311
|
+
);
|
|
312
|
+
}
|
|
313
|
+
|
|
314
|
+
deleteRealmRole(roleName: string): Observable<void> {
|
|
315
|
+
if (environment.useMockAuth) {
|
|
316
|
+
const index = mockRoles.findIndex((role) => role.name === roleName);
|
|
317
|
+
if (index >= 0) {
|
|
318
|
+
mockRoles.splice(index, 1);
|
|
319
|
+
writeMockStore();
|
|
320
|
+
}
|
|
321
|
+
return of(void 0);
|
|
322
|
+
}
|
|
323
|
+
if (this.useAdminService) {
|
|
324
|
+
return throwError(
|
|
325
|
+
() => new Error('Delete role is not in the Keycloak Admin Service contract.')
|
|
326
|
+
);
|
|
327
|
+
}
|
|
328
|
+
return this.http.delete<void>(`${this.realmUrl}/roles/${encodeURIComponent(roleName)}`);
|
|
329
|
+
}
|
|
330
|
+
|
|
331
|
+
getRealmRolePermissionAttributes(roleName: string): Observable<UserAttributes> {
|
|
332
|
+
if (environment.useMockAuth) {
|
|
333
|
+
const role = mockRoles.find((item) => item.name?.toUpperCase() === roleName.toUpperCase());
|
|
334
|
+
return of(normalizeUserAttributes(role?.attributes || {}));
|
|
335
|
+
}
|
|
336
|
+
if (this.useAdminService) {
|
|
337
|
+
// Middleware lists roles but does not expose role attribute GET; return empty attrs.
|
|
338
|
+
return this.getRealmRoles().pipe(
|
|
339
|
+
map((roles) => {
|
|
340
|
+
const role = roles.find((item) => item.name?.toUpperCase() === roleName.toUpperCase());
|
|
341
|
+
return normalizeUserAttributes(role?.attributes || {});
|
|
342
|
+
}),
|
|
343
|
+
catchError(() => of({} as UserAttributes))
|
|
344
|
+
);
|
|
345
|
+
}
|
|
346
|
+
return this.http.get<RoleRepresentation>(`${this.realmUrl}/roles/${encodeURIComponent(roleName)}`).pipe(
|
|
347
|
+
map((role) => normalizeUserAttributes(role?.attributes || {})),
|
|
348
|
+
catchError(() => of({} as UserAttributes))
|
|
349
|
+
);
|
|
350
|
+
}
|
|
351
|
+
|
|
352
|
+
resolveRoleAttributesRecursive(roleName: string, visited = new Set<string>()): Observable<UserAttributes> {
|
|
353
|
+
const key = roleName.toUpperCase();
|
|
354
|
+
if (!roleName || visited.has(key)) {
|
|
355
|
+
return of({});
|
|
356
|
+
}
|
|
357
|
+
visited.add(key);
|
|
358
|
+
|
|
359
|
+
return this.getRealmRolePermissionAttributes(roleName).pipe(
|
|
360
|
+
switchMap((attrs) => {
|
|
361
|
+
const parent = <%= iam.inheritance !== false ? 'collectParentRole(attrs)' : 'null' %>;
|
|
362
|
+
if (!parent) {
|
|
363
|
+
return of(attrs);
|
|
364
|
+
}
|
|
365
|
+
return this.resolveRoleAttributesRecursive(parent, visited).pipe(
|
|
366
|
+
map((parentAttrs) => mergePermissionAttributes(parentAttrs, attrs))
|
|
367
|
+
);
|
|
368
|
+
})
|
|
369
|
+
);
|
|
370
|
+
}
|
|
371
|
+
|
|
372
|
+
setRoleScreenPermission(
|
|
373
|
+
roleName: string,
|
|
374
|
+
screenId: string,
|
|
375
|
+
granted: boolean,
|
|
376
|
+
componentIds: string[] = [],
|
|
377
|
+
syncUsers = true,
|
|
378
|
+
relatedScreenIds: string[] = []
|
|
379
|
+
): Observable<{ synced: number; failed: number; total: number }> {
|
|
380
|
+
const screenIds = Array.from(new Set([screenId, ...relatedScreenIds].filter(Boolean)));
|
|
381
|
+
return this.getRealmRolePermissionAttributes(roleName).pipe(
|
|
382
|
+
switchMap((attrs) => {
|
|
383
|
+
let next = { ...attrs };
|
|
384
|
+
if (granted) {
|
|
385
|
+
const screens = new Set((next['screens'] || []).map(String));
|
|
386
|
+
screens.add(screenId);
|
|
387
|
+
next['screens'] = Array.from(screens);
|
|
388
|
+
const existing = Array.isArray(next[screenId]) ? next[screenId] : [];
|
|
389
|
+
next[screenId] = Array.from(new Set([...existing, 'true', ...componentIds.filter(Boolean)]));
|
|
390
|
+
componentIds.forEach((id) => {
|
|
391
|
+
if (id) next[id] = ['true'];
|
|
392
|
+
});
|
|
393
|
+
} else {
|
|
394
|
+
next = revokeScreenGrant(next, screenIds, componentIds);
|
|
395
|
+
}
|
|
396
|
+
return this.updateRoleAttributes(roleName, next);
|
|
397
|
+
}),
|
|
398
|
+
switchMap(() =>
|
|
399
|
+
syncUsers
|
|
400
|
+
? this.syncAllRoleHoldersPermissions(roleName)
|
|
401
|
+
: of({ synced: 0, failed: 0, total: 0 })
|
|
402
|
+
)
|
|
403
|
+
);
|
|
404
|
+
}
|
|
405
|
+
|
|
406
|
+
setRoleComponentPermission(
|
|
407
|
+
roleName: string,
|
|
408
|
+
componentId: string,
|
|
409
|
+
screenId: string,
|
|
410
|
+
granted: boolean,
|
|
411
|
+
syncUsers = true,
|
|
412
|
+
relatedScreenIds: string[] = []
|
|
413
|
+
): Observable<{ synced: number; failed: number; total: number }> {
|
|
414
|
+
return this.getRealmRolePermissionAttributes(roleName).pipe(
|
|
415
|
+
switchMap((attrs) => {
|
|
416
|
+
const next = { ...attrs };
|
|
417
|
+
const screenKeys = Array.from(new Set([screenId, ...relatedScreenIds].filter(Boolean)));
|
|
418
|
+
if (granted) {
|
|
419
|
+
next[componentId] = ['true'];
|
|
420
|
+
screenKeys.forEach((key) => {
|
|
421
|
+
const existing = Array.isArray(next[key]) ? next[key] : [];
|
|
422
|
+
next[key] = Array.from(new Set([...(existing.includes('true') ? ['true'] : []), ...existing.filter((v) => v !== 'true'), componentId]));
|
|
423
|
+
});
|
|
424
|
+
} else {
|
|
425
|
+
delete next[componentId];
|
|
426
|
+
screenKeys.forEach((key) => {
|
|
427
|
+
if (next[key]) {
|
|
428
|
+
next[key] = (next[key] || []).filter((entry) => entry !== componentId);
|
|
429
|
+
if (next[key].length === 0) delete next[key];
|
|
430
|
+
}
|
|
431
|
+
});
|
|
432
|
+
}
|
|
433
|
+
return this.updateRoleAttributes(roleName, next);
|
|
434
|
+
}),
|
|
435
|
+
switchMap(() =>
|
|
436
|
+
syncUsers
|
|
437
|
+
? this.syncAllRoleHoldersPermissions(roleName)
|
|
438
|
+
: of({ synced: 0, failed: 0, total: 0 })
|
|
439
|
+
)
|
|
440
|
+
);
|
|
441
|
+
}
|
|
442
|
+
|
|
443
|
+
updateRoleAttributes(roleName: string, attributes: UserAttributes): Observable<void> {
|
|
444
|
+
if (environment.useMockAuth) {
|
|
445
|
+
const role = mockRoles.find((item) => item.name === roleName);
|
|
446
|
+
if (role) {
|
|
447
|
+
role.attributes = attributes;
|
|
448
|
+
writeMockStore();
|
|
449
|
+
}
|
|
450
|
+
return of(void 0);
|
|
451
|
+
}
|
|
452
|
+
if (this.useAdminService) {
|
|
453
|
+
return throwError(
|
|
454
|
+
() => new Error('Update role attributes is not in the Keycloak Admin Service contract.')
|
|
455
|
+
);
|
|
456
|
+
}
|
|
457
|
+
return this.http.get<RoleRepresentation>(`${this.realmUrl}/roles/${encodeURIComponent(roleName)}`).pipe(
|
|
458
|
+
switchMap((role) =>
|
|
459
|
+
this.http.put<void>(`${this.realmUrl}/roles/${encodeURIComponent(roleName)}`, {
|
|
460
|
+
...role,
|
|
461
|
+
attributes,
|
|
462
|
+
})
|
|
463
|
+
)
|
|
464
|
+
);
|
|
465
|
+
}
|
|
466
|
+
|
|
467
|
+
getUserRealmRoles(userId: string): Observable<RoleRepresentation[]> {
|
|
468
|
+
if (environment.useMockAuth) {
|
|
469
|
+
const names = new Set(mockUserRoles[userId] || []);
|
|
470
|
+
return of(mockRoles.filter((role) => role.name && names.has(role.name)));
|
|
471
|
+
}
|
|
472
|
+
if (this.useAdminService) {
|
|
473
|
+
return this.http.get<RoleRepresentation[]>(`${this.adminServiceApi}/users/${userId}/roles`).pipe(
|
|
474
|
+
catchError(() => of([]))
|
|
475
|
+
);
|
|
476
|
+
}
|
|
477
|
+
return this.http.get<RoleRepresentation[]>(`${this.realmUrl}/users/${userId}/role-mappings/realm`).pipe(
|
|
478
|
+
catchError(() => of([]))
|
|
479
|
+
);
|
|
480
|
+
}
|
|
481
|
+
|
|
482
|
+
assignRealmRoleToUser(userId: string, roleName: string): Observable<void> {
|
|
483
|
+
return forkJoin({
|
|
484
|
+
role: this.getRealmRoles().pipe(map((roles) => roles.find((role) => role.name === roleName) || { name: roleName })),
|
|
485
|
+
attrs: this.resolveRoleAttributesRecursive(roleName),
|
|
486
|
+
user: this.getUserById(userId),
|
|
487
|
+
}).pipe(
|
|
488
|
+
switchMap(({ role, attrs, user }) => {
|
|
489
|
+
if (!environment.useMockAuth && this.useAdminService) {
|
|
490
|
+
return throwError(
|
|
491
|
+
() => new Error('Assign realm role is not in the Keycloak Admin Service contract.')
|
|
492
|
+
);
|
|
493
|
+
}
|
|
494
|
+
const assign$ = environment.useMockAuth
|
|
495
|
+
? of((() => {
|
|
496
|
+
const current = new Set(mockUserRoles[userId] || []);
|
|
497
|
+
current.add(roleName);
|
|
498
|
+
mockUserRoles[userId] = Array.from(current);
|
|
499
|
+
writeMockStore();
|
|
500
|
+
return void 0;
|
|
501
|
+
})())
|
|
502
|
+
: this.http.post<void>(`${this.realmUrl}/users/${userId}/role-mappings/realm`, [role]);
|
|
503
|
+
return assign$.pipe(
|
|
504
|
+
switchMap(() => this.mergeUserAttributes(userId, user?.attributes || {}, attrs)),
|
|
505
|
+
map(() => void 0)
|
|
506
|
+
);
|
|
507
|
+
})
|
|
508
|
+
);
|
|
509
|
+
}
|
|
510
|
+
|
|
511
|
+
removeRealmRoleFromUser(userId: string, roleName: string): Observable<void> {
|
|
512
|
+
if (!environment.useMockAuth && this.useAdminService) {
|
|
513
|
+
return throwError(
|
|
514
|
+
() => new Error('Remove realm role is not in the Keycloak Admin Service contract.')
|
|
515
|
+
);
|
|
516
|
+
}
|
|
517
|
+
const remove$ = environment.useMockAuth
|
|
518
|
+
? of((() => {
|
|
519
|
+
mockUserRoles[userId] = (mockUserRoles[userId] || []).filter((name) => name !== roleName);
|
|
520
|
+
writeMockStore();
|
|
521
|
+
return void 0;
|
|
522
|
+
})())
|
|
523
|
+
: this.getRealmRoles().pipe(
|
|
524
|
+
switchMap((roles) => {
|
|
525
|
+
const role = roles.find((item) => item.name === roleName) || { name: roleName };
|
|
526
|
+
return this.http.delete<void>(`${this.realmUrl}/users/${userId}/role-mappings/realm`, {
|
|
527
|
+
body: [role],
|
|
528
|
+
});
|
|
529
|
+
})
|
|
530
|
+
);
|
|
531
|
+
|
|
532
|
+
return remove$.pipe(switchMap(() => this.reconcileUserPermissionsFromAssignedRoles(userId)));
|
|
533
|
+
}
|
|
534
|
+
|
|
535
|
+
addUserAttributes(
|
|
536
|
+
userId: string,
|
|
537
|
+
attributes: UserAttributes,
|
|
538
|
+
removedKeys: string[] = []
|
|
539
|
+
): Observable<UserRepresentation> {
|
|
540
|
+
return this.getUserById(userId).pipe(
|
|
541
|
+
switchMap((user) => {
|
|
542
|
+
const current = normalizeUserAttributes(user?.attributes || {});
|
|
543
|
+
const next: UserAttributes = { ...current, ...normalizeUserAttributes(attributes) };
|
|
544
|
+
removedKeys.forEach((key) => {
|
|
545
|
+
if (key && !PROTECTED_USER_ATTRIBUTE_KEYS.has(key.toLowerCase())) {
|
|
546
|
+
delete next[key];
|
|
547
|
+
}
|
|
548
|
+
});
|
|
549
|
+
return this.writeUserAttributes(userId, next);
|
|
550
|
+
})
|
|
551
|
+
);
|
|
552
|
+
}
|
|
553
|
+
|
|
554
|
+
getRealmRoleByName(roleName: string): Observable<RoleRepresentation | null> {
|
|
555
|
+
return this.getRealmRoles().pipe(
|
|
556
|
+
map((roles) => roles.find((role) => role.name === roleName) || null),
|
|
557
|
+
catchError(() => of(null))
|
|
558
|
+
);
|
|
559
|
+
}
|
|
560
|
+
|
|
561
|
+
reconcileUserPermissionsFromAssignedRoles(userId: string): Observable<void> {
|
|
562
|
+
return forkJoin({
|
|
563
|
+
user: this.getUserById(userId),
|
|
564
|
+
roles: this.getUserRealmRoles(userId),
|
|
565
|
+
}).pipe(
|
|
566
|
+
switchMap(({ user, roles }) => {
|
|
567
|
+
if (!roles.length) {
|
|
568
|
+
return this.replacePermissionAttributes(userId, user?.attributes || {}, {});
|
|
569
|
+
}
|
|
570
|
+
return forkJoin(roles.map((role) => this.resolveRoleAttributesRecursive(role.name || ''))).pipe(
|
|
571
|
+
switchMap((groups) => {
|
|
572
|
+
const union = mergePermissionAttributes(...groups);
|
|
573
|
+
return this.replacePermissionAttributes(userId, user?.attributes || {}, union);
|
|
574
|
+
})
|
|
575
|
+
);
|
|
576
|
+
}),
|
|
577
|
+
map(() => void 0)
|
|
578
|
+
);
|
|
579
|
+
}
|
|
580
|
+
|
|
581
|
+
syncAllRoleHoldersPermissions(
|
|
582
|
+
roleName: string
|
|
583
|
+
): Observable<{ synced: number; failed: number; total: number }> {
|
|
584
|
+
if (environment.useMockAuth) {
|
|
585
|
+
return of({ synced: mockUsers.length, failed: 0, total: mockUsers.length });
|
|
586
|
+
}
|
|
587
|
+
const holdersUrl = this.useAdminService
|
|
588
|
+
? `${this.adminServiceApi}/roles/${encodeURIComponent(roleName)}/users`
|
|
589
|
+
: `${this.realmUrl}/roles/${encodeURIComponent(roleName)}/users`;
|
|
590
|
+
return this.http.get<UserRepresentation[]>(holdersUrl).pipe(
|
|
591
|
+
catchError(() => of([] as UserRepresentation[])),
|
|
592
|
+
switchMap((users) => {
|
|
593
|
+
const total = users.length;
|
|
594
|
+
if (!total) {
|
|
595
|
+
return of({ synced: 0, failed: 0, total: 0 });
|
|
596
|
+
}
|
|
597
|
+
return forkJoin(
|
|
598
|
+
users.map((user) =>
|
|
599
|
+
this.reconcileUserPermissionsFromAssignedRoles(user.id || '').pipe(
|
|
600
|
+
map(() => true),
|
|
601
|
+
catchError(() => of(false))
|
|
602
|
+
)
|
|
603
|
+
)
|
|
604
|
+
).pipe(
|
|
605
|
+
map((results) => {
|
|
606
|
+
const synced = results.filter(Boolean).length;
|
|
607
|
+
return { synced, failed: total - synced, total };
|
|
608
|
+
})
|
|
609
|
+
);
|
|
610
|
+
})
|
|
611
|
+
);
|
|
612
|
+
}
|
|
613
|
+
|
|
614
|
+
private mergeUserAttributes(
|
|
615
|
+
userId: string,
|
|
616
|
+
current: Record<string, string[]>,
|
|
617
|
+
incoming: UserAttributes
|
|
618
|
+
): Observable<UserRepresentation> {
|
|
619
|
+
const merged = mergePermissionAttributes(normalizeUserAttributes(current), incoming);
|
|
620
|
+
return this.writeUserAttributes(userId, merged);
|
|
621
|
+
}
|
|
622
|
+
|
|
623
|
+
private replacePermissionAttributes(
|
|
624
|
+
userId: string,
|
|
625
|
+
current: Record<string, string[]>,
|
|
626
|
+
nextPermissions: UserAttributes
|
|
627
|
+
): Observable<UserRepresentation> {
|
|
628
|
+
const preserved: UserAttributes = {};
|
|
629
|
+
Object.entries(normalizeUserAttributes(current)).forEach(([key, values]) => {
|
|
630
|
+
if (PROTECTED_USER_ATTRIBUTE_KEYS.has(key.toLowerCase())) {
|
|
631
|
+
preserved[key] = values;
|
|
632
|
+
}
|
|
633
|
+
});
|
|
634
|
+
return this.writeUserAttributes(userId, { ...nextPermissions, ...preserved });
|
|
635
|
+
}
|
|
636
|
+
|
|
637
|
+
private writeUserAttributes(userId: string, attributes: UserAttributes): Observable<UserRepresentation> {
|
|
638
|
+
if (environment.useMockAuth) {
|
|
639
|
+
const user = mockUsers.find((item) => item.id === userId);
|
|
640
|
+
if (user) {
|
|
641
|
+
user.attributes = attributes;
|
|
642
|
+
writeMockStore();
|
|
643
|
+
return of(user);
|
|
644
|
+
}
|
|
645
|
+
return of({ id: userId, attributes });
|
|
646
|
+
}
|
|
647
|
+
|
|
648
|
+
if (this.useAdminService) {
|
|
649
|
+
return this.http
|
|
650
|
+
.patch<{ message?: string }>(`${this.adminServiceApi}/users/${userId}/attributes`, {
|
|
651
|
+
set: attributes,
|
|
652
|
+
remove: [],
|
|
653
|
+
})
|
|
654
|
+
.pipe(
|
|
655
|
+
switchMap(() => this.getUserById(userId)),
|
|
656
|
+
map((user) => user || { id: userId, attributes })
|
|
657
|
+
);
|
|
658
|
+
}
|
|
659
|
+
|
|
660
|
+
return this.getUserById(userId).pipe(
|
|
661
|
+
switchMap((user) => {
|
|
662
|
+
if (!user) {
|
|
663
|
+
return throwError(() => new Error(`User ${userId} was not found`));
|
|
664
|
+
}
|
|
665
|
+
const updated = { ...user, attributes };
|
|
666
|
+
return this.updateUser({ id: userId, ...updated }).pipe(map(() => updated));
|
|
667
|
+
})
|
|
668
|
+
);
|
|
669
|
+
}
|
|
670
|
+
}
|