Merge changes from topic 'security'
authorSébastien Determe <sd378r@intl.att.com>
Fri, 23 Mar 2018 09:02:43 +0000 (09:02 +0000)
committerGerrit Code Review <gerrit@onap.org>
Fri, 23 Mar 2018 09:02:43 +0000 (09:02 +0000)
* changes:
  Remove client usage of md5
  Bcrypt as password hashing method in the backend

1  2 
src/main/resources/META-INF/resources/designer/index.html
src/main/resources/META-INF/resources/designer/scripts/app.js

        <!--  <script src="lib/angular.min.js"></script>-->
        <script src="lib/angular-route.js"></script>
        <script src="lib/angular-resource.min.js"></script>
-       <script src="lib/angular-md5.js"></script>
  
        <!-- jQuery Include and Bootstrap -->
  
       
       <script src="scripts/AutosaveProjectCtrl.js"></script>
       <script src="scripts/userPreferencesService.js"></script>
 -     
 +
 +     <script src="scripts/DeploymentCtrl.js"></script>
       <script src="scripts/ExtraUserInfoCtrl.js"></script>
       <script src="scripts/ExtraUserInfoService.js"></script>     
       <script src="scripts/saveConfirmationModalPopUpCtrl.js"></script>
@@@ -46,7 -46,6 +46,6 @@@ var app = angular.module('clds-app', ['
      'ui.grid.exporter',
      'angucomplete',
      'kendo.directives',
-     'angular-md5'
    ])
    .config(['cfpLoadingBarProvider', function(cfpLoadingBarProvider) {
  
@@@ -77,8 -76,6 +76,6 @@@
        function($routeProvider, $locationProvider,
          cfpLoadingBarProvider, $timeout, dialogs,
          $cookies) {
-         console
-           .log("$routeProvider','$locationProvider', '$compileProvider','cfpLoadingBarProvider','md5'")
          $locationProvider.html5Mode(false);
          // alert("App.js");
  
                $scope.cldsOpenModelProperties();
              } else if (name == "Deploy") {
                $scope
 -                .cldsConfirmToggleDeployPerformAction("Deploy");
 +                .cldsAskDeployParametersPerformAction();
              } else if (name == "UnDeploy") {
                $scope
                  .cldsConfirmToggleDeployPerformAction("UnDeploy");
            });
          };
  
 +        $scope.cldsAskDeployParametersPerformAction = function() {
 +            var dlg = dialogs.create('partials/portfolios/deploy_parameters.html',
 +                                     'DeploymentCtrl',
 +                                     {}, {keyboard: true, backdrop: true, windowClass: 'deploy-parameters'});
 +            dlg.result.then(function() {
 +                var confirm = dialogs.confirm('Deploy', 'Are you sure you want to deploy the closed loop?');
 +                confirm.result.then(function() {
 +                    cldsToggleDeploy("deploy");
 +                });
 +            });
 +        };
 +
          $scope.cldsConfirmToggleDeployPerformAction = function(
            uiAction) {