Fix unsafe-eval used in 2FA admin settings

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2018-10-15 12:01:42 +02:00 · 2018-10-15 12:01:42 +02:00 · f8579a87f5
parent ad66b0f9ab
commit f8579a87f5
18 changed files with 8642 additions and 771 deletions
--- a/settings/js/0.js
+++ b/settings/js/0.js
--- a/settings/js/0.js.map
+++ b/settings/js/0.js.map
--- a/settings/js/1.js
+++ b/settings/js/1.js
--- a/settings/js/1.js.map
+++ b/settings/js/1.js.map
--- a/settings/js/2.js
+++ b/settings/js/2.js
--- a/settings/js/2.js.map
+++ b/settings/js/2.js.map
--- a/settings/js/3.js
+++ b/settings/js/3.js
--- a/settings/js/3.js.map
+++ b/settings/js/3.js.map
--- a/settings/js/4.js
+++ b/settings/js/4.js
--- a/settings/js/4.js.map
+++ b/settings/js/4.js.map
--- a/settings/js/5.js
+++ b/settings/js/5.js
--- a/settings/js/5.js.map
+++ b/settings/js/5.js.map
--- a/settings/js/settings-admin-security.js
+++ b/settings/js/settings-admin-security.js
--- a/settings/js/settings-admin-security.js.map
+++ b/settings/js/settings-admin-security.js.map
--- a/settings/js/settings-vue.js
+++ b/settings/js/settings-vue.js
--- a/settings/js/settings-vue.js.map
+++ b/settings/js/settings-vue.js.map
--- a/settings/src/main-admin-security.js
+++ b/settings/src/main-admin-security.js
@ -1,13 +1,10 @@
 import Vue from 'vue'

-import AdminTwoFactor from './components/AdminTwoFactor'
+import AdminTwoFactor from './components/AdminTwoFactor.vue'
+
+__webpack_nonce__ = btoa(OC.requestToken)

 Vue.prototype.t = t;

-new Vue({
-	el: '#two-factor-auth-settings',
-	template: '<AdminTwoFactor/>',
-	components: {
-		AdminTwoFactor
-	}
-})
+const View = Vue.extend(AdminTwoFactor)
+new View().$mount('#two-factor-auth-settings')
--- a/settings/webpack.dev.js
+++ b/settings/webpack.dev.js
@ -8,5 +8,5 @@ module.exports = merge(common, {
    noInfo: true,
    overlay: true
  },
-  devtool: '#eval-source-map',
+  devtool: 'source-map',
 })