feat(core-lib): add enabled for auth config (cloudforet-io#2446)

Signed-off-by: Wanjin Noh <[email protected]>
aurorastack · Dec 12, 2023 · 2445ff2 · 2445ff2
1 parent bd381aa
commit 2445ff2
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -113,15 +113,15 @@ Follow the example at `apps/web/public/config/development.sample.json`.
 
 Configuration for `DEV.MOCK` in the config file.
 
-| Name          | Description                                                                                                                                                                       | Required |
-|---------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------|
-| ENABLED       | boolean(false). Whether apply mock mode to api requests except for reflection apis.                                                                                               | X        |
-| REFLECTION_V1 | boolean(false). Whether to apply mock mode to reflection api v1 or not.                                                                                                           | X        |
-| REFLECTION_V2 | boolean(false). Whether to apply mock mode to reflection api v2 or not.                                                                                                           | X        |
-| ENDPOINT_V1   | string(""). Mock server endpoint for console api v1.                                                                                                                              | X        |
-| ENDPOINT_V2   | string(""). Mock server endpoint for console api v2.                                                                                                                              | X        |
+| Name          | Description                                                                                                                                                                        | Required |
+|---------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------|
+| ENABLED       | boolean(false). Whether apply mock mode to api requests except for reflection apis.                                                                                                | X        |
+| REFLECTION_V1 | boolean(false). Whether to apply mock mode to reflection api v1 or not.                                                                                                            | X        |
+| REFLECTION_V2 | boolean(false). Whether to apply mock mode to reflection api v2 or not.                                                                                                            | X        |
+| ENDPOINT_V1   | string(""). Mock server endpoint for console api v1.                                                                                                                               | X        |
+| ENDPOINT_V2   | string(""). Mock server endpoint for console api v2.                                                                                                                               | X        |
 | API_LIST_V1   | array of string([]). List of api v1 to enable mock mock mode. Refer to the [Rules for API_LIST](#####Rules for DEV.MOCK.API_LIST_V1 and DEV.MOCK.API_LIST_V2) section for details. | X        |
-| API_LIST_V2   | List of api v2 to enable mock mock mode. Refer to the [Rules for API_LIST](#####Rules for DEV.MOCK.API_LIST_V1 and DEV.MOCK.API_LIST_V2) section for details.                     | X        |
+| API_LIST_V2   | List of api v2 to enable mock mock mode. Refer to the [Rules for API_LIST](#####Rules for DEV.MOCK.API_LIST_V1 and DEV.MOCK.API_LIST_V2) section for details.                      | X        |
 
 ##### Rules for DEV.MOCK.API_LIST_V1 and DEV.MOCK.API_LIST_V2
 
@@ -136,10 +136,11 @@ e.g. ["/identity/*", "!/identity/domain/*"] : All apis in the `/identity/*` will
 
 Configuration for `DEV.AUTH` in the config file.
 
-| Name             | Description                                    | Required |
-|------------------|------------------------------------------------|----------|
-| SKIP_TOKEN_CHECK | Whether to skip checking token.                | X        |
-| API_KEY          | API key which is used instead of access token. | X        |
+| Name             | Description                                        | Required |
+|------------------|----------------------------------------------------|----------|
+| ENABLED          | boolean(false). Whether to use auth config or not. | X        |
+| SKIP_TOKEN_CHECK | Whether to skip checking token.                    | X        |
+| API_KEY          | API key which is used instead of access token.     | X        |
 
 
 ## Testing

diff --git a/apps/web/src/lib/site-initializer/api-client.ts b/apps/web/src/lib/site-initializer/api-client.ts
@@ -53,6 +53,7 @@ const getMockConfig = (config): MockConfig => ({
 });
 
 const getAuthConfig = (config): AuthConfig => ({
+    enabled: config.get('DEV.AUTH.ENABLED'),
     skipTokenCheck: config.get('DEV.AUTH.SKIP_TOKEN_CHECK'),
     apiKey: config.get('DEV.AUTH.API_KEY'),
 });

diff --git a/packages/core-lib/src/space-connector/index.ts b/packages/core-lib/src/space-connector/index.ts
@@ -124,7 +124,7 @@ export class SpaceConnector {
     }
 
     static get isTokenAlive(): boolean {
-        if (SpaceConnector.isDevMode && SpaceConnector.authConfig.skipTokenCheck) return true;
+        if (SpaceConnector.isDevMode && SpaceConnector.authConfig.enabled && SpaceConnector.authConfig.skipTokenCheck) return true;
         return TokenAPI.checkToken();
     }
 
@@ -192,7 +192,7 @@ export class SpaceConnector {
                 const axiosConfig = { ...config };
 
                 // set api key
-                if (SpaceConnector.authConfig.apiKey) {
+                if (SpaceConnector.authConfig.enabled && SpaceConnector.authConfig.apiKey) {
                     axiosConfig.headers = Object.assign(
                         axiosConfig.headers ?? {},
                         { Authorization: `Bearer ${SpaceConnector.authConfig.apiKey}` },

diff --git a/packages/core-lib/src/space-connector/type.ts b/packages/core-lib/src/space-connector/type.ts
@@ -93,6 +93,7 @@ export interface MockConfig {
     apiList?: string[][]; // [[v1_api_1, v1_api_2], [v2_api_1, v2_api_2, v2_api_3]]
 }
 export interface AuthConfig {
+    enabled?: boolean;
     skipTokenCheck?: boolean;
     apiKey?: string;
 }