Skip to content

Improve error message if credentials are not stored in secure storage #260

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 1 commit into from
Aug 15, 2023
Merged

Improve error message if credentials are not stored in secure storage #260

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
15 changes: 11 additions & 4 deletions org.abapgit.adt.ui/src/org/abapgit/adt/ui/internal/util/GitCredentialsService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import org.eclipse.equinox.security.storage.provider.IProviderHints;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.MessageBox;
Expand Down Expand Up @@ -67,7 +68,7 @@ public static IExternalRepositoryInfoRequest getCredentialsFromUser(Shell shell,

if (((AbapGitStagingCredentialsDialog) userCredentialsDialog).storeInSecureStorage()) {
//store the credentials in secure storage
storeCredentialsInSecureStorage(repositoryCredentials, repositoryURL);
storeCredentialsInSecureStorage(repositoryCredentials, repositoryURL, shell);
} else {
deleteCredentialsFromSecureStorage(repositoryURL);
}
Expand Down Expand Up @@ -127,7 +128,7 @@ public static boolean isAuthenticationIssue(ResourceException exception) {
* store repositoryCredentials in Secure Store for the given
* repositoryURL
*/
public static void storeCredentialsInSecureStorage(IExternalRepositoryInfoRequest repositoryCredentials, String repositoryURL) {
public static void storeCredentialsInSecureStorage(IExternalRepositoryInfoRequest repositoryCredentials, String repositoryURL, Shell shell) {
if (repositoryCredentials != null && repositoryURL != null) {
String hashedURL = getUrlForNodePath(repositoryURL);

Expand All @@ -146,14 +147,20 @@ public static void storeCredentialsInSecureStorage(IExternalRepositoryInfoReques
}
} catch (IOException | StorageException e) {
AbapGitUIPlugin.getDefault().getLog().log(new Status(IStatus.ERROR, AbapGitUIPlugin.PLUGIN_ID, e.getMessage(), e));

MessageDialog.openWarning(shell, "Eclipse secure storage error", getErrorMessage(e)); //$NON-NLS-1$
GitCredentialsService.deleteCredentialsFromSecureStorage(repositoryURL); // if anything stored in the secure storage

}
}

}

private static String getErrorMessage(Exception e) {
if (e.getMessage().equalsIgnoreCase("No password provided.")) { //$NON-NLS-1$
return "Secure storage was unable to retrieve the master password. Try deleting and re-creating secure storage in eclipse preferences.\nOperation will continue without storing credentials."; //$NON-NLS-1$
}
return e.getMessage();
}
/**
*
* @param repositoryURL
Expand Down Expand Up @@ -204,7 +211,7 @@ public static boolean showPopUpAskingToStoreCredentials(Shell shell, String url,
credentials.setUser(user);
credentials.setPassword(pass);
credentials.setUrl(url);
GitCredentialsService.storeCredentialsInSecureStorage(credentials, url);
GitCredentialsService.storeCredentialsInSecureStorage(credentials, url, shell);
} else {

//delete credentials from secure store
Expand Down