Remove UserPermissions-Module (vivid-planet#1487)

As it introduces incompatibilities and will be added when usable in the next Comet version
VP-DS · Jan 12, 2024 · 4a2a9a0 · 4a2a9a0
1 parent 209688d
commit 4a2a9a0
Show file tree

Hide file tree

Showing 43 changed files with 105 additions and 1,776 deletions.
diff --git a/demo/admin/src/App.tsx b/demo/admin/src/App.tsx
@@ -20,7 +20,6 @@ import {
     SiteConfig,
     SitePreview,
     SitesConfigProvider,
-    UserPermissionsPage,
 } from "@comet/cms-admin";
 import { css, Global } from "@emotion/react";
 import { createApolloClient } from "@src/common/apollo/createApolloClient";
@@ -215,10 +214,6 @@ class App extends React.Component {
                                                                                         path={`${match.path}/product-tags`}
                                                                                         component={ProductTagsPage}
                                                                                     />
-                                                                                    <RouteWithErrorBoundary
-                                                                                        path={`${match.path}/user-permissions`}
-                                                                                        component={UserPermissionsPage}
-                                                                                    />
 
                                                                                     <Redirect from={`${match.path}`} to={`${match.url}/dashboard`} />
                                                                                 </Switch>

diff --git a/demo/admin/src/common/MasterMenu.tsx b/demo/admin/src/common/MasterMenu.tsx
@@ -83,11 +83,6 @@ const MasterMenu: React.FC = () => {
                 <MenuItemRouterLink primary="Tags" to={`${match.url}/product-tags`} icon={<Snips />} />
                 <MenuItemRouterLink primary="Products Handmade" to={`${match.url}/products-handmade`} icon={<Snips />} />
             </MenuCollapsibleItem>
-            <MenuItemRouterLink
-                primary={intl.formatMessage({ id: "menu.userPermissions", defaultMessage: "User Permissions" })}
-                to={`${match.url}/user-permissions`}
-                icon={<Snips />}
-            />
         </Menu>
     );
 };

diff --git a/demo/api/schema.gql b/demo/api/schema.gql
@@ -127,38 +127,6 @@ type FilenameResponse {
   isOccupied: Boolean!
 }
 
-type CurrentUserPermission {
-  permission: String!
-}
-
-type User {
-  id: String!
-  name: String!
-  email: String!
-  language: String!
-}
-
-type UserPermission {
-  id: ID!
-  source: UserPermissionSource
-  permission: String!
-  validFrom: DateTime
-  validTo: DateTime
-  reason: String
-  requestedBy: String
-  approvedBy: String
-}
-
-enum UserPermissionSource {
-  MANUAL
-  BY_RULE
-}
-
-type PaginatedUserList {
-  nodes: [User!]!
-  totalCount: Int!
-}
-
 type Link implements DocumentInterface {
   id: ID!
   updatedAt: DateTime!
@@ -585,13 +553,6 @@ input RedirectScopeInput {
 
 type Query {
   currentUser: CurrentUser!
-  userPermissionsUserById(id: String!): User!
-  userPermissionsUsers(offset: Int! = 0, limit: Int! = 25, search: String, filter: UserFilter, sort: [UserSort!]): PaginatedUserList!
-  userPermissionsPermissionList(userId: String!): [UserPermission!]!
-  userPermissionsPermission(id: ID!, userId: String): UserPermission!
-  userPermissionsAvailablePermissions: [String!]!
-  userPermissionsContentScopes(userId: String!, skipManual: Boolean): [JSONObject!]!
-  userPermissionsAvailableContentScopes: [JSONObject!]!
   buildTemplates: [BuildTemplate!]!
   builds(limit: Float): [Build!]!
   autoBuildStatus: AutoBuildStatus!
@@ -637,35 +598,6 @@ type Query {
   productTags(offset: Int! = 0, limit: Int! = 25, search: String, filter: ProductTagFilter, sort: [ProductTagSort!]): PaginatedProductTags!
 }
 
-input UserFilter {
-  name: StringFilter
-  email: StringFilter
-  status: StringFilter
-  language: StringFilter
-  and: [UserFilter!]
-  or: [UserFilter!]
-}
-
-input StringFilter {
-  contains: String
-  startsWith: String
-  endsWith: String
-  equal: String
-  notEqual: String
-}
-
-input UserSort {
-  field: UserSortField!
-  direction: SortDirection! = ASC
-}
-
-enum UserSortField {
-  name
-  email
-  status
-  language
-}
-
 enum SortDirection {
   ASC
   DESC
@@ -697,6 +629,14 @@ input RedirectFilter {
   or: [RedirectFilter!]
 }
 
+input StringFilter {
+  contains: String
+  startsWith: String
+  endsWith: String
+  equal: String
+  notEqual: String
+}
+
 input BooleanFilter {
   equal: Boolean
 }
@@ -884,10 +824,6 @@ enum ProductTagSortField {
 
 type Mutation {
   currentUserSignOut: String!
-  userPermissionsCreatePermission(userId: String!, input: UserPermissionInput!): UserPermission!
-  userPermissionsUpdatePermission(id: String!, input: UserPermissionInput!): UserPermission!
-  userPermissionsDeletePermission(id: ID!): Boolean!
-  userPermissionsUpdateContentScopes(userId: String!, input: UserContentScopesInput!): [JSONObject!]!
   createBuilds(input: CreateBuildsInput!): Boolean!
   saveLink(linkId: ID!, input: LinkInput!, attachedPageTreeNodeId: ID!, lastUpdatedAt: DateTime): Link!
   savePage(pageId: ID!, input: PageInput!, attachedPageTreeNodeId: ID!, lastUpdatedAt: DateTime): Page!
@@ -938,19 +874,6 @@ type Mutation {
   deleteProductTag(id: ID!): Boolean!
 }
 
-input UserPermissionInput {
-  permission: String!
-  validFrom: DateTime
-  validTo: DateTime
-  reason: String
-  requestedBy: String
-  approvedBy: String
-}
-
-input UserContentScopesInput {
-  contentScopes: [JSONObject!]! = []
-}
-
 input CreateBuildsInput {
   names: [String!]!
 }

diff --git a/demo/api/src/app.module.ts b/demo/api/src/app.module.ts
@@ -18,7 +18,6 @@ import {
     PageTreeService,
     PublicUploadModule,
     RedirectsModule,
-    UserPermissionsModule,
 } from "@comet/cms-api";
 import { ApolloDriver } from "@nestjs/apollo";
 import { DynamicModule, Module } from "@nestjs/common";
@@ -32,7 +31,6 @@ import { PredefinedPage } from "@src/predefined-page/entities/predefined-page.en
 import { Request } from "express";
 
 import { AuthModule } from "./auth/auth.module";
-import { UserService } from "./auth/user.service";
 import { DamScope } from "./dam/dto/dam-scope";
 import { DamFile } from "./dam/entities/dam-file.entity";
 import { DamFolder } from "./dam/entities/dam-folder.entity";
@@ -84,19 +82,6 @@ export class AppModule {
                         return user.domains.includes(requestScope.domain);
                     },
                 }),
-                UserPermissionsModule.forRootAsync({
-                    useFactory: (userService: UserService) => ({
-                        availablePermissions: ["news", "products"],
-                        availableContentScopes: [
-                            { domain: "main", language: "de" },
-                            { domain: "main", language: "en" },
-                            { domain: "secondary", language: "en" },
-                        ],
-                        userService,
-                    }),
-                    inject: [UserService],
-                    imports: [AuthModule],
-                }),
                 BlocksModule.forRoot({
                     imports: [PagesModule],
                     useFactory: (pageTreeService: PageTreeService, filesService: FilesService, imagesService: ImagesService) => {

diff --git a/demo/api/src/auth/auth.module.ts b/demo/api/src/auth/auth.module.ts
@@ -3,7 +3,6 @@ import { Module } from "@nestjs/common";
 import { APP_GUARD } from "@nestjs/core";
 
 import { CurrentUser } from "./current-user";
-import { UserService } from "./user.service";
 
 @Module({
     providers: [
@@ -24,8 +23,6 @@ import { UserService } from "./user.service";
             provide: APP_GUARD,
             useClass: createCometAuthGuard(["static-authed-user"]),
         },
-        UserService,
     ],
-    exports: [UserService],
 })
 export class AuthModule {}
diff --git a/demo/api/src/auth/permission.interface.ts b/demo/api/src/auth/permission.interface.ts
diff --git a/demo/api/src/auth/user.service.ts b/demo/api/src/auth/user.service.ts
diff --git a/packages/admin/cms-admin/src/index.ts b/packages/admin/cms-admin/src/index.ts
@@ -86,7 +86,6 @@ export type { SiteConfig } from "./sitesConfig/SitesConfigContext";
 export { SitesConfigProvider } from "./sitesConfig/SitesConfigProvider";
 export { useSiteConfig } from "./sitesConfig/useSiteConfig";
 export { useSitesConfig } from "./sitesConfig/useSitesConfig";
-export { UserPermissionsPage } from "./userPermissions/UserPermissionsPage";
 // eslint-disable-next-line @typescript-eslint/no-unused-vars, unused-imports/no-unused-imports
 import emotionStyled from "@emotion/styled";
 // eslint-disable-next-line @typescript-eslint/no-unused-vars, unused-imports/no-unused-imports