Attachment 252435 Details for Bug 464738 – Fix to include username in storage

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Fix to include username in storage

Bug 464738 Git Credentials.patch (text/plain), 1.52 KB, created by Curtis Windatt

on 2015-04-15 16:24:34 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Curtis Windatt

Created: 2015-04-15 16:24:34 EDT

Size: 1.52 KB

patch

obsolete

>diff --git a/bundles/org.eclipse.orion.client.git/web/orion/git/widgets/GitCredentialsDialog.js b/bundles/org.eclipse.orion.client.git/web/orion/git/widgets/GitCredentialsDialog.js
>index 502125f..0a3c308 100644
>--- a/bundles/org.eclipse.orion.client.git/web/orion/git/widgets/GitCredentialsDialog.js
>+++ b/bundles/org.eclipse.orion.client.git/web/orion/git/widgets/GitCredentialsDialog.js
>@@ -196,10 +196,11 @@
> 					if (failedOperation !== "undefined") {
> 						that._progressService.removeOperation(failedOperation);
> 					}
>-					that.options.func({ gitSshUsername : that.$gitSshUsername.value,
>-					gitSshPassword : that.$gitSshPassword.value,
>-					gitPrivateKey : pKey,
>-					gitPassphrase : that.$gitPassphrase.value,
>+					that.options.func({
>+						gitSshUsername : that.$gitSshUsername.value,
>+						gitSshPassword : that.$gitSshPassword.value,
>+						gitPrivateKey : pKey,
>+						gitPassphrase : that.$gitPassphrase.value,
> 					knownHosts : that.$gitSshKnownHosts.value
> 					});
> 				}
>@@ -216,8 +217,10 @@
> 					var gitPreferenceStorage = new GitPreferenceStorage(that.options.serviceRegistry);
> 					if (that.$gitSaveCredentials.checked) {
> 
>-						gitPreferenceStorage.put(repository, { gitPrivateKey : loadedPrivateKey,
>-						gitPassphrase : that.$gitPassphrase.value
>+						gitPreferenceStorage.put(repository, {
>+							gitSshUsername : that.$gitSshUsername.value,
>+							gitPrivateKey : loadedPrivateKey,
>+							gitPassphrase : that.$gitPassphrase.value
> 						}).then(function() {
> 							process(loadedPrivateKey);
> 						});

Actions: View | Diff

Attachments on bug 464738: 252435