+2

src/__phutil_library_map__.php

reviewed

··· 1271 1271 'PassphraseCredentialTypeTestCase' => 'applications/passphrase/credentialtype/__tests__/PassphraseCredentialTypeTestCase.php', 1272 1272 'PassphraseCredentialViewController' => 'applications/passphrase/controller/PassphraseCredentialViewController.php', 1273 1273 'PassphraseDAO' => 'applications/passphrase/storage/PassphraseDAO.php', 1274 1274 + 'PassphraseNoteCredentialType' => 'applications/passphrase/credentialtype/PassphraseNoteCredentialType.php', 1274 1275 'PassphrasePasswordCredentialType' => 'applications/passphrase/credentialtype/PassphrasePasswordCredentialType.php', 1275 1276 'PassphrasePasswordKey' => 'applications/passphrase/keys/PassphrasePasswordKey.php', 1276 1277 'PassphraseQueryConduitAPIMethod' => 'applications/passphrase/conduit/PassphraseQueryConduitAPIMethod.php', ··· 4766 4767 'PassphraseCredentialTypeTestCase' => 'PhabricatorTestCase', 4767 4768 'PassphraseCredentialViewController' => 'PassphraseController', 4768 4769 'PassphraseDAO' => 'PhabricatorLiskDAO', 4770 4770 + 'PassphraseNoteCredentialType' => 'PassphraseCredentialType', 4769 4771 'PassphrasePasswordCredentialType' => 'PassphraseCredentialType', 4770 4772 'PassphrasePasswordKey' => 'PassphraseAbstractKey', 4771 4773 'PassphraseQueryConduitAPIMethod' => 'PassphraseConduitAPIMethod',

+10 -6

src/applications/passphrase/controller/PassphraseCredentialEditController.php

reviewed

··· 47 47 $is_new = true; 48 48 49 49 // Prefill username if provided. 50 50 - $credential->setUsername($request->getStr('username')); 50 50 + $credential->setUsername((string)$request->getStr('username')); 51 51 52 52 if (!$request->getStr('isInitialized')) { 53 53 $type->didInitializeNewCredential($viewer, $credential); ··· 151 151 $credential->openTransaction(); 152 152 153 153 if (!$credential->getIsLocked()) { 154 154 - $xactions[] = id(new PassphraseCredentialTransaction()) 154 154 + if ($type->shouldRequireUsername()) { 155 155 + $xactions[] = id(new PassphraseCredentialTransaction()) 155 156 ->setTransactionType($type_username) 156 157 ->setNewValue($v_username); 157 157 - 158 158 + } 158 159 // If some value other than a sequence of bullets was provided for 159 160 // the credential, update it. In particular, note that we are 160 161 // explicitly allowing empty secrets: one use case is HTTP auth where ··· 263 264 pht('This credential is permanently locked and can not be edited.')); 264 265 } 265 266 266 266 - $form 267 267 + if ($type->shouldRequireUsername()) { 268 268 + $form 267 269 ->appendChild( 268 270 id(new AphrontFormTextControl()) 269 271 ->setName('username') 270 272 ->setLabel(pht('Login/Username')) 271 273 ->setValue($v_username) 272 274 ->setDisabled($credential_is_locked) 273 273 - ->setError($e_username)) 274 274 - ->appendChild( 275 275 + ->setError($e_username)); 276 276 + } 277 277 + $form 278 278 + ->appendChild( 275 279 $secret_control 276 280 ->setName('secret') 277 281 ->setLabel($type->getSecretLabel())

+5 -3

src/applications/passphrase/controller/PassphraseCredentialViewController.php

reviewed

··· 182 182 pht('Editable By'), 183 183 $descriptions[PhabricatorPolicyCapability::CAN_EDIT]); 184 184 185 185 - $properties->addProperty( 186 186 - pht('Username'), 187 187 - $credential->getUsername()); 185 185 + if ($type->shouldRequireUsername()) { 186 186 + $properties->addProperty( 187 187 + pht('Username'), 188 188 + $credential->getUsername()); 189 189 + } 188 190 189 191 $used_by_phids = PhabricatorEdgeQuery::loadDestinationPHIDs( 190 192 $credential->getPHID(),

+4

src/applications/passphrase/credentialtype/PassphraseCredentialType.php

reviewed

··· 131 131 return $secret; 132 132 } 133 133 134 134 + public function shouldRequireUsername() { 135 135 + return true; 136 136 + } 137 137 + 134 138 }

+37

src/applications/passphrase/credentialtype/PassphraseNoteCredentialType.php

reviewed

··· 1 1 + <?php 2 2 + 3 3 + final class PassphraseNoteCredentialType 4 4 + extends PassphraseCredentialType { 5 5 + 6 6 + const CREDENTIAL_TYPE = 'note'; 7 7 + const PROVIDES_TYPE = 'provides/note'; 8 8 + 9 9 + public function getCredentialType() { 10 10 + return self::CREDENTIAL_TYPE; 11 11 + } 12 12 + 13 13 + public function getProvidesType() { 14 14 + return self::PROVIDES_TYPE; 15 15 + } 16 16 + 17 17 + public function getCredentialTypeName() { 18 18 + return pht('Note'); 19 19 + } 20 20 + 21 21 + public function getCredentialTypeDescription() { 22 22 + return pht('Store a plaintext note.'); 23 23 + } 24 24 + 25 25 + public function getSecretLabel() { 26 26 + return pht('Note'); 27 27 + } 28 28 + 29 29 + public function newSecretControl() { 30 30 + return id(new AphrontFormTextAreaControl()); 31 31 + } 32 32 + 33 33 + public function shouldRequireUsername() { 34 34 + return false; 35 35 + } 36 36 + 37 37 + }

+4

src/applications/passphrase/editor/PassphraseCredentialTransactionEditor.php

reviewed

··· 174 174 } 175 175 break; 176 176 case PassphraseCredentialTransaction::TYPE_USERNAME: 177 177 + $credential_type = $object->getCredentialTypeImplementation(); 178 178 + if (!$credential_type->shouldRequireUsername()) { 179 179 + break; 180 180 + } 177 181 $missing = $this->validateIsEmptyTextField( 178 182 $object->getUsername(), 179 183 $xactions);