修改OAuth2配置方式

Author: DeyiXu

.eslintrc.js

@@ -4,5 +4,8 @@ module.exports = {
     ANT_DESIGN_PRO_ONLY_DO_NOT_USE_IN_YOUR_PRODUCTION: true,
     page: true,
     REACT_APP_ENV: true,
+    OAUTH2_CLIENT_ID: true,
+    OAUTH2_SERVER: true,
+    OAUTH2_CALLBACK: true,
   },
 };

config/config.ts

@@ -182,4 +182,9 @@ export default defineConfig({
   manifest: {
     basePath: '/',
   },
+  define: {
+    OAUTH2_CLIENT_ID: '1000',
+    OAUTH2_SERVER: 'http://localhost:8080',
+    OAUTH2_CALLBACK: 'http://localhost:8800/auth/callback',
+  }
 });

config/nginx-default.conf

@@ -18,19 +18,19 @@ server {
     }
 
     location /api/auth/ {
-        proxy_pass http://192.168.1.111:8081/auth/;
+        proxy_pass http://naas-admin-token-server:8081/auth/;
         proxy_set_header   X-Forwarded-Proto $scheme;
         proxy_set_header   X-Real-IP         $remote_addr;
     }
 
     location /api/accounts/ {
-        proxy_pass http://192.168.1.111:8080/;
+        proxy_pass http://naas:8080/;
         proxy_set_header   X-Forwarded-Proto $scheme;
         proxy_set_header   X-Real-IP         $remote_addr;
     }
 
     location /api/ {
-        proxy_pass http://192.168.1.111:8080/api/v1/;
+        proxy_pass http://naas:8080/api/v1/;
         proxy_set_header   X-Forwarded-Proto $scheme;
         proxy_set_header   X-Real-IP         $remote_addr;
     }

src/layouts/SecurityLayout.tsx

@@ -4,7 +4,6 @@ import { connect, ConnectProps } from 'umi';
 import { stringify } from 'querystring';
 import { ConnectState } from '@/models/connect';
 import { CurrentUser } from '@/models/user';
-import { OAUTH2_CALLBACK, OAUTH2_CLIENT_ID, OAUTH2_SERVER } from '@/utils/constants';
 
 interface SecurityLayoutProps extends ConnectProps {
   loading?: boolean;

src/pages/auth/callback/index.tsx

@@ -3,7 +3,6 @@ import { history } from 'umi';
 import { Alert, Button } from 'antd';
 
 import { authCode } from '@/services/auth';
-import { OAUTH2_CALLBACK, OAUTH2_SERVER, OAUTH2_CLIENT_ID } from '@/utils/constants';
 import { setToken } from '@/utils/token';
 import styles from './style.less';
 

src/services/auth.ts

@@ -1,5 +1,4 @@
 import request from '@/utils/request';
-import { OAUTH2_CLIENT_ID } from '@/utils/constants';
 
 export interface CodeParamsType {
   code: string;

src/typings.d.ts

@@ -36,3 +36,7 @@ declare let ga: Function;
 declare let ANT_DESIGN_PRO_ONLY_DO_NOT_USE_IN_YOUR_PRODUCTION: 'site' | undefined;
 
 declare const REACT_APP_ENV: 'test' | 'dev' | 'pre' | false;
+
+declare let OAUTH2_CLIENT_ID;
+declare let OAUTH2_SERVER;
+declare let OAUTH2_CALLBACK;