Merge branch 'master' into release-2.0.0-rc.8

reactioncommerce · Nov 30, 2018 · a08a1b2 · a08a1b2
2 parents 6dace5e + 231757b
commit a08a1b2
Show file tree

Hide file tree

Showing 29 changed files with 59 additions and 130 deletions.
diff --git a/imports/collections/schemas/social.js b/imports/collections/schemas/social.js
@@ -35,7 +35,6 @@ registerSchema("SocialProvider", SocialProvider);
  * @property {Object} settings.public.apps optional
  * @property {SocialProvider} settings.public.apps.facebook  optional, Facebook
  * @property {String} settings.public.apps.facebook.appId optional, Facebook App ID
- * @property {String} settings.public.apps.facebook.appSecret optional, Facebook App Secret
  * @property {SocialProvider} settings.public.apps.twitter optional, Twitter
  * @property {String} settings.public.apps.twitter.username optional, Twitter username
  * @property {SocialProvider} settings.public.apps.pinterest optional, Pinterest
@@ -71,12 +70,6 @@ export const SocialPackageConfig = PackageConfig.clone().extend({
     label: "App Id",
     optional: true
   },
-  "settings.public.apps.facebook.appSecret": {
-    type: String,
-    regEx: /[\da-z]+/,
-    label: "App Secret",
-    optional: true
-  },
   "settings.public.apps.twitter": {
     type: SocialProvider,
     optional: true,

diff --git a/imports/plugins/core/versions/server/migrations/43-1_remove_social_app_secret.js b/imports/plugins/core/versions/server/migrations/43-1_remove_social_app_secret.js
@@ -0,0 +1,24 @@
+import { Migrations } from "meteor/percolate:migrations";
+import { Packages } from "/lib/collections";
+
+/**
+ * This is a point migration which unsets appSecret if it exists.
+ * appSecret is unused and unnecessary for reaction-social.
+ *
+ * This migration has been backported to several legacy versions of Reaction Commerce.
+ * Depending on what version you patched,
+ * you may have different migration version numbers used for this particular migration.
+ */
+
+Migrations.add({
+  version: 43.1,
+  up() {
+    Packages.update({
+      name: "reaction-social"
+    }, {
+      $unset: {
+        "settings.public.apps.facebook.appSecret": ""
+      }
+    }, { bypassCollection2: true, multi: true });
+  }
+});
diff --git a/imports/plugins/core/versions/server/migrations/index.js b/imports/plugins/core/versions/server/migrations/index.js
@@ -41,6 +41,7 @@ import "./40_two_point_oh";
 import "./41_set_should_appear_in_sitemap";
 import "./42_payment_methods";
 import "./43_stripe_marketplace_pkg";
+import "./43-1_remove_social_app_secret";
 import "./44_tax_rates_pkg";
 import "./45_tax_schema_changes";
 import "./46_cart_item_props";

diff --git a/imports/plugins/included/social/client/components/settings.js b/imports/plugins/included/social/client/components/settings.js
@@ -11,7 +11,7 @@ const socialProviders = [
   {
     name: "facebook",
     icon: "fa fa-facebook",
-    fields: ["appId", "appSecret", "profilePage"]
+    fields: ["appId", "profilePage"]
   },
   {
     name: "twitter",

diff --git a/imports/plugins/included/social/server/i18n/ar.json b/imports/plugins/included/social/server/i18n/ar.json
@@ -15,7 +15,6 @@
               "facebook": {
                 "title": "Facebook",
                 "appId": "معرف التطبيق",
-                "appSecret": "التطبيق السرية",
                 "profilePage": "الصفحة الشخصية"
               },
               "googleplus": {

diff --git a/imports/plugins/included/social/server/i18n/bg.json b/imports/plugins/included/social/server/i18n/bg.json
@@ -15,7 +15,6 @@
               "facebook": {
                 "title": "Facebook",
                 "appId": "ID на приложението",
-                "appSecret": "App Secret",
                 "profilePage": "профилна страница"
               },
               "googleplus": {

diff --git a/imports/plugins/included/social/server/i18n/cs.json b/imports/plugins/included/social/server/i18n/cs.json
@@ -15,7 +15,6 @@
               "facebook": {
                 "title": "Facebook",
                 "appId": "ID aplikace",
-                "appSecret": "App Secret",
                 "profilePage": "stránka profilu"
               },
               "googleplus": {

diff --git a/imports/plugins/included/social/server/i18n/de.json b/imports/plugins/included/social/server/i18n/de.json
@@ -15,7 +15,6 @@
               "facebook": {
                 "title": "Facebook",
                 "appId": "App-ID",
-                "appSecret": "App Geheimnis",
                 "profilePage": "Profilseite"
               },
               "googleplus": {

diff --git a/imports/plugins/included/social/server/i18n/el.json b/imports/plugins/included/social/server/i18n/el.json
@@ -15,7 +15,6 @@
               "facebook": {
                 "title": "Facebook",
                 "appId": "Αναγνωριστικό εφαρμογής",
-                "appSecret": "App μυστικό",
                 "profilePage": "Σελίδα προφίλ"
               },
               "googleplus": {

diff --git a/imports/plugins/included/social/server/i18n/en.json b/imports/plugins/included/social/server/i18n/en.json
@@ -15,7 +15,6 @@
               "facebook": {
                 "title": "Facebook",
                 "appId": "App ID",
-                "appSecret": "App Secret",
                 "profilePage": "Profile Page"
               },
               "googleplus": {

diff --git a/imports/plugins/included/social/server/i18n/es.json b/imports/plugins/included/social/server/i18n/es.json
@@ -15,7 +15,6 @@
               "facebook": {
                 "title": "Facebook",
                 "appId": "ID de la aplicación",
-                "appSecret": "App secreta",
                 "profilePage": "Página de perfil"
               },
               "googleplus": {

diff --git a/imports/plugins/included/social/server/i18n/fr.json b/imports/plugins/included/social/server/i18n/fr.json
@@ -15,7 +15,6 @@
               "facebook": {
                 "title": "Facebook",
                 "appId": "ID de l'application",
-                "appSecret": "App secret",
                 "profilePage": "URL du profil"
               },
               "googleplus": {

diff --git a/imports/plugins/included/social/server/i18n/hr.json b/imports/plugins/included/social/server/i18n/hr.json
@@ -15,7 +15,6 @@
               "facebook": {
                 "title": "Facebook",
                 "appId": "ID aplikacije",
-                "appSecret": "aplikacija tajna",
                 "profilePage": "Stranica profila"
               },
               "googleplus": {

diff --git a/imports/plugins/included/social/server/i18n/hu.json b/imports/plugins/included/social/server/i18n/hu.json
@@ -15,7 +15,6 @@
               "facebook": {
                 "title": "Facebook",
                 "appId": "App ID",
-                "appSecret": "App Secret",
                 "profilePage": "Profil oldal"
               },
               "googleplus": {

diff --git a/imports/plugins/included/social/server/i18n/it.json b/imports/plugins/included/social/server/i18n/it.json
@@ -15,7 +15,6 @@
               "facebook": {
                 "title": "Facebook",
                 "appId": "ID dell'app",
-                "appSecret": "App Segreto",
                 "profilePage": "Pagina profilo"
               },
               "googleplus": {

diff --git a/imports/plugins/included/social/server/i18n/my.json b/imports/plugins/included/social/server/i18n/my.json
@@ -15,7 +15,6 @@
               "facebook": {
                 "title": "Facebook က",
                 "appId": "App ကို ID ကို",
-                "appSecret": "App ကိုလြှို့ဝှကျ",
                 "profilePage": "ပရိုဖိုင်းကို 's Page"
               },
               "googleplus": {

diff --git a/imports/plugins/included/social/server/i18n/nl.json b/imports/plugins/included/social/server/i18n/nl.json
@@ -15,7 +15,6 @@
               "facebook": {
                 "title": "Facebook",
                 "appId": "App ID",
-                "appSecret": "App Secret",
                 "profilePage": "Profiel pagina"
               },
               "googleplus": {

diff --git a/imports/plugins/included/social/server/i18n/pl.json b/imports/plugins/included/social/server/i18n/pl.json
@@ -15,7 +15,6 @@
               "facebook": {
                 "title": "Facebook",
                 "appId": "Identyfikator aplikacji",
-                "appSecret": "App Tajny",
                 "profilePage": "Strona profilowa"
               },
               "googleplus": {

diff --git a/imports/plugins/included/social/server/i18n/pt.json b/imports/plugins/included/social/server/i18n/pt.json
@@ -15,7 +15,6 @@
               "facebook": {
                 "title": "Facebook",
                 "appId": "ID da aplicação",
-                "appSecret": "app Segredo",
                 "profilePage": "Página de perfil"
               },
               "googleplus": {

diff --git a/imports/plugins/included/social/server/i18n/ro.json b/imports/plugins/included/social/server/i18n/ro.json
@@ -15,7 +15,6 @@
               "facebook": {
                 "title": "Facebook",
                 "appId": "ID-ul aplicației",
-                "appSecret": "aplicaţia Secret",
                 "profilePage": "profilul Pagina"
               },
               "googleplus": {

diff --git a/imports/plugins/included/social/server/i18n/ru.json b/imports/plugins/included/social/server/i18n/ru.json
@@ -15,7 +15,6 @@
               "facebook": {
                 "title": "Facebook",
                 "appId": "Идентификатор приложения",
-                "appSecret": "App Secret",
                 "profilePage": "Страница профиля"
               },
               "googleplus": {

diff --git a/imports/plugins/included/social/server/i18n/sl.json b/imports/plugins/included/social/server/i18n/sl.json
@@ -15,7 +15,6 @@
               "facebook": {
                 "title": "Facebook",
                 "appId": "App ID",
-                "appSecret": "App Secret",
                 "profilePage": "profil Page"
               },
               "googleplus": {

diff --git a/imports/plugins/included/social/server/i18n/sv.json b/imports/plugins/included/social/server/i18n/sv.json
@@ -15,7 +15,6 @@
               "facebook": {
                 "title": "Facebook",
                 "appId": "App ID",
-                "appSecret": "app Secret",
                 "profilePage": "Profilsida"
               },
               "googleplus": {

diff --git a/imports/plugins/included/social/server/i18n/tr.json b/imports/plugins/included/social/server/i18n/tr.json
@@ -15,7 +15,6 @@
               "facebook": {
                 "title": "Facebook",
                 "appId": "Uygulama kimliği",
-                "appSecret": "Uygulama Gizli",
                 "profilePage": "Profil sayfası"
               },
               "googleplus": {

diff --git a/imports/plugins/included/social/server/i18n/vi.json b/imports/plugins/included/social/server/i18n/vi.json
@@ -15,7 +15,6 @@
               "facebook": {
                 "title": "Facebook",
                 "appId": "ID ứng dụng",
-                "appSecret": "App bí mật",
                 "profilePage": "Profile"
               },
               "googleplus": {

diff --git a/imports/plugins/included/social/server/i18n/zh.json b/imports/plugins/included/social/server/i18n/zh.json
@@ -15,7 +15,6 @@
               "facebook": {
                 "title": "Facebook",
                 "appId": "应用程式ID",
-                "appSecret": "应用秘密",
                 "profilePage": "个人主页"
               },
               "googleplus": {