aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Henneke <FabianHenneke@users.noreply.github.com>2020-08-24 09:11:40 +0200
committerGitHub <noreply@github.com>2020-08-24 12:41:40 +0530
commit679037b81dee889bdd3b79bd02c37353df63ccc5 (patch)
tree0b9ca8ed68f7eb07643ac133623cf30917e1e092
parent2c8999c1bff1c82b047e7111d47c539fc6207336 (diff)
Return HTTPS URI username from CredentialsProvider (#1049)
Let the PasswordFinderCredentialsProvider support Username as a CredentialItem type and return the user part of the repository URI when it is requested.
-rw-r--r--app/src/main/java/com/zeapo/pwdstore/git/operation/GitOperation.kt3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/src/main/java/com/zeapo/pwdstore/git/operation/GitOperation.kt b/app/src/main/java/com/zeapo/pwdstore/git/operation/GitOperation.kt
index ae4674fe..3efd3bd8 100644
--- a/app/src/main/java/com/zeapo/pwdstore/git/operation/GitOperation.kt
+++ b/app/src/main/java/com/zeapo/pwdstore/git/operation/GitOperation.kt
@@ -57,6 +57,7 @@ abstract class GitOperation(gitDir: File, internal val callingActivity: Fragment
override fun get(uri: URIish?, vararg items: CredentialItem): Boolean {
for (item in items) {
when (item) {
+ is CredentialItem.Username -> item.value = uri?.user
is CredentialItem.Password -> item.value = passwordFinder.reqPassword(null)
else -> UnsupportedCredentialItem(uri, item.javaClass.name)
}
@@ -65,7 +66,7 @@ abstract class GitOperation(gitDir: File, internal val callingActivity: Fragment
}
override fun supports(vararg items: CredentialItem) = items.all {
- it is CredentialItem.Password
+ it is CredentialItem.Username || it is CredentialItem.Password
}
}