Merge branch 'master' into issue--28941-Improve-Password-Validation

dotCMS · Aug 22, 2024 · eea049a · eea049a
2 parents 6047df2 + 78dafd3
commit eea049a
Show file tree

Hide file tree

Showing 36 changed files with 7,809 additions and 7,032 deletions.
diff --git a/.mvn/maven-build-cache-config.xml b/.mvn/maven-build-cache-config.xml
@@ -12,7 +12,7 @@ https://maven.apache.org/extensions/maven-build-cache-extension/maven-build-cach
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/BUILD-CACHE-CONFIG/1.0.0 https://maven.apache.org/xsd/build-cache-config-1.0.0.xsd">
     <configuration>
-        <enabled>true</enabled>
+        <enabled>false</enabled>
         <hashAlgorithm>SHA-256</hashAlgorithm>
         <validateXml>true</validateXml>
         <local>

diff --git a/bom/application/pom.xml b/bom/application/pom.xml
@@ -1433,6 +1433,13 @@
 
             <!-- Apache Tomcat -->
 
+            <dependency>
+                <groupId>com.dotcms</groupId>
+                <artifactId>tomcat-redis-session-manager</artifactId>
+                <version>1.3</version>
+                <scope>provided</scope>
+            </dependency>
+
             <dependency>
                 <!-- Jasper is the Tomcat JSP Engine -->
                 <groupId>org.apache.tomcat</groupId>

diff --git a/bom/logging/pom.xml b/bom/logging/pom.xml
@@ -15,8 +15,8 @@
     <properties>
         <maven.deploy.skip>false</maven.deploy.skip>
         <flatten.mode>bom</flatten.mode>
-        <log4j.version>2.20.0</log4j.version>
-        <slf4j.version>2.0.7</slf4j.version>
+        <log4j.version>2.23.1</log4j.version>
+        <slf4j.version>2.0.9</slf4j.version>
     </properties>
 
     <dependencyManagement>
@@ -27,30 +27,42 @@
              Do not include incompatible artifacts e.g. -->
             <dependency>
                 <groupId>org.apache.logging.log4j</groupId>
-                <artifactId>log4j-core</artifactId>
+                <artifactId>log4j-api</artifactId>
                 <version>${log4j.version}</version>
                 <scope>compile</scope>
             </dependency>
             <dependency>
                 <!-- Support log4j1.2.x API in Log4j2 -->
                 <groupId>org.apache.logging.log4j</groupId>
