Skip to content

Gracefully handle missing GitHub API key #116

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
Splitwirez wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Gracefully handle missing GitHub API key #116

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
39 changes: 29 additions & 10 deletions src/sporemodder/GitHubManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package sporemodder;

import javafx.scene.control.Alert;
import javafx.scene.control.Alert.AlertType;
import javafx.scene.control.ButtonType;
import javafx.scene.control.Hyperlink;
import javafx.scene.control.Label;
Expand Down Expand Up @@ -43,6 +44,7 @@ public class GitHubManager extends AbstractManager {
private String userAccessToken;
private String lastDeviceLoginCode;
private boolean hasShowGitDialog;
private boolean hasGithubAppClientId = false;

/**
* Returns the current instance of the GitHubManager class.
Expand All @@ -58,18 +60,28 @@ private HttpClient getHttpClient() {

@Override
public void initialize(Properties properties) {
try (BufferedReader reader = new BufferedReader(new InputStreamReader(GitHubManager.class.getResourceAsStream("/sporemodder/resources/githubApp.txt")))) {
clientId = reader.readLine().trim();
} catch (IOException e) {
throw new RuntimeException(e);
InputStream githubApp = GitHubManager.class.getResourceAsStream("/sporemodder/resources/githubApp.txt");
if (githubApp != null) {
InputStreamReader githubAppReader = new InputStreamReader(githubApp);
try (BufferedReader reader = new BufferedReader(githubAppReader)) {
clientId = reader.readLine().trim();
hasGithubAppClientId = true;
} catch (IOException e) {
//throw new RuntimeException(e);
}
}

username = properties.getProperty(PROPERTY_gitUsername);
emailAddress = properties.getProperty(PROPERTY_gitEmail);
if (username != null) username = username.trim();
if (emailAddress != null) emailAddress = emailAddress.trim();

hasShowGitDialog = properties.getProperty(PROPERTY_hasShowGitDialog, "false").equals("true");
if (hasGithubAppClientId) {
username = properties.getProperty(PROPERTY_gitUsername);
emailAddress = properties.getProperty(PROPERTY_gitEmail);
if (username != null) username = username.trim();
if (emailAddress != null) emailAddress = emailAddress.trim();

hasShowGitDialog = properties.getProperty(PROPERTY_hasShowGitDialog, "false").equals("true");
} else {
hasShowGitDialog = true;
}
}

@Override public void saveSettings(Properties properties) {
Expand Down Expand Up @@ -561,7 +573,14 @@ public void setRepositoryTopics(String repositoryName, List<String> topics) thro
* After the dialog is shown, it will not be shown again.
*/
public void showFirstTimeDialog() {
if (!hasShowGitDialog) {
if (!hasGithubAppClientId) {
String title = "GitHub API Key Missing";
String contentText = "This build of SporeModder FX lacks a GitHub API Key. GitHub integrations may not function. ('src/sporemodder/resources/githubApp.txt')";

Alert alert = new Alert(AlertType.INFORMATION, contentText, ButtonType.OK);
alert.setTitle(title);
UIManager.get().showDialog(alert);
} else if (!hasShowGitDialog) {
SetGitUserUI.show();
hasShowGitDialog = true;
MainApp.get().saveSettings();
Expand Down