refactor for cipher response. add login uris.

src/app/vault/vaultAddCipherController.js

@@ -11,7 +11,13 @@
             folderId: selectedFolder ? selectedFolder.id : null,
             favorite: checkedFavorite === true,
             type: constants.cipherType.login,
-            login: {},
+            login: {
+                uris: [{
+                    uri: null,
+                    match: null,
+                    matchValue: null
+                }]
+            },
             identity: {},
             card: {},
             secureNote: {
@@ -44,6 +50,42 @@
             }
         };
 
+        $scope.addUri = function () {
+            if (!$scope.cipher.login) {
+                return;
+            }
+
+            if (!$scope.cipher.login.uris) {
+                $scope.cipher.login.uris = [];
+            }
+
+            $scope.cipher.login.uris.push({
+                uri: null,
+                match: null,
+                matchValue: null
+            });
+        };
+
+        $scope.removeUri = function (uri) {
+            if (!$scope.cipher.login || !$scope.cipher.login.uris) {
+                return;
+            }
+
+            var index = $scope.cipher.login.uris.indexOf(uri);
+            if (index > -1) {
+                $scope.cipher.login.uris.splice(index, 1);
+            }
+        };
+
+        $scope.uriMatchChanged = function (uri) {
+            if ((!uri.matchValue && uri.matchValue !== 0) || uri.matchValue === '') {
+                uri.match = null;
+            }
+            else {
+                uri.match = parseInt(uri.matchValue);
+            }
+        };
+
         $scope.addField = function () {
             if (!$scope.cipher.fields) {
                 $scope.cipher.fields = [];

src/app/vault/vaultEditCipherController.js

@@ -16,6 +16,7 @@
             $scope.cipher = cipherService.decryptCipher(cipher);
             $scope.readOnly = !$scope.cipher.edit;
             $scope.useTotp = $scope.useTotp || $scope.cipher.organizationUseTotp;
+            setUriMatchValues();
         });
 
         $scope.save = function (model) {
@@ -55,6 +56,42 @@
             }
         };
 
+        $scope.addUri = function () {
+            if (!$scope.cipher.login) {
+                return;
+            }
+
+            if (!$scope.cipher.login.uris) {
+                $scope.cipher.login.uris = [];
+            }
+
+            $scope.cipher.login.uris.push({
+                uri: null,
+                match: null,
+                matchValue: null
+            });
+        };
+
+        $scope.removeUri = function (uri) {
+            if (!$scope.cipher.login || !$scope.cipher.login.uris) {
+                return;
+            }
+
+            var index = $scope.cipher.login.uris.indexOf(uri);
+            if (index > -1) {
+                $scope.cipher.login.uris.splice(index, 1);
+            }
+        };
+
+        $scope.uriMatchChanged = function (uri) {
+            if ((!uri.matchValue && uri.matchValue !== 0) || uri.matchValue === '') {
+                uri.match = null;
+            }
+            else {
+                uri.match = parseInt(uri.matchValue);
+            }
+        };
+
         $scope.addField = function () {
             if (!$scope.cipher.fields) {
                 $scope.cipher.fields = [];
@@ -130,4 +167,14 @@
                 controller: 'premiumRequiredController'
             });
         };
+
+        function setUriMatchValues() {
+            if ($scope.cipher.login && $scope.cipher.login.uris) {
+                for (var i = 0; i < $scope.cipher.login.uris.length; i++) {
+                    $scope.cipher.login.uris[i].matchValue =
+                        $scope.cipher.login.uris[i].match || $scope.cipher.login.uris[i].match === 0 ?
+                            $scope.cipher.login.uris[i].match.toString() : '';
+                }
+            }
+        }
     });

src/app/vault/views/vaultAddCipher.html

@@ -39,26 +39,7 @@
                 </div>
             </div>
         </div>
-
         <div ng-if="cipher.type === constants.cipherType.login">
