fix: Log in with the new user before removing the old one

https://harperdb.atlassian.net/browse/STUDIO-647

Author: dawsontoth

src/integrations/api/instance/auth/useInstanceLoginMutation.ts

@@ -24,6 +24,15 @@ export async function onInstanceLoginSubmit({
 	instanceClient,
 	entityId,
 }: InstanceLoginCredentials): Promise<LoginInfoResponse> {
+	const auth = {
+		username,
+		password,
+	};
+	if (authStore.checkForBasicAuth(entityId)) {
+		instanceClient.defaults.auth = auth;
+		instanceClient.defaults.withCredentials = false;
+	}
+
 	const { data: { message } } = await instanceClient.post('/', {
 		operation: 'login',
 		username,
@@ -44,23 +53,20 @@ export async function onInstanceLoginSubmit({
 	}
 
 	try {
-		const auth = {
-			username,
-			password,
-		};
-		delete instanceClient.defaults.auth;
+		instanceClient.defaults.auth = auth;
+		instanceClient.defaults.withCredentials = false;
 		const user = await getInstanceUserInfo({
 			instanceClient,
 			auth,
 		});
-		instanceClient.defaults.auth = auth;
-		instanceClient.defaults.withCredentials = false;
 		authStore.flagForBasicAuth(entityId, auth);
 		return {
 			message,
 			user,
 		};
 	} catch (err) {
+		instanceClient.defaults.auth = undefined;
+		instanceClient.defaults.withCredentials = true;
 		if (isLocalStudio) {
 			throw err;
 		}

src/integrations/api/instance/auth/useInstanceResetPasswordMutation.ts

@@ -56,18 +56,18 @@ async function onInstanceResetPassword({
 				active: true,
 				instanceClient,
 			});
-			// since we created a new user, we should clean up the old one
-			await onDeleteUser({
-				username: defaultClusterUsername,
-				instanceClient,
-			});
-			/// and login with the new one.
+			// since we created a new user, we should log in with the new one
 			await onInstanceLoginSubmit({
 				username: desiredUsername,
 				password: newPassword,
 				instanceClient,
 				entityId: clusterId,
 			});
+			// clean up the old one
+			await onDeleteUser({
+				username: defaultClusterUsername,
+				instanceClient,
+			});
 		}
 		// and finally, tell the central manager that we changed their password.
 		await resetPasswordUpdater(clusterId);