From 7707367c355d064b014ea1b2d843a75dbc070795 Mon Sep 17 00:00:00 2001
From: Valentin Tolmer <valentin@tolmer.fr>
Date: Wed, 3 Aug 2022 21:28:45 +0200
Subject: [PATCH] migration-tool: Extract the JWT from the JSON response

The response used to contain just the JWT, but now it's wrapped in JSON.

Fixes #282.
---
 Cargo.lock                  | 8 ++++----
 migration-tool/Cargo.toml   | 2 +-
 migration-tool/src/lldap.rs | 4 +++-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b6c32a0..09d225b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2936,9 +2936,9 @@ dependencies = [
 
 [[package]]
 name = "requestty"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20362058549acfb4b04b014aa182de685d7ded326eaf092db11030431c92693a"
+checksum = "8d06fb394ca73d15ad0c7bbc673459506a851a84586cd90d67d42932a280281e"
 dependencies = [
  "requestty-ui",
  "smallvec",
@@ -2947,9 +2947,9 @@ dependencies = [
 
 [[package]]
 name = "requestty-ui"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7b232b5ca049619df09d10909dfe32020bc0d402fd98cb5207fc1d2aa53633e"
+checksum = "31a4bce6f730d12e36993944036e2f93e88033d8a78734d8734fdb0043662cae"
 dependencies = [
  "bitflags",
  "crossterm",
diff --git a/migration-tool/Cargo.toml b/migration-tool/Cargo.toml
index ab400f5..848507c 100644
--- a/migration-tool/Cargo.toml
+++ b/migration-tool/Cargo.toml
@@ -7,7 +7,7 @@ authors = ["Valentin Tolmer <valentin@tolmer.fr>"]
 [dependencies]
 anyhow = "*"
 rand = "0.8"
-requestty = "*"
+requestty = "0.4.1"
 serde = "1"
 serde_json = "1"
 smallvec = "*"
diff --git a/migration-tool/src/lldap.rs b/migration-tool/src/lldap.rs
index 1ba3bd9..e4a8ef7 100644
--- a/migration-tool/src/lldap.rs
+++ b/migration-tool/src/lldap.rs
@@ -174,7 +174,9 @@ fn try_login(
             response.status().as_str()
         );
     }
-    Ok(response.text()?)
+    let json = serde_json::from_str::<lldap_auth::login::ServerLoginResponse>(&response.text()?)
+        .context("Could not parse response")?;
+    Ok(json.token)
 }
 
 pub fn get_lldap_user_and_password(