MaxKey %!s(int64=3) %!d(string=hai) anos
pai
achega
85be01dafa

+ 2 - 2
README.md

@@ -2,7 +2,7 @@
     <img src="images/logo_maxkey.png?raw=true"  width="200px"   alt=""/>
 </p>
 <p align="center">
-  <strong>Leading-Edge IAM Identity and Access management Product</strong>
+  <strong>Leading-Edge IAM Identity and Access Management Product</strong>
 </p>     
 <p align="center" >
 <a href="README_en.md" target="_blank"><b>English</b></a>  |  <a href="README_zh.md" target="_blank"><b>中文</b></a>
@@ -24,7 +24,7 @@
 
 # Overview
 
-<b>Maxkey </b> Single Sign On system, which means the Maximum key, <b>Leading-Edge IAM Identity and Access management product </b>, Support OAuth 2.x/OPENID CONNECT, SAML 2.0, JWT, CAS, SCIM and other standard protocols, and provide <b> Simple, Standard, Secure and Open </b> Identity management (IDM), Access management (AM), Single Sign On (SSO), RBAC permission management and Resource management.
+<b>Maxkey </b> Single Sign On system, which means the Maximum key, <b>Leading-Edge IAM Identity and Access Management product </b>, Support OAuth 2.x/OPENID CONNECT, SAML 2.0, JWT, CAS, SCIM and other standard protocols, and provide <b> Simple, Standard, Secure and Open </b> Identity management (IDM), Access management (AM), Single Sign On (SSO), RBAC permission management and Resource management.
 
 Official Website <a href="https://www.maxkey.top" target="_blank"><b>Official</b></a> |  <a href="https://maxkeytop.gitee.io" target="_blank"><b>Line2</b></a>
 

+ 2 - 2
README_en.md

@@ -2,7 +2,7 @@
     <img src="images/logo_maxkey.png?raw=true"  width="200px"   alt=""/>
 </p> 
 <p align="center">
-  <strong>Leading-Edge IAM Identity and Access management Product</strong>
+  <strong>Leading-Edge IAM Identity and Access Management Product</strong>
 </p>  
 <p align="center" >
 <a href="README_en.md" target="_blank"><b>English</b></a>  |  <a href="README_zh.md" target="_blank"><b>中文</b></a>
@@ -24,7 +24,7 @@
 
 # Overview
 
-<b>Maxkey </b> Single Sign On system, which means the Maximum key, <b>Leading-Edge IAM Identity and Access management product </b>, Support OAuth 2.x/OPENID CONNECT, SAML 2.0, JWT, CAS, SCIM and other standard protocols, and provide <b> Simple, Standard, Secure and Open </b> Identity management (IDM), Access management (AM), Single Sign On (SSO), RBAC permission management and Resource management.
+<b>Maxkey </b> Single Sign On system, which means the Maximum key, <b>Leading-Edge IAM Identity and Access Management product </b>, Support OAuth 2.x/OPENID CONNECT, SAML 2.0, JWT, CAS, SCIM and other standard protocols, and provide <b> Simple, Standard, Secure and Open </b> Identity management (IDM), Access management (AM), Single Sign On (SSO), RBAC permission management and Resource management.
 
 Official Website <a href="https://www.maxkey.top" target="_blank"><b>Official</b></a> |  <a href="https://maxkeytop.gitee.io" target="_blank"><b>Line2</b></a>
 

+ 1 - 1
maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/provider/NormalAuthenticationProvider.java

@@ -57,7 +57,7 @@ public class NormalAuthenticationProvider extends AbstractAuthenticationProvider
     public NormalAuthenticationProvider(
     		AbstractAuthenticationRealm authenticationRealm,
     		ApplicationConfig applicationConfig,
-    	    SessionManager sessionService,
+    	    SessionManager sessionManager,
     	    AuthJwtService authJwtService) {
 		this.authenticationRealm = authenticationRealm;
 		this.applicationConfig = applicationConfig;

+ 16 - 5
maxkey-web-frontend/maxkey-web-app/package-lock.json

@@ -1,13 +1,13 @@
 {
-  "name": "ng-alain",
-  "version": "13.4.0",
+  "name": "maxkey",
+  "version": "3.5.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
-      "name": "ng-alain",
-      "version": "13.4.0",
-      "license": "MIT",
+      "name": "maxkey",
+      "version": "3.5.0",
+      "license": "Apache-2.0",
       "dependencies": {
         "@angular/animations": "~13.3.0",
         "@angular/common": "~13.3.0",
@@ -29,6 +29,7 @@
         "ajv": "^8.10.0",
         "ajv-formats": "^2.1.1",
         "crypto-js": "^4.1.1",
+        "monaco-editor": "^0.33.0",
         "ng-zorro-antd": "^13.1.1",
         "ngx-cookie-service": "^13.2.0",
         "ngx-tinymce": "^13.0.0",
@@ -14033,6 +14034,11 @@
         "node": "^12.20.0 || >=14"
       }
     },
+    "node_modules/monaco-editor": {
+      "version": "0.33.0",
+      "resolved": "https://registry.npmmirror.com/monaco-editor/-/monaco-editor-0.33.0.tgz",
+      "integrity": "sha512-VcRWPSLIUEgQJQIE0pVT8FcGBIgFoxz7jtqctE+IiCxWugD0DwgyQBcZBhdSrdMC84eumoqMZsGl2GTreOzwqw=="
+    },
     "node_modules/ms": {
       "version": "2.1.3",
       "resolved": "https://registry.npmmirror.com/ms/-/ms-2.1.3.tgz",
@@ -32236,6 +32242,11 @@
         }
       }
     },
