From eda99adb77dd185853343fd23f0fa894eead2d9b Mon Sep 17 00:00:00 2001 From: Ben Schwartz Date: Tue, 23 Oct 2018 15:58:03 -0400 Subject: [PATCH] Simplify Oauth token passing URL --- src/server_manager/electron_app/digitalocean_oauth.ts | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/server_manager/electron_app/digitalocean_oauth.ts b/src/server_manager/electron_app/digitalocean_oauth.ts index d7f1563d..80ec9d20 100644 --- a/src/server_manager/electron_app/digitalocean_oauth.ts +++ b/src/server_manager/electron_app/digitalocean_oauth.ts @@ -148,8 +148,8 @@ export function runOauth(): OauthSession { var paramsStr = location.hash.substr(1); var params = splitParams(paramsStr); var form = document.getElementById("form"); - var targetUrl = params["state"]; - form.setAttribute("action", targetUrl); + var secret = params["state"]; + form.setAttribute("action", "/?secret=" + encodeURIComponent(secret)); document.getElementById("params").setAttribute("value", paramsStr); form.submit(); @@ -204,12 +204,10 @@ export function runOauth(): OauthSession { const address = server.address(); console.log(`OAuth target listening on ${address.address}:${address.port}`); - const targetUrl = `http://localhost:${ - encodeURIComponent(address.port.toString())}?secret=${encodeURIComponent(secret)}`; const oauthUrl = `https://cloud.digitalocean.com/v1/oauth/authorize?client_id=${ encodeURIComponent( clientId)}&response_type=token&scope=read%20write&redirect_uri=http://localhost:${ - encodeURIComponent(port.toString())}/&state=${encodeURIComponent(targetUrl)}`; + encodeURIComponent(port.toString())}/&state=${encodeURIComponent(secret)}`; console.log(`Opening OAuth URL ${oauthUrl}`); electron.shell.openExternal(oauthUrl); })