-            <div class="form-group" show-errors>
-                <label for="uri">URI</label>
-                <div class="input-group">
-                    <input type="text" id="uri" name="Login.Uri" ng-model="cipher.login.uri" class="form-control"
-                           placeholder="http://..." ng-readonly="readOnly" api-field />
-                    <span class="input-group-btn">
-                        <button class="btn btn-default btn-flat" type="button" uib-tooltip="Copy URI"
-                                tooltip-placement="left" ngclipboard ngclipboard-error="clipboardError(e)"
-                                data-clipboard-target="#uri">
-                            <i class="fa fa-clipboard"></i>
-                        </button>
-                        <a href="{{cipher.login.uri}}" target="_blank" class="btn btn-default btn-flat"
-                           uib-tooltip="Go To Website" tooltip-placement="left">
-                            <i class="fa fa-share"></i>
-                        </a>
-                    </span>
-                </div>
-            </div>
             <div class="row">
                 <div class="col-sm-6">
                     <div class="form-group" show-errors>
@@ -120,6 +101,58 @@
                     </div>
                 </div>
             </div>
+            <div ng-repeat="u in cipher.login.uris" ng-if="cipher.login.uris && cipher.login.uris.length">
+                <div class="row">
+                    <div class="col-sm-7">
+                        <div class="form-group" show-errors>
+                            <label for="uri{{$index}}">URI {{$index + 1}}</label>
+                            <div class="input-group">
+                                <input type="text" id="uri{{$index}}" name="Login.Uris[{{$index}}].Uri"
+                                       ng-model="u.uri" class="form-control"
+                                       placeholder="http://..." ng-readonly="readOnly" api-field />
+                                <span class="input-group-btn">
+                                    <button class="btn btn-default btn-flat" type="button" uib-tooltip="Copy URI"
+                                            tooltip-placement="left" ngclipboard ngclipboard-error="clipboardError(e)"
+                                            data-clipboard-target="#uri{{$index}}">
+                                        <i class="fa fa-clipboard"></i>
+                                    </button>
+                                    <a href="{{u.uri}}" target="_blank" class="btn btn-default btn-flat"
+                                       uib-tooltip="Go To Website" tooltip-placement="left">
+                                        <i class="fa fa-share"></i>
+                                    </a>
+                                </span>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-4">
+                        <div class="form-group">
+                            <label for="uri_match_{{$index}}">Auto-fill Detection</label>
+                            <select id="uri_match_{{$index}}" name="Login.Uris[{{$index}}].Match"
+                                    class="form-control" ng-model="u.matchValue" ng-change="uriMatchChanged(u)">
+                                <option value="">Default</option>
+                                <option value="0">Base domain</option>
+                                <option value="1">Host</option>
+                                <option value="2">Starts with</option>
+                                <option value="4">Regular Expression</option>
+                                <option value="3">Exact</option>
+                                <option value="5">Never</option>
+                            </select>
+                        </div>
+                    </div>
+                    <div class="col-sm-1">
+                        <br class="hidden-xs" />
+                        <a href="#" ng-click="removeUri(u)" stop-click>
+                            <i class="fa fa-window-close-o fa-lg"></i>
+                            <span class="visible-xs-inline">Remove URI</span>
+                        </a>
+                    </div>
+                </div>
+                <hr class="visible-xs-block" />
+            </div>
+            <a href="#" ng-click="addUri()" stop-click>
+                <i class="fa fa-plus-circle"></i> New URI
+            </a>
+            <br /><br />
         </div>
         <div ng-if="cipher.type === constants.cipherType.card">
             <div class="row">
@@ -505,7 +538,6 @@
         <div ng-if="cipher.type === constants.cipherType.secureNote">
             <!-- Nothing for now -->
         </div>
-
         <div class="form-group" show-errors>
             <label for="notes">Notes</label>
             <textarea id="notes" name="Notes" class="form-control" ng-model="cipher.notes" api-field

src/app/vault/views/vaultEditCipher.html

@@ -33,24 +33,6 @@
         </div>
 
         <div ng-if="cipher.type === constants.cipherType.login">
