user preference change for token

Author: Rohit3523

app/lib/methods/helpers/fetch.test.ts

@@ -89,11 +89,16 @@ describe('helpers/fetch', () => {
 describe('helpers/fetch setBasicAuth', () => {
 	it('delegates to sdk.setBasicAuth', () => {
 		setBasicAuth('dXNlcjpwYXNz');
-		expect(sdk.setBasicAuth).toHaveBeenCalledWith('dXNlcjpwYXNz');
+		expect(sdk.setBasicAuth).toHaveBeenCalledWith('dXNlcjpwYXNz', undefined);
 	});
 
 	it('forwards null to clear basic auth', () => {
 		setBasicAuth(null);
-		expect(sdk.setBasicAuth).toHaveBeenCalledWith(null);
+		expect(sdk.setBasicAuth).toHaveBeenCalledWith(null, undefined);
+	});
+
+	it('forwards an explicit server so the target-server key is used, not the sdk-tracked one', () => {
+		setBasicAuth('dXNlcjpwYXNz', 'https://new.example.com');
+		expect(sdk.setBasicAuth).toHaveBeenCalledWith('dXNlcjpwYXNz', 'https://new.example.com');
 	});
 });

app/lib/methods/helpers/fetch.ts

@@ -13,8 +13,8 @@ interface IOptions {
 
 export { headers };
 
-export const setBasicAuth = (basicAuth: string | null): void => {
-	sdk.setBasicAuth(basicAuth);
+export const setBasicAuth = (basicAuth: string | null, server?: string): void => {
+	sdk.setBasicAuth(basicAuth, server);
 };
 
 export const BASIC_AUTH_KEY = 'BASIC_AUTH_KEY';

app/lib/services/sdk.test.ts

@@ -764,6 +764,20 @@ describe('Sdk header lifecycle', () => {
 		delete (headers as any).Authorization; // mutate the returned copy
 		expect(sdk.getHeaders().Authorization).toBe('Basic dXNlcjpwYXNz');
 	});
+
+	it('persists setBasicAuth under an explicitly passed server, not the stale this.serverUrl (switch-server regression)', () => {
+		(sdk as any).serverUrl = 'https://old.example.com';
+		sdk.setBasicAuth('dXNlcjpwYXNz', 'https://new.example.com');
+		expect(UserPreferences.setString).toHaveBeenCalledWith('BASIC_AUTH_KEY-https://new.example.com', 'dXNlcjpwYXNz');
+		expect(UserPreferences.setString).not.toHaveBeenCalledWith('BASIC_AUTH_KEY-https://old.example.com', expect.anything());
+	});
+
+	it('clears setBasicAuth(null) under an explicitly passed server, not the stale this.serverUrl', () => {
+		(sdk as any).serverUrl = 'https://old.example.com';
+		sdk.setBasicAuth(null, 'https://new.example.com');
+		expect(UserPreferences.removeItem).toHaveBeenCalledWith('BASIC_AUTH_KEY-https://new.example.com');
+		expect(UserPreferences.removeItem).not.toHaveBeenCalledWith('BASIC_AUTH_KEY-https://old.example.com');
+	});
 });
 
 describe('Sdk.onStreamData', () => {

app/lib/services/sdk.ts

@@ -120,16 +120,15 @@ class Sdk {
 		return { ...this.headers };
 	}
 
-	setBasicAuth(basicAuth: string | null): void {
-		const url = this.serverUrl;
+	setBasicAuth(basicAuth: string | null, server: string | undefined = this.serverUrl): void {
 		if (basicAuth) {
-			if (url) {
-				UserPreferences.setString(`${BASIC_AUTH_KEY}-${url}`, basicAuth);
+			if (server) {
+				UserPreferences.setString(`${BASIC_AUTH_KEY}-${server}`, basicAuth);
 			}
 			this.setHeaders({ Authorization: `Basic ${basicAuth}` });
 		} else {
-			if (url) {
-				UserPreferences.removeItem(`${BASIC_AUTH_KEY}-${url}`);
+			if (server) {
+				UserPreferences.removeItem(`${BASIC_AUTH_KEY}-${server}`);
 			}
 			const next = { ...this.headers };
 			delete next.Authorization;

app/sagas/selectServer.ts

@@ -182,7 +182,7 @@ const handleSelectServer = function* handleSelectServer({ server, version, fetch
 		}
 
 		const basicAuth = UserPreferences.getString(`${BASIC_AUTH_KEY}-${server}`);
-		setBasicAuth(basicAuth);
+		setBasicAuth(basicAuth, server);
 
 		if (user) {
 			yield put(clearSettings());

app/views/NewServerView/methods/basicAuth.ts

@@ -10,7 +10,7 @@ const basicAuth = (server: string, text: string) => {
 		if (parsedUrl.auth.length) {
 			const credentials = Base64.encode(parsedUrl.auth);
 			UserPreferences.setString(`${BASIC_AUTH_KEY}-${server}`, credentials);
-			setBasicAuth(credentials);
+			setBasicAuth(credentials, server);
 		}
 	} catch {
 		// do nothing