Skip to content
This repository has been archived by the owner on Oct 4, 2024. It is now read-only.

Commit

Permalink
Revert "address windows, mac, linux behavior w/ callback and auto-ope…
Browse files Browse the repository at this point in the history
…n Wallet"
  • Loading branch information
vgrichina authored May 11, 2020
1 parent 7e3f8b1 commit d7a4e94
Showing 1 changed file with 17 additions and 10 deletions.
27 changes: 17 additions & 10 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -77,27 +77,34 @@ exports.login = async function (options) {

// attempt to capture accountId automatically via browser callback
let tempUrl;
// See: https://github.com/near/near-shell/issues/358
const isMac = process.platform === 'darwin';
const isWin = process.platform === 'win32';

// find a callback URL on the local machine
try {
// capture callback isn't working reliably outside of Mac. This is a workaround to not use it
if (isMac) {
if (!isWin) { // capture callback is currently not working on windows. This is a workaround to not use it
tempUrl = await capture.callback(5000);
// if we found a suitable URL, attempt to use it
newUrl.searchParams.set('success_url', `http://${tempUrl.hostname}:${tempUrl.port}`);
await openUrl(newUrl);
} else {
// redirect automatically, but do not use the browser callback
await openUrl(newUrl);
}
} catch (error) {
// console.error("Failed to find suitable port.", error.message)
// TODO: Is it? Try triggering error
// silent error is better here
}

// if we found a suitable URL, attempt to use it
if (tempUrl) {
if (process.env.GITPOD_WORKSPACE_URL) {
const workspaceUrl = new URL(process.env.GITPOD_WORKSPACE_URL);
newUrl.searchParams.set('success_url', `https://${tempUrl.port}-${workspaceUrl.hostname}`);
// Browser not opened, as will open automatically for opened port
} else {
newUrl.searchParams.set('success_url', `http://${tempUrl.hostname}:${tempUrl.port}`);
openUrl(newUrl);
}
} else if (isWin) {
// redirect automatically on windows, but do not use the browser callback
openUrl(newUrl);
}

console.log(chalk`\n{dim If your browser doesn't automatically open, please visit this URL\n${newUrl.toString()}}`);

const getAccountFromWebpage = async () => {
Expand Down

0 comments on commit d7a4e94

Please sign in to comment.