From a7ebc62a80933a73eae2282827e74dfaeb107820 Mon Sep 17 00:00:00 2001
From: Jesse Luehrs <doy@tozt.net>
Date: Wed, 27 Nov 2019 11:29:09 -0500
Subject: calculate the redirect_url for web oauth too

a bit more complicated because it needs to use the configured
public_address, etc
---
 teleterm/src/config.rs | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

(limited to 'teleterm/src/config.rs')

diff --git a/teleterm/src/config.rs b/teleterm/src/config.rs
index 4000cb7..95d5366 100644
--- a/teleterm/src/config.rs
+++ b/teleterm/src/config.rs
@@ -913,22 +913,12 @@ where
                             auth_client,
                         })
                         .map_err(serde::de::Error::custom)?;
+                    // this is wrong for Web configs, but it gets fixed up
+                    // later since we need to calculate the real value from
+                    // other parts of the config
                     let redirect_url =
-                        if auth_client == crate::protocol::AuthClient::Cli {
-                            url::Url::parse(crate::oauth::CLI_REDIRECT_URL)
-                                .unwrap()
-                        } else {
-                            config
-                                .redirect_url
-                                .context(
-                                    crate::error::OauthMissingConfiguration {
-                                        field: "redirect_url",
-                                        auth_type,
-                                        auth_client,
-                                    },
-                                )
-                                .map_err(serde::de::Error::custom)?
-                        };
+                        url::Url::parse(crate::oauth::CLI_REDIRECT_URL)
+                            .unwrap();
                     crate::oauth::RecurseCenter::config(
                         &client_id,
                         &client_secret,
-- 
cgit v1.2.3-54-g00ecf