From ac4f4a492da89dc68d250b08a07a7ffbd10750d6 Mon Sep 17 00:00:00 2001 From: Mohammad Zolmajd Date: Wed, 16 Sep 2015 11:18:24 -0400 Subject: [PATCH 1/4] - Upgraded the angular version to 1.4.5. - Added ngSanitize to fix the security warning in browser - Changed identity_config , hadneling of cookie , added timeout 2h. - Fixed / updated tests accordingly --- app/templates/skeleton/app/app.js | 1 + app/templates/skeleton/app/index.html | 1 + .../company/details/company-details.html | 4 ++-- .../_tests/authentication-config.spec.js | 2 +- .../identity/_tests/authority-config.spec.js | 2 +- .../configuration/identity/identity-config.js | 15 ++++++------- .../modules/configuration/locale-config.js | 4 ++-- app/templates/skeleton/bower.json | 21 ++++++++++++------- app/templates/skeleton/karma.conf.js | 1 + 9 files changed, 30 insertions(+), 21 deletions(-) diff --git a/app/templates/skeleton/app/app.js b/app/templates/skeleton/app/app.js index 67b18cc..5aa8f95 100755 --- a/app/templates/skeleton/app/app.js +++ b/app/templates/skeleton/app/app.js @@ -2,6 +2,7 @@ angular.module('sampleApp', [ 'ui.bootstrap', 'ui.router', 'ngCookies', + 'ngSanitize', 'components', 'configuration.rest', 'configuration.state', diff --git a/app/templates/skeleton/app/index.html b/app/templates/skeleton/app/index.html index b10981a..001371c 100755 --- a/app/templates/skeleton/app/index.html +++ b/app/templates/skeleton/app/index.html @@ -15,6 +15,7 @@ + diff --git a/app/templates/skeleton/app/modules/company/details/company-details.html b/app/templates/skeleton/app/modules/company/details/company-details.html index 7eecb79..80f88a2 100755 --- a/app/templates/skeleton/app/modules/company/details/company-details.html +++ b/app/templates/skeleton/app/modules/company/details/company-details.html @@ -45,9 +45,9 @@

- + -
COMPANY.INVALID_IMAGE_FILE
+
COMPANY.INVALID_IMAGE_FILE
diff --git a/app/templates/skeleton/app/modules/configuration/identity/_tests/authentication-config.spec.js b/app/templates/skeleton/app/modules/configuration/identity/_tests/authentication-config.spec.js index 880bb68..2613d7d 100755 --- a/app/templates/skeleton/app/modules/configuration/identity/_tests/authentication-config.spec.js +++ b/app/templates/skeleton/app/modules/configuration/identity/_tests/authentication-config.spec.js @@ -145,7 +145,7 @@ describe('The authentication module, ', function () { identityService.getIdentity.andReturn(null); - $rootScope.$apply(); + $rootScope.$applyAsync(); expect(authenticationService.isAuthenticated()).toBeFalsy(); }); diff --git a/app/templates/skeleton/app/modules/configuration/identity/_tests/authority-config.spec.js b/app/templates/skeleton/app/modules/configuration/identity/_tests/authority-config.spec.js index e666c8d..3f20225 100755 --- a/app/templates/skeleton/app/modules/configuration/identity/_tests/authority-config.spec.js +++ b/app/templates/skeleton/app/modules/configuration/identity/_tests/authority-config.spec.js @@ -113,7 +113,7 @@ describe('The authority module, ', function () { authorityService.hasAuthority.andReturn(false); $rootScope.$broadcast('$stateChangeStart', {name: 'page.home'}); - $rootScope.$apply(); + $rootScope.$applyAsync(); expect($state.go).toHaveBeenCalledWith('page.errors.403'); }); diff --git a/app/templates/skeleton/app/modules/configuration/identity/identity-config.js b/app/templates/skeleton/app/modules/configuration/identity/identity-config.js index 390da21..3746e3f 100755 --- a/app/templates/skeleton/app/modules/configuration/identity/identity-config.js +++ b/app/templates/skeleton/app/modules/configuration/identity/identity-config.js @@ -19,7 +19,8 @@ angular.module('configuration.identity', ['configuration.rest', 'ngCookies', 'ui var identity; var Identity = $resource(restConfigService.getIdentityOperation()); - + var cookieTimeOutMinutes = 120; + var cookieTimeOutMillis = new Date(new Date().getTime() + cookieTimeOutMinutes * 60 * 1000); return { @@ -28,8 +29,8 @@ angular.module('configuration.identity', ['configuration.rest', 'ngCookies', 'ui return identity; } - if($cookies.username) { - identity = {username: $cookies.username, authorities: $cookies.authorities.split(",")}; + if($cookies.get("username") && $cookies.get("authorities")) { + identity = {username: $cookies.get("username"), authorities: $cookies.get("authorities").split(",")}; return identity; } return null; @@ -37,14 +38,14 @@ angular.module('configuration.identity', ['configuration.rest', 'ngCookies', 'ui update: function (newIdentity) { identity = newIdentity; - $cookies.username = identity.username; - $cookies.authorities = identity.authorities.join(); + $cookies.put("username" , identity.username, {expires: new Date(2016, 1, 1)}); + $cookies.put("authorities" , identity.authorities.join(), {expires: cookieTimeOutMillis }); }, clear: function() { identity = null; - delete $cookies.username; - delete $cookies.authorities; + $cookies.remove("username"); + $cookies.remove("authorities"); } }; }); diff --git a/app/templates/skeleton/app/modules/configuration/locale-config.js b/app/templates/skeleton/app/modules/configuration/locale-config.js index c85ceb7..2a8b64f 100755 --- a/app/templates/skeleton/app/modules/configuration/locale-config.js +++ b/app/templates/skeleton/app/modules/configuration/locale-config.js @@ -1,4 +1,4 @@ -angular.module('configuration.locale', ['pascalprecht.translate']) +angular.module('configuration.locale', ['pascalprecht.translate', 'ngSanitize']) .config(function($translateProvider) { @@ -6,7 +6,7 @@ angular.module('configuration.locale', ['pascalprecht.translate']) prefix: 'i18n/locale-', suffix: '.json' }); - + $translateProvider.useSanitizeValueStrategy('escape'); $translateProvider.preferredLanguage('en'); }) diff --git a/app/templates/skeleton/bower.json b/app/templates/skeleton/bower.json index 0681719..46eded6 100755 --- a/app/templates/skeleton/bower.json +++ b/app/templates/skeleton/bower.json @@ -10,20 +10,25 @@ "dependencies": { "lodash": "~3.5", "bootstrap": "~3.1", - "angular": "~1.2", - "angular-ui-router": "~0.2", - "angular-resource": "~1.2", - "angular-translate": "~2.6", - "angular-translate-loader-static-files": "~2.6", - "angular-cookies": "~1.2", - "angular-bootstrap": "~0.12", + "angular": "~1.4.5", + "angular-sanitize": "~1.3.19", + "angular-ui-router": "~0.2.15", + "angular-resource": "~1.4.5", + "angular-translate": "~2.7.2", + "angular-translate-loader-static-files": "~2.7.2", + "angular-cookies": "~1.4.5", + "angular-bootstrap": "~0.13", "moment": "~2.9", "font-awesome": "~4.3", "ng-file-upload": "~4.1.4", "ng-file-upload-shim": "~4.1.4" }, "devDependencies": { - "angular-mocks": "~1.2" + "angular-mocks": "~1.4.5" + }, + "resolutions": { + "angular": "1.4.5", + "angular-translate": "~2.7.2" } } diff --git a/app/templates/skeleton/karma.conf.js b/app/templates/skeleton/karma.conf.js index e3c7e8f..fdea3d1 100644 --- a/app/templates/skeleton/karma.conf.js +++ b/app/templates/skeleton/karma.conf.js @@ -18,6 +18,7 @@ module.exports = function (config) { 'bower_components/lodash/lodash.js', 'bower_components/moment/moment.js', 'bower_components/angular/angular.js', + 'bower_components/angular-sanitize/angular-sanitize.js', 'bower_components/angular-cookies/angular-cookies.js', 'bower_components/angular-ui-router/release/angular-ui-router.js', 'bower_components/angular-resource/angular-resource.js', From 41cd4be16589304ba1e6ef801cdbd65c8e67f852 Mon Sep 17 00:00:00 2001 From: Mohammad Zolmajd Date: Wed, 16 Sep 2015 15:42:58 -0400 Subject: [PATCH 2/4] Removed the hardcoded expiry --- .../app/modules/configuration/identity/identity-config.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/templates/skeleton/app/modules/configuration/identity/identity-config.js b/app/templates/skeleton/app/modules/configuration/identity/identity-config.js index 3746e3f..a801fdd 100755 --- a/app/templates/skeleton/app/modules/configuration/identity/identity-config.js +++ b/app/templates/skeleton/app/modules/configuration/identity/identity-config.js @@ -8,7 +8,7 @@ angular.module('configuration.identity', ['configuration.rest', 'ngCookies', 'ui $scope.identity = identityService.getIdentity(); }); - $scope.signOut = function () { + $scope.signOut = function () { delete $scope.identity; authenticationService.signOut(); identityService.clear(); @@ -38,7 +38,7 @@ angular.module('configuration.identity', ['configuration.rest', 'ngCookies', 'ui update: function (newIdentity) { identity = newIdentity; - $cookies.put("username" , identity.username, {expires: new Date(2016, 1, 1)}); + $cookies.put("username" , identity.username, {expires: cookieTimeOutMillis }); $cookies.put("authorities" , identity.authorities.join(), {expires: cookieTimeOutMillis }); }, From e8d4efdf83927f959ba46b52780d77a9181750fa Mon Sep 17 00:00:00 2001 From: Mohammad Zolmajd Date: Thu, 17 Sep 2015 13:12:46 -0400 Subject: [PATCH 3/4] Upgraded ng-fileupload from 4.x to 7.x and changed the code/templates accordingly. --- .../modules/company/details/company-details-controller.js | 6 +++--- .../app/modules/company/details/company-details.html | 8 ++++---- app/templates/skeleton/bower.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/templates/skeleton/app/modules/company/details/company-details-controller.js b/app/templates/skeleton/app/modules/company/details/company-details-controller.js index 98a7d07..ba23609 100755 --- a/app/templates/skeleton/app/modules/company/details/company-details-controller.js +++ b/app/templates/skeleton/app/modules/company/details/company-details-controller.js @@ -6,8 +6,7 @@ angular.module('company') $scope.company = company; $scope.isEditing = company && company.id; - $scope.image = $scope.$rejectedFiles ? null : $scope.image; - $scope.imageSizeLimit = 1024*1024*10; + $scope.companyImageNgfValidate = {size: {max: '10MB', min: '10B'}}; $scope.delete = function() { companyRestService.delete($scope.company) @@ -15,7 +14,8 @@ angular.module('company') }; $scope.createOrUpdate = function() { - companyRestService.createOrUpdate($scope.company, $scope.image, $scope.isEditing) + var image = $scope.image.$error ? null : $scope.image; + companyRestService.createOrUpdate($scope.company, image, $scope.isEditing) .then(_backToList); }; diff --git a/app/templates/skeleton/app/modules/company/details/company-details.html b/app/templates/skeleton/app/modules/company/details/company-details.html index 80f88a2..9ca089b 100755 --- a/app/templates/skeleton/app/modules/company/details/company-details.html +++ b/app/templates/skeleton/app/modules/company/details/company-details.html @@ -44,10 +44,10 @@

- - - -
COMPANY.INVALID_IMAGE_FILE
+ + + +
COMPANY.INVALID_IMAGE_FILE
diff --git a/app/templates/skeleton/bower.json b/app/templates/skeleton/bower.json index 46eded6..14a76a8 100755 --- a/app/templates/skeleton/bower.json +++ b/app/templates/skeleton/bower.json @@ -20,8 +20,8 @@ "angular-bootstrap": "~0.13", "moment": "~2.9", "font-awesome": "~4.3", - "ng-file-upload": "~4.1.4", - "ng-file-upload-shim": "~4.1.4" + "ng-file-upload": "~7.2.0", + "ng-file-upload-shim": "~7.2.0" }, "devDependencies": { "angular-mocks": "~1.4.5" From e716b9c4ce3d75236cfd969f5e981e4e3f1162d3 Mon Sep 17 00:00:00 2001 From: Mohammad Zolmajd Date: Thu, 17 Sep 2015 13:39:07 -0400 Subject: [PATCH 4/4] updated the resolution to 1.4.6. --- app/templates/skeleton/bower.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/skeleton/bower.json b/app/templates/skeleton/bower.json index 14a76a8..259adb3 100755 --- a/app/templates/skeleton/bower.json +++ b/app/templates/skeleton/bower.json @@ -27,7 +27,7 @@ "angular-mocks": "~1.4.5" }, "resolutions": { - "angular": "1.4.5", + "angular": "1.4.6", "angular-translate": "~2.7.2" }