fix: an infinite loop in login (#134)

Author: xiaojingming

src/core/webview/webviewMessageHandler.ts

@@ -1106,11 +1106,7 @@ export const webviewMessageHandler = async (provider: ClineProvider, message: We
 			if (message.text && message.apiConfiguration) {
 				await provider.upsertApiConfiguration(message.text, {
 					...message.apiConfiguration,
-					zgsmBaseUrl:
-						`${message.apiConfiguration.zgsmBaseUrl || message.apiConfiguration.zgsmDefaultBaseUrl}`.replace(
-							/\/+$/,
-							"",
-						),
+					zgsmBaseUrl: `${message.apiConfiguration.zgsmBaseUrl}`.replace(/\/+$/, ""),
 				})
 			}
 			break

src/zgsmAuth/zgsmAuthHandler.ts

@@ -75,7 +75,7 @@ export async function afterZgsmPostLogin({
 }) {
 	try {
 		const [zgsmModels, zgsmDefaultModelId, err] = await getZgsmModels(
-			apiConfiguration.zgsmBaseUrl || defaultZgsmAuthConfig.baseUrl,
+			apiConfiguration?.zgsmBaseUrl || apiConfiguration?.zgsmDefaultBaseUrl || defaultZgsmAuthConfig.baseUrl,
 			accessToken,
 			apiConfiguration.openAiHostHeader,
 		)

zgsm/src/codeCompletion/completionClient.ts

@@ -43,7 +43,10 @@ export class CompletionClient {
 	private async getApiConfig(hasView: boolean, apiConfiguration: any) {
 		if (hasView) {
 			return {
-				baseUrl: apiConfiguration.zgsmBaseUrl || defaultZgsmAuthConfig.baseUrl,
+				baseUrl:
+					apiConfiguration.zgsmBaseUrl ||
+					apiConfiguration.zgsmDefaultBaseUrl ||
+					defaultZgsmAuthConfig.baseUrl,
 				completionUrl: apiConfiguration.zgsmCompletionUrl || defaultZgsmAuthConfig.completionUrl,
 				apiKey: apiConfiguration.zgsmApiKey || NOT_PROVIDERED,
 			}

zgsm/src/common/services.ts

@@ -440,7 +440,9 @@ export async function handleStatusBarClick() {
 	if (needLogin) {
 		statusBarloginCallback({
 			...apiConfiguration,
-			zgsmBaseUrl: hasView ? apiConfiguration.zgsmBaseUrl : (globalStateZgsmBaseUrl as string),
+			zgsmBaseUrl: hasView
+				? apiConfiguration.zgsmBaseUrl || apiConfiguration.zgsmDefaultBaseUrl
+				: (globalStateZgsmBaseUrl as string),
 		})
 
 		return