+    "monaco-editor": {
+      "version": "0.33.0",
+      "resolved": "https://registry.npmmirror.com/monaco-editor/-/monaco-editor-0.33.0.tgz",
+      "integrity": "sha512-VcRWPSLIUEgQJQIE0pVT8FcGBIgFoxz7jtqctE+IiCxWugD0DwgyQBcZBhdSrdMC84eumoqMZsGl2GTreOzwqw=="
+    },
     "ms": {
       "version": "2.1.3",
       "resolved": "https://registry.npmmirror.com/ms/-/ms-2.1.3.tgz",

+ 1 - 0
maxkey-web-frontend/maxkey-web-app/package.json

@@ -60,6 +60,7 @@
     "ajv": "^8.10.0",
     "ajv-formats": "^2.1.1",
     "crypto-js": "^4.1.1",
+    "monaco-editor": "^0.33.0",
     "ng-zorro-antd": "^13.1.1",
     "ngx-cookie-service": "^13.2.0",
     "ngx-tinymce": "^13.0.0",

+ 16 - 5
maxkey-web-frontend/maxkey-web-mgt-app/package-lock.json

@@ -1,13 +1,13 @@
 {
-  "name": "ng-alain",
-  "version": "13.4.0",
+  "name": "maxkey",
+  "version": "3.5.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
-      "name": "ng-alain",
-      "version": "13.4.0",
-      "license": "MIT",
+      "name": "maxkey",
+      "version": "3.5.0",
+      "license": "Apache-2.0",
       "dependencies": {
         "@angular/animations": "~13.3.0",
         "@angular/common": "~13.3.0",
@@ -29,6 +29,7 @@
         "ajv": "^8.10.0",
         "ajv-formats": "^2.1.1",
         "crypto-js": "^4.1.1",
+        "monaco-editor": "^0.33.0",
         "ng-zorro-antd": "^13.1.1",
         "ngx-cookie-service": "^13.2.0",
         "ngx-tinymce": "^13.0.0",
@@ -14033,6 +14034,11 @@
         "node": "^12.20.0 || >=14"
       }
     },
+    "node_modules/monaco-editor": {
+      "version": "0.33.0",
+      "resolved": "https://registry.npmmirror.com/monaco-editor/-/monaco-editor-0.33.0.tgz",
+      "integrity": "sha512-VcRWPSLIUEgQJQIE0pVT8FcGBIgFoxz7jtqctE+IiCxWugD0DwgyQBcZBhdSrdMC84eumoqMZsGl2GTreOzwqw=="
+    },
     "node_modules/ms": {
       "version": "2.1.3",
       "resolved": "https://registry.npmmirror.com/ms/-/ms-2.1.3.tgz",
@@ -32236,6 +32242,11 @@
         }
       }
     },
+    "monaco-editor": {
+      "version": "0.33.0",
+      "resolved": "https://registry.npmmirror.com/monaco-editor/-/monaco-editor-0.33.0.tgz",
+      "integrity": "sha512-VcRWPSLIUEgQJQIE0pVT8FcGBIgFoxz7jtqctE+IiCxWugD0DwgyQBcZBhdSrdMC84eumoqMZsGl2GTreOzwqw=="
+    },
     "ms": {
       "version": "2.1.3",
       "resolved": "https://registry.npmmirror.com/ms/-/ms-2.1.3.tgz",

+ 1 - 0
maxkey-web-frontend/maxkey-web-mgt-app/package.json

@@ -60,6 +60,7 @@
     "ajv": "^8.10.0",
     "ajv-formats": "^2.1.1",
     "crypto-js": "^4.1.1",
+    "monaco-editor": "^0.33.0",
     "ng-zorro-antd": "^13.1.1",
     "ngx-cookie-service": "^13.2.0",
     "ngx-tinymce": "^13.0.0",