Skip to content

Omit colon when apiPort is undefined or empty #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ianmsutherland wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Omit colon when apiPort is undefined or empty #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions background.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ function setBadge(text, color) {
async function checkServerStatus() {
try {
const { url } = await getCredentials();
if (!url || url === 'undefined://undefined:undefined') {
if (!url || url === 'undefined://undefined:undefined' || url === 'undefined://undefined') {
setBadge('?', '#888'); // Gray - not configured
return false;
}
Expand All @@ -31,10 +31,14 @@ async function checkServerStatus() {

async function getCredentials() {
const credentials = await browser.storage.local.get(['apiScheme', 'apiHost', 'apiPort', 'apiUsername', 'apiPassword']);
const portSuffix = credentials.apiPort != null && credentials.apiPort !== ''
? `:${credentials.apiPort}`
: '';

return {
username: credentials.apiUsername,
password: credentials.apiPassword,
url: `${credentials.apiScheme}://${credentials.apiHost}:${credentials.apiPort}`,
url: `${credentials.apiScheme}://${credentials.apiHost}${portSuffix}`,
credentials: credentials
};
}
Expand Down Expand Up @@ -246,3 +250,4 @@ browser.tabs.onUpdated.addListener((tabId, changeInfo, tab) => {
loginTabs.delete(tabId);
}
});