-            <div class="form-group" show-errors>
-                <label for="uri">URI</label>
-                <div class="input-group">
-                    <input type="text" id="uri" name="Login.Uri" ng-model="cipher.login.uri" class="form-control"
-                           placeholder="http://..." ng-readonly="readOnly" api-field />
-                    <span class="input-group-btn">
-                        <button class="btn btn-default btn-flat" type="button" uib-tooltip="Copy URI"
-                                tooltip-placement="left" ngclipboard ngclipboard-error="clipboardError(e)"
-                                data-clipboard-target="#uri">
-                            <i class="fa fa-clipboard"></i>
-                        </button>
-                        <a href="{{cipher.login.uri}}" target="_blank" class="btn btn-default btn-flat"
-                           uib-tooltip="Go To Website" tooltip-placement="left">
-                            <i class="fa fa-share"></i>
-                        </a>
-                    </span>
-                </div>
-            </div>
             <div class="row">
                 <div class="col-sm-6">
                     <div class="form-group" show-errors>
@@ -112,6 +94,60 @@
                     </div>
                 </div>
             </div>
+            <div ng-repeat="u in cipher.login.uris" ng-if="cipher.login.uris && cipher.login.uris.length">
+                <div class="row">
+                    <div class="col-sm-7">
+                        <div class="form-group" show-errors>
+                            <label for="uri{{$index}}">URI {{$index + 1}}</label>
+                            <div class="input-group">
+                                <input type="text" id="uri{{$index}}" name="Login.Uris[{{$index}}].Uri"
+                                       ng-model="u.uri" class="form-control"
+                                       placeholder="http://..." ng-readonly="readOnly" api-field />
+                                <span class="input-group-btn">
+                                    <button class="btn btn-default btn-flat" type="button" uib-tooltip="Copy URI"
+                                            tooltip-placement="left" ngclipboard ngclipboard-error="clipboardError(e)"
+                                            data-clipboard-target="#uri{{$index}}">
+                                        <i class="fa fa-clipboard"></i>
+                                    </button>
+                                    <a href="{{u.uri}}" target="_blank" class="btn btn-default btn-flat"
+                                       uib-tooltip="Go To Website" tooltip-placement="left">
+                                        <i class="fa fa-share"></i>
+                                    </a>
+                                </span>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-4">
+                        <div class="form-group">
+                            <label for="uri_match_{{$index}}">Auto-fill Detection</label>
+                            <select id="uri_match_{{$index}}" name="Login.Uris[{{$index}}].Match" ng-disabled="readOnly"
+                                    class="form-control" ng-model="u.matchValue" ng-change="uriMatchChanged(u)">
+                                <option value="">Default</option>
+                                <option value="0">Base domain</option>
+                                <option value="1">Host</option>
+                                <option value="2">Starts with</option>
+                                <option value="4">Regular Expression</option>
+                                <option value="3">Exact</option>
+                                <option value="5">Never</option>
+                            </select>
+                        </div>
+                    </div>
+                    <div class="col-sm-1" ng-if="!readOnly">
+                        <br class="hidden-xs" />
+                        <a href="#" ng-click="removeUri(u)" stop-click>
+                            <i class="fa fa-window-close-o fa-lg"></i>
+                            <span class="visible-xs-inline">Remove URI</span>
+                        </a>
+                    </div>
+                </div>
+                <hr class="visible-xs-block" />
+            </div>
+            <div ng-if="!readOnly">
+                <a href="#" ng-click="addUri()" stop-click>
+                    <i class="fa fa-plus-circle"></i> New URI
+                </a>
+                <br /><br />
+            </div>
         </div>
         <div ng-if="cipher.type === constants.cipherType.card">
             <div class="row">
@@ -552,9 +588,9 @@
                         </div>
                     </div>
                 </div>
-                <div class="col-sm-1">
+                <div class="col-sm-1" ng-if="!readOnly">
                     <br class="hidden-xs" />
-                    <a href="#" ng-click="removeField(field)" stop-click ng-if="!readOnly">
+                    <a href="#" ng-click="removeField(field)" stop-click>
                         <i class="fa fa-window-close-o fa-lg"></i>
                         <span class="visible-xs-inline">Remove Custom Field</span>
                     </a>