-                <artifactId>log4j-1.2-api</artifactId>
+                <artifactId>log4j-iostreams</artifactId>
+                <version>${log4j.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.logging.log4j</groupId>
+                <artifactId>log4j-core</artifactId>
                 <version>${log4j.version}</version>
                 <scope>compile</scope>
             </dependency>
+            <dependency>
+                <!-- Support Java Commons Logging API in Log4j2 -->
+                <groupId>org.apache.logging.log4j</groupId>
+                <artifactId>log4j-1.2-api</artifactId>
+                <version>${log4j.version}</version>
+                <scope>runtime</scope>
+            </dependency>
             <dependency>
                 <!-- Support Java Commons Logging API in Log4j2 -->
                 <groupId>org.apache.logging.log4j</groupId>
                 <artifactId>log4j-jcl</artifactId>
                 <version>${log4j.version}</version>
-                <scope>compile</scope>
+                <scope>runtime</scope>
             </dependency>
             <dependency>
                 <!-- Support SLF4j2 API in Log4j2 -->
                 <groupId>org.apache.logging.log4j</groupId>
                 <artifactId>log4j-slf4j2-impl</artifactId>
                 <version>${log4j.version}</version>
-                <scope>compile</scope>
+                <scope>runtime</scope>
             </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>
@@ -61,16 +73,16 @@
             <dependency>
                 <!-- Servlet container initialization of Log4j2 -->
                 <groupId>org.apache.logging.log4j</groupId>
-                <artifactId>log4j-web</artifactId>
+                <artifactId>log4j-appserver</artifactId>
                 <version>${log4j.version}</version>
-                <scope>compile</scope>
+                <scope>runtime</scope>
             </dependency>
             <dependency>
                 <!-- Async support for Log4J 2.x -->
                 <groupId>com.lmax</groupId>
                 <artifactId>disruptor</artifactId>
                 <version>3.3.4</version>
-                <scope>compile</scope>
+                <scope>runtime</scope>
             </dependency>
 
         </dependencies>

diff --git a/core-web/libs/sdk/angular/package.json b/core-web/libs/sdk/angular/package.json
@@ -1,11 +1,11 @@
 {
     "name": "@dotcms/angular",
-    "version": "0.0.1-alpha.31",
+    "version": "0.0.1-alpha.32",
     "peerDependencies": {
         "@angular/common": "^17.1.0",
         "@angular/core": "^17.1.0",
         "@angular/router": "^17.1.0",
-        "@dotcms/client": "0.0.1-alpha.31",
+        "@dotcms/client": "0.0.1-alpha.32",
         "@tinymce/tinymce-angular": "^8.0.0",
         "rxjs": "^7.8.0"
     },

diff --git a/core-web/libs/sdk/client/README.md b/core-web/libs/sdk/client/README.md
@@ -26,11 +26,23 @@ yarn add @dotcms/client
 
 ## Usage
 
-First, initialize the client with your DotCMS instance details.
+`@dotcms/client` supports both ES modules and CommonJS. You can import it using either syntax:
+
+### ES Modules
 
 ```javascript
 import { dotcmsClient } from '@dotcms/client';
+```
+
+### CommonJS
+
+```javascript
+const { dotcmsClient } = require('@dotcms/client');
+```
 
+First, initialize the client with your DotCMS instance details.
+
+```javascript
 const client = dotcmsClient.init({
     dotcmsUrl: 'https://your-dotcms-instance.com',
     authToken: 'your-auth-token',
@@ -107,4 +119,4 @@ Always refer to the official [DotCMS documentation](https://www.dotcms.com/docs/
 | Videos          | [Helpful Videos](http://dotcms.com/videos/)                         |
 | Forums/Listserv | [via Google Groups](https://groups.google.com/forum/#!forum/dotCMS) |
 | Twitter         | @dotCMS                                                             |
-| Main Site       | [dotCMS.com](https://dotcms.com/)                                   |
+| Main Site       | [dotCMS.com](https://dotcms.com/)                                   |
diff --git a/core-web/libs/sdk/client/package.json b/core-web/libs/sdk/client/package.json
@@ -1,7 +1,6 @@
 {
     "name": "@dotcms/client",
-    "version": "0.0.1-alpha.31",
-    "type": "module",
+    "version": "0.0.1-alpha.32",
     "description": "Official JavaScript library for interacting with DotCMS REST APIs.",
     "repository": {
         "type": "git",

diff --git a/core-web/libs/sdk/client/project.json b/core-web/libs/sdk/client/project.json
@@ -5,13 +5,16 @@
     "projectType": "library",
     "targets": {
         "build": {
-            "executor": "@nrwl/js:tsc",
+            "executor": "@nx/rollup:rollup",
             "outputs": ["{options.outputPath}"],
             "options": {
+                "format": ["esm", "cjs"],
+                "compiler": "tsc",
+                "generateExportsField": true,
+                "assets": [{ "input": ".", "output": ".", "glob": "*.md" }],
                 "outputPath": "dist/libs/sdk/client",
                 "main": "libs/sdk/client/src/index.ts",
-                "tsConfig": "libs/sdk/client/tsconfig.lib.json",
-                "assets": ["libs/sdk/client/*.md"]
+                "tsConfig": "libs/sdk/client/tsconfig.lib.json"
             }
         },
         "build:js": {
@@ -34,7 +37,7 @@
         "publish": {
             "executor": "nx:run-commands",
             "options": {
-                "command": "node tools/scripts/publish.mjs sdk-js-client {args.ver} {args.tag}"
+                "command": "node tools/scripts/publish.mjs sdk-client {args.ver} {args.tag}"
             },
             "dependsOn": ["build"]
         },

diff --git a/core-web/libs/sdk/client/src/index.ts b/core-web/libs/sdk/client/src/index.ts
@@ -1,6 +1,30 @@
-export * from './lib/client/sdk-js-client';
-export * from './lib/editor/sdk-editor';
-export * from './lib/editor/models/editor.model';
-export * from './lib/editor/models/client.model';
-export * from './lib/query-builder/sdk-query-builder';
-export * from './lib/utils';
+import { ClientConfig, DotCmsClient } from './lib/client/sdk-js-client';
+import { CUSTOMER_ACTIONS, postMessageToEditor } from './lib/editor/models/client.model';
+import {
+    CustomClientParams,
+    DotCMSPageEditorConfig,
+    EditorConfig
+} from './lib/editor/models/editor.model';
+import {
+    destroyEditor,
+    initEditor,
+    isInsideEditor,
+    updateNavigation
+} from './lib/editor/sdk-editor';
+import { getPageRequestParams, graphqlToPageEntity } from './lib/utils';
+
+export {
+    graphqlToPageEntity,
+    getPageRequestParams,
+    isInsideEditor,
+    DotCmsClient,
+    DotCMSPageEditorConfig,
+    CUSTOMER_ACTIONS,
+    CustomClientParams,
+    postMessageToEditor,
+    EditorConfig,
+    initEditor,
+    updateNavigation,
+    destroyEditor,
+    ClientConfig
+};
diff --git a/core-web/libs/sdk/client/tsconfig.lib.json b/core-web/libs/sdk/client/tsconfig.lib.json
@@ -3,7 +3,10 @@
     "compilerOptions": {
         "outDir": "../../../dist/out-tsc",
         "declaration": true,
-        "types": ["node"]
+        "types": [""],
+        "target": "es2020",
+        "module": "es2020",
+        "moduleResolution": "node"
     },
     "include": ["src/**/*.ts"],
     "exclude": ["jest.config.ts", "src/**/*.spec.ts", "src/**/*.test.ts"]

diff --git a/core-web/libs/sdk/experiments/package.json b/core-web/libs/sdk/experiments/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@dotcms/experiments",
-    "version": "0.0.1-alpha.31",
+    "version": "0.0.1-alpha.32",
     "description": "Official JavaScript library to use Experiments with DotCMS.",
     "repository": {
         "type": "git",
@@ -25,6 +25,6 @@
     "peerDependencies": {
         "react": ">=18",
         "react-dom": ">=18",
-        "@dotcms/client": "0.0.1-alpha.31"
+        "@dotcms/client": "0.0.1-alpha.32"
     }
 }
diff --git a/core-web/libs/sdk/react/package.json b/core-web/libs/sdk/react/package.json
@@ -1,10 +1,10 @@
 {
     "name": "@dotcms/react",
-    "version": "0.0.1-alpha.31",
+    "version": "0.0.1-alpha.32",
     "peerDependencies": {
         "react": ">=18",
         "react-dom": ">=18",
-        "@dotcms/client": "0.0.1-alpha.31"
+        "@dotcms/client": "0.0.1-alpha.32"
     },
     "description": "Official React Components library to render a dotCMS page.",
     "repository": {

diff --git a/core-web/tools/scripts/publish.mjs b/core-web/tools/scripts/publish.mjs
@@ -56,4 +56,4 @@ try {
 }
 
 // Execute "npm publish" to publish
-execSync(`npm publish --access public --tag ${tag}`);
+execSync(`npm publish --access public --tag ${tag} --dry-run`);