Skip to content

Code tidy up #91

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

Merged
merged 3 commits into from
Mar 31, 2019
Merged

Code tidy up #91

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4434b85
Moves common code together
Mar 30, 2019
9de3bda
Adds error checking to prevent API error
Mar 30, 2019
c8ed170
Adds error checking to prevent API error
Mar 30, 2019
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
74 changes: 25 additions & 49 deletions js/interface.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1218,9 +1218,25 @@ function searchCredentials(data) {
method: 'POST',
url: 'v1/organizations/' + organizationID + '/credentials/search',
data: data
})
.then(function (credentials) {
return Promise.resolve(credentials);
}).then(function (response) {
if (!response) {
return;
}

var credentialKey;
var submissionsWithCred = _.filter(Object.keys(response), function (o) {
return response[o].hasCertificate === true;
});

credentialKey = _.max(submissionsWithCred, function (o) {
return response[o].updatedAt;
});

if (!credentialKey) {
return;
}

return getCredential(credentialKey);
});
}

Expand Down Expand Up @@ -1269,27 +1285,6 @@ function refreshAppStoreOptions(devEmail, selectedTeamId, selectedTeamName) {
email: devEmail,
type: 'apple',
teamId: selectedTeamId
})
.then(function (response) {
var credentialKey;
var submissionsWithCred = _.filter(Object.keys(response), function (o) {
return response[o].hasCertificate === true;
});

if (submissionsWithCred) {
credentialKey = _.max(submissionsWithCred, function (o) {
return response[o].updatedAt;
});
}

if (credentialKey) {
return getCredential(credentialKey);
}

return;
})
.catch(function (error) {
return;
});
})
.then(function (credential) {
Expand Down Expand Up @@ -1355,27 +1350,6 @@ function refreshAppEnterpriseOptions(devEmail, selectedTeamId, selectedTeamName)
email: devEmail,
type: 'apple-enterprise',
teamId: selectedTeamId
})
.then(function (response) {
var credentialKey;
var submissionsWithCred = _.filter(Object.keys(response), function (o) {
return response[o].hasCertificate === true;
});

if (submissionsWithCred) {
credentialKey = _.max(submissionsWithCred, function (o) {
return response[o].updatedAt;
});
}

if (credentialKey) {
return getCredential(credentialKey);
}

return;
})
.catch(function (error) {
return;
});
})
.then(function (credential) {
Expand Down Expand Up @@ -1465,19 +1439,21 @@ function getCompletedSubmissions(devEmail, teamId, teamName) {
}

function getCredential(credentialKey) {
if (!credentialKey) {
return Promise.resolve();
}

return Fliplet.API.request({
method: 'GET',
url: 'v1/organizations/' + organizationID + '/credentials/' + credentialKey
})
.then(function (credential) {
}).then(function (credential) {
if (!credential || !credential.email) {
// Valid credential email not found
return Promise.resolve();
}

return Promise.resolve(credential);
})
.catch(function (error) {
}).catch(function (error) {
if (error && error.status === 404) {
// Credential not found
return Promise.resolve();
Expand Down