chore: replace clientSecret in github ci

Author: laggage

.github/workflows/marketplace-publish.yml

@@ -33,6 +33,8 @@ jobs:
     - run: npm i -g vsce 
     # replace client_id
     - run: sed -i "s/clientId:\ 'vscode-cnb'/clientId:\ '${{ secrets.OAUTHCLIENTID }}'/" src/models/config.ts
+    # replace client_secret
+    - run: sed -i "s/clientId:\ ''/clientSecret:\ '${{ secrets.OAUTHCLIENTSECRET }}'/" src/models/config.ts
     - run: echo "src/models/config.ts\n" && cat src/models/config.ts
     # use env.VERSION to replace version property in package.json
     - run: sed -i 's/\"version\":\ \"[0-9]\.[0-9]\.[0-9]\"/\"version\":\ \"${{ env.VERSION }}\"/' package.json

src/models/config.ts

@@ -1,10 +1,13 @@
+import { env } from 'process';
+
 export interface IConfig {
     oauth: {
         authority: string;
         tokenEndpoint: string;
         authorizeEndpoint: string;
         userInfoEndpoint: string;
         clientId: string;
+        clientSecret: string;
         responseType: string;
         scope: string;
         revocationEndpoint: string;
@@ -23,6 +26,7 @@ export const defaultConfig: IConfig = {
         authorizeEndpoint: '/connect/authorize',
         userInfoEndpoint: '/connect/userinfo',
         clientId: 'vscode-cnb',
+        clientSecret: '',
         responseType: 'code',
         scope: 'openid profile CnBlogsApi CnblogsAdminApi',
         revocationEndpoint: '/connection/revocation',
@@ -32,7 +36,9 @@ export const defaultConfig: IConfig = {
 
 export const devConfig = Object.assign({}, defaultConfig, {
     oauth: Object.assign({}, defaultConfig.oauth, {
-        authority: 'https://my-oauth.cnblogs.com',
+        authority: env.Authority ? env.Authority : 'https://my-oauth.cnblogs.com',
+        clientId: env.ClientId ? env.ClientId : 'vscode-cnb',
+        clientSecret: env.ClientSecret ? env.ClientSecret : '',
     }),
     apiBaseUrl: 'https://admin.cnblogs.com',
 });

src/services/account.service.ts

@@ -44,7 +44,7 @@ export class AccountService extends vscode.Disposable {
                 this.handleAuthorized(authorizationInfo);
             }
         });
-        const { clientId, responseType, scope, authorizeEndpoint, authority } = globalState.config.oauth;
+        const { clientId, responseType, scope, authorizeEndpoint, authority, clientSecret } = globalState.config.oauth;
         let url = `${authority}${authorizeEndpoint}`;
         const search = new URLSearchParams([
             ['client_id', clientId],
@@ -54,6 +54,7 @@ export class AccountService extends vscode.Disposable {
             ['code_challenge', codeChallenge],
             ['code_challenge_method', 'S256'],
             ['scope', scope],
+            ['client_secret', clientSecret],
         ]);
         url = `${url}?${search}`;
         await vscode.commands.executeCommand('vscode.open', vscode.Uri.parse(url));