Merge pull request #1841 from nextcloud/oc_26359

Bumo zxcvbn && Fix zxcvbn path in setup page (26359)

core/js/setup.js

@@ -114,7 +114,7 @@ $(document).ready(function() {
 	}
 
 	$('#adminpass').strengthify({
-		zxcvbn: OC.linkTo('core','vendor/zxcvbn/zxcvbn.js'),
+		zxcvbn: OC.linkTo('core','vendor/zxcvbn/dist/zxcvbn.js'),
 		titles: [
 			t('core', 'Very weak password'),
 			t('core', 'Weak password'),

core/vendor/.gitignore

@@ -104,7 +104,9 @@ select2/**
 #zxcvbn
 zxcvbn/**
 !zxcvbn/.bower.json
-!zxcvbn/zxcvbn.js
+!zxcvbn/dist
+zxcvbn/dist/**
+!zxcvbn/dist/zxcvbn.js
 !zxcvbn/LICENSE.txt
 
 # snapjs

core/vendor/zxcvbn/.bower.json

@@ -1,14 +1,45 @@
 {
   "name": "zxcvbn",
-  "main": "zxcvbn.js",
-  "homepage": "https://github.com/lowe/zxcvbn",
-  "_release": "f2a8cda13d",
+  "description": "realistic password strength estimation",
+  "main": "dist/zxcvbn.js",
+  "keywords": [
+    "password",
+    "passphrase",
+    "strength",
+    "quality",
+    "estimation",
+    "estimate",
+    "meter",
+    "pattern",
+    "matcher",
+    "security",
+    "authentication",
+    "cracking",
+    "scoring",
+    "entropy",
+    "bruteforce"
+  ],
+  "ignore": [
+    "/.*",
+    "*.json",
+    "node_modules",
+    "data",
+    "data-scripts",
+    "demo",
+    "lib",
+    "src",
+    "test"
+  ],
+  "homepage": "https://github.com/dropbox/zxcvbn",
+  "version": "4.4.0",
+  "_release": "4.4.0",
   "_resolution": {
-    "type": "branch",
-    "branch": "master",
-    "commit": "f2a8cda13d247f4956d3334ee7cbae80a2c61a97"
+    "type": "version",
+    "tag": "v4.4.0",
+    "commit": "4c3d1c2b4a246cc8d7c81a61e341ad92ce14411b"
   },
-  "_source": "git://github.com/lowe/zxcvbn.git",
-  "_target": "*",
-  "_originalSource": "zxcvbn"
+  "_source": "https://github.com/dropbox/zxcvbn.git",
+  "_target": "^4.4.0",
+  "_originalSource": "zxcvbn",
+  "_direct": true
 }

core/vendor/zxcvbn/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2012 Dropbox, Inc.
+Copyright (c) 2012-2016 Dan Wheeler and Dropbox, Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

settings/js/personal.js

@@ -364,7 +364,7 @@ $(document).ready(function () {
 	});
 
 	$('#pass2').strengthify({
-		zxcvbn: OC.linkTo('core','vendor/zxcvbn/zxcvbn.js'),
+		zxcvbn: OC.linkTo('core','vendor/zxcvbn/dist/zxcvbn.js'),
 		titles: [
 			t('core', 'Very weak password'),
 			t('core', 'Weak password'),