add option to choose to copy or open url (#125)

blacs30 · Mar 7, 2022 · 0ef94e2 · 0ef94e2
1 parent d511961
commit 0ef94e2
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -146,6 +146,7 @@ Install via Alfred keyword: `.bwautolock`
 | MODIFIER_3_ACTION         | Action executed by the third modifier                                                                                                                                                                 | totp                                                                                |
 | MODIFIER_4_ACTION         | Action executed by the fourth modifier                                                                                                                                                                | more                                                                                |
 | NO_MODIFIER_ACTION        | Action executed without modifier pressed                                                                                                                                                              | password,card                                                                       |
+| OPEN_LOGIN_URL            | If set to false the url of an item will be copied to the clipboard, otherwise it will be opened in the default browser.                                                                               | true                                                                                |
 | OUTPUT_FOLDER             | The folder to which attachments should be saved when the action is triggered. Default is \$HOME/Downloads. "~" can be used as well.                                                                   | ""                                                                                  |
 | PATH                      | The PATH env variable which is used to search for executables (like the Bitwarden CLI configured with BW_EXEC, security to get and set keychain objects)                                              | /usr/bin:/usr/local/bin:/usr/local/sbin:/usr/local/share/npm/bin:/usr/bin:/usr/sbin |
 | REORDERING_DISABLED       | If set to false the items which are often selected appear further up in the results.                                                                                                                  | true                                                                                |

diff --git a/src/config.go b/src/config.go
@@ -388,16 +388,23 @@ func setModAction(itemConfig itemsModifierActionRelationMap, item Item, itemType
 					continue
 				}
 				assignedIcon := iconLink
-				subtitle := "Copy URL"
+				subtitle := "Open URL"
+				loginUrlAction := "-open"
+				notification := " "
+				if !conf.OpenLoginUrl {
+					subtitle = "Copy URL"
+					loginUrlAction = "output"
+					notification = fmt.Sprintf("Copy url for user:\n%s", item.Login.Username)
+				}
 				if modMode == "nomod" {
 					assignedIcon = icon
 					subtitle = fmt.Sprintf("↩ or ⇥ copy URL, %s Password, %s Username %s %s Show more", passEmoji, userEmoji, totp, moreEmoji)
 				}
 				modItem := modifierActionContent{
 					Title:        title,
 					Subtitle:     subtitle,
-					Notification: " ",
-					Action:       "-open",
+					Notification: notification,
+					Action:       loginUrlAction,
 					Action2:      " ",
 					Action3:      " ",
 					Arg:          item.Login.Uris[0].Uri,

diff --git a/src/config_types.go b/src/config_types.go
@@ -67,6 +67,7 @@ type config struct {
 	SyncMaxCacheAge    time.Duration
 	TitleWithUser      bool `envconfig:"TITLE_WITH_USER" default:"true"`
 	TitleWithUrls      bool `envconfig:"TITLE_WITH_URLS" default:"true"`
+	OpenLoginUrl       bool `envconfig:"OPEN_LOGIN_URL" default:"true"`
 }
 
 type BwData struct {

diff --git a/workflow/info.plist b/workflow/info.plist
@@ -2091,6 +2091,8 @@ Caching of the secret/item names (not the secret values itself) are cached so th
 		<string>password,card</string>
 		<key>OUTPUT_FOLDER</key>
 		<string></string>
+		<key>OPEN_LOGIN_URL</key>
+		<string>true</string>
 		<key>PATH</key>
 		<string>/usr/bin:/usr/local/bin:/usr/local/sbin:/usr/local/share/npm/bin:/usr/bin:/usr/sbin</string>
 		<key>REORDERING_DISABLED</key>
@@ -2126,7 +2128,7 @@ Caching of the secret/item names (not the secret values itself) are cached so th
 		<string>SERVER_URL</string>
 	</array>
 	<key>version</key>
-	<string>2.4.2</string>
+	<string>2.4.3</string>
 	<key>webaddress</key>
 	<string>https://github.com/blacs30/bitwarden-alfred-workflow</string>
 </dict>