feat: user login and console route guard. (#311)

* build: gen new [email protected] and publish to npm center repo in @runikaros/api-client * feat: finish login and console route guard. * fix: unit test cases run fail in ci. * update: disable some unit test cases in FormLoginTests and FormLogoutTests. * update: console login page that add enter operate. * feat: logout * chore: update github ci that add ignore console dir.
ikaros-dev · Jun 6, 2023 · 662e1d0 · 662e1d0
1 parent 7c24e80
commit 662e1d0
Show file tree

Hide file tree

Showing 67 changed files with 3,890 additions and 508 deletions.
diff --git a/.github/workflows/ikaros-server-ci.yml b/.github/workflows/ikaros-server-ci.yml
@@ -16,6 +16,7 @@ on:
       - 'gradle.properties'
       - 'lombok.config'
       - 'settings.gradle'
+      - '!console/**'
   pull_request:
     branches:
       - master
@@ -29,6 +30,7 @@ on:
       - 'gradle.properties'
       - 'lombok.config'
       - 'settings.gradle'
+      - '!console/**'
 
 jobs:
   check:

diff --git a/api/src/main/java/run/ikaros/api/constant/SecurityConst.java b/api/src/main/java/run/ikaros/api/constant/SecurityConst.java
@@ -11,6 +11,12 @@ public interface SecurityConst {
 
     Long UID_WHEN_NO_AUTH = 0L;
 
+    // String LOGIN_PAGE_PATH = "/console/#/login";
+
+    String[] SECURITY_MATCHER_PATHS = new String[]{
+        "/api/**", "/apis/**", "/login", "/logout"
+    };
+
     interface AnonymousUser {
         String PRINCIPAL = "anonymousUser";
 

diff --git a/console/.env.development b/console/.env.development
@@ -1,2 +1,3 @@
-VITE_API_URL=http://localhost:9999
+VITE_API_URL=
 VITE_BASE_URL=/console/
+VITE_SERVER_URL=http://localhost:9999
diff --git a/console/.env.production b/console/.env.production
@@ -1,2 +1,3 @@
 VITE_API_URL=
 VITE_BASE_URL=/console/
+VITE_SERVER_URL=
diff --git a/console/index.html b/console/index.html
@@ -20,7 +20,7 @@
         JavaScript enabled. Please enable it to continue.
       </strong>
     </noscript>
-    <div id="app"></div>
+    <div id="app" style="height: 100%;"></div>
     <script type="module" src="/src/main.ts"></script>
   </body>
 </html>
diff --git a/console/package.json b/console/package.json
@@ -1,7 +1,7 @@
 {
   "name": "console",
   "private": true,
-  "version": "0.0.0",
+  "version": "0.2.0",
   "type": "module",
   "scripts": {
     "dev": "vite",
@@ -22,6 +22,7 @@
     "@vueuse/router": "^9.6.0",
     "@vueuse/shared": "^9.6.0",
     "axios": "^0.27.2",
+    "qs": "^6.11.1",
     "element-plus": "^2.3.5",
     "pinia": "^2.0.33",
     "pinia-plugin-persist": "^1.0.0",
@@ -58,6 +59,7 @@
     "sass": "^1.56.2",
     "typescript": "^4.9.5",
     "unplugin-auto-import": "^0.16.2",
+    "unplugin-icons": "^0.16.2",
     "unplugin-vue-components": "^0.24.1",
     "vite": "^4.0.4",
     "vite-plugin-compression2": "^0.9.1",

diff --git a/console/packages/api-client/README.md b/console/packages/api-client/README.md
@@ -22,15 +22,15 @@ pnpm build
 
 1. 先启动服务端
 
-2. 生成 TS 代码
+2. `package.json` 版本 patch 号加一，
+   例子：从 `0.0.0` => `0.0.1`
+
+3. 生成 TS 代码
 
 ```bash
 pnpm gen
 ```
 
-3. `package.json` 版本 patch 号加一，
-   例子：从 `0.0.0` => `0.0.1`
-
 4. 编译 TS 代码
 
 ```bash
@@ -49,6 +49,8 @@ npm publish
 
 6. git 提交
 
+选择当前目录下的更改进行`git add`
+
 ```bash
-git commit -am "build: gen new api-client and publish to npm center repo in @runikaros/api-client"
+git commit -m "build: gen new api-client@x.y.z and publish to npm center repo in @runikaros/api-client"
 ```
diff --git a/console/packages/api-client/package.json b/console/packages/api-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@runikaros/api-client",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "description": "Project ikaros console api-client package",
   "type": "module",
   "scripts": {

diff --git a/console/packages/api-client/src/.openapi-generator/FILES b/console/packages/api-client/src/.openapi-generator/FILES
@@ -1,12 +1,14 @@
 .gitignore
 .npmignore
 api.ts
+api/actuator-api.ts
 api/file-ikaros-run-v1alpha1-file-policy-api.ts
 api/file-ikaros-run-v1alpha1-file-setting-api.ts
 api/plugin-ikaros-run-v1alpha1-plugin-api.ts
 api/v1alpha1-file-api.ts
 api/v1alpha1-subject-api.ts
 api/v1alpha1-subject-relation-api.ts
+api/v1alpha1-user-api.ts
 base.ts
 common.ts
 configuration.ts
@@ -19,9 +21,12 @@ models/file-entity.ts
 models/file-policy.ts
 models/file-setting.ts
 models/index.ts
+models/link.ts
 models/model-file.ts
 models/paging-wrap.ts
 models/plugin.ts
 models/subject-image.ts
 models/subject-relation.ts
 models/subject.ts
+models/user-entity.ts
+models/user.ts
diff --git a/console/packages/api-client/src/api.ts b/console/packages/api-client/src/api.ts
@@ -12,9 +12,11 @@
  * Do not edit the class manually.
  */
 
+export * from './api/actuator-api';
 export * from './api/file-ikaros-run-v1alpha1-file-policy-api';
 export * from './api/file-ikaros-run-v1alpha1-file-setting-api';
 export * from './api/plugin-ikaros-run-v1alpha1-plugin-api';
 export * from './api/v1alpha1-file-api';
 export * from './api/v1alpha1-subject-api';
 export * from './api/v1alpha1-subject-relation-api';
+export * from './api/v1alpha1-user-api';