From 6a3409891c95fa4b9a69de348dc28bb1f58dbcd9 Mon Sep 17 00:00:00 2001 From: Natalia Tsvetkova Date: Fri, 6 Sep 2019 09:14:42 +0200 Subject: [PATCH 01/13] Added instagram social auth provider --- .../getstarted/exports/graphql/schema.graphql | 4 ++-- .../admin/src/components/PopUpForm/index.js | 2 ++ .../admin/src/translations/ar.json | 1 + .../admin/src/translations/de.json | 1 + .../admin/src/translations/en.json | 1 + .../admin/src/translations/es.json | 1 + .../admin/src/translations/fr.json | 1 + .../admin/src/translations/it.json | 1 + .../admin/src/translations/ja.json | 1 + .../admin/src/translations/ko.json | 1 + .../admin/src/translations/nl.json | 1 + .../admin/src/translations/pl.json | 1 + .../admin/src/translations/pt-BR.json | 1 + .../admin/src/translations/pt.json | 1 + .../admin/src/translations/ru.json | 1 + .../admin/src/translations/tr.json | 5 +++-- .../admin/src/translations/zh-Hans.json | 1 + .../admin/src/translations/zh.json | 1 + .../config/functions/bootstrap.js | 7 +++++++ .../services/Providers.js | 19 +++++++++++++++++++ 20 files changed, 48 insertions(+), 4 deletions(-) diff --git a/examples/getstarted/exports/graphql/schema.graphql b/examples/getstarted/exports/graphql/schema.graphql index d6b88dbbb0..1cd137e7d6 100644 --- a/examples/getstarted/exports/graphql/schema.graphql +++ b/examples/getstarted/exports/graphql/schema.graphql @@ -304,7 +304,7 @@ input UserInput { } type UsersPermissionsMe { - _id: ID! + id: ID! username: String! email: String! confirmed: Boolean @@ -313,7 +313,7 @@ type UsersPermissionsMe { } type UsersPermissionsMeRole { - _id: ID! + id: ID! name: String! description: String type: String diff --git a/packages/strapi-plugin-users-permissions/admin/src/components/PopUpForm/index.js b/packages/strapi-plugin-users-permissions/admin/src/components/PopUpForm/index.js index 25addeb29a..09b7423480 100644 --- a/packages/strapi-plugin-users-permissions/admin/src/components/PopUpForm/index.js +++ b/packages/strapi-plugin-users-permissions/admin/src/components/PopUpForm/index.js @@ -60,6 +60,8 @@ class PopUpForm extends React.Component { return `${strapi.backendURL}/connect/microsoft/callback`; case 'twitter': return `${strapi.backendURL}/connect/twitter/callback`; + case 'instagram': + return `${strapi.backendURL}/connect/instagram/callback`; default: { const value = get(this.props.values, 'callback', ''); diff --git a/packages/strapi-plugin-users-permissions/admin/src/translations/ar.json b/packages/strapi-plugin-users-permissions/admin/src/translations/ar.json index c78f12692c..a90823c558 100644 --- a/packages/strapi-plugin-users-permissions/admin/src/translations/ar.json +++ b/packages/strapi-plugin-users-permissions/admin/src/translations/ar.json @@ -119,6 +119,7 @@ "PopUpForm.Providers.facebook.providerConfig.redirectURL": "عنوان URL لإعادة التوجيه لإضافتة تكوين تطبيق Facebook", "PopUpForm.Providers.github.providerConfig.redirectURL": "عنوان URL لإعادة التوجيه لإضافتة تكوين تطبيق Github", "PopUpForm.Providers.google.providerConfig.redirectURL": "عنوان URL لإعادة التوجيه لإضافتة تكوين تطبيق Google", + "PopUpForm.Providers.instagram.providerConfig.redirectURL": "عنوان URL لإعادة التوجيه لإضافتة تكوين تطبيق Instagram", "PopUpForm.Providers.key.label": "معرف العميل", "PopUpForm.Providers.key.placeholder": "نص", "PopUpForm.Providers.linkedin2.providerConfig.redirectURL": "عنوان URL لإعادة التوجيه لإضافتة تكوين تطبيق Linkedin", diff --git a/packages/strapi-plugin-users-permissions/admin/src/translations/de.json b/packages/strapi-plugin-users-permissions/admin/src/translations/de.json index 79dd814713..81166ab13b 100644 --- a/packages/strapi-plugin-users-permissions/admin/src/translations/de.json +++ b/packages/strapi-plugin-users-permissions/admin/src/translations/de.json @@ -128,6 +128,7 @@ "PopUpForm.Providers.facebook.providerConfig.redirectURL": "Die URL, die in den Einstellungen deiner Facebook-App gesetzt wird", "PopUpForm.Providers.github.providerConfig.redirectURL": "Die URL, die in den Einstellungen deiner Github-App gesetzt wird", "PopUpForm.Providers.google.providerConfig.redirectURL": "Die URL, die in den Einstellungen deiner Google-App gesetzt wird", + "PopUpForm.Providers.instagram.providerConfig.redirectURL": "Die URL, die in den Einstellungen deiner Instagram-App gesetzt wird", "PopUpForm.Providers.microsoft.providerConfig.redirectURL": "Die URL, die in den Einstellungen deiner Microsoft-App gesetzt wird", "PopUpForm.Providers.key.label": "Client ID", "PopUpForm.Providers.key.placeholder": "TEXT", diff --git a/packages/strapi-plugin-users-permissions/admin/src/translations/en.json b/packages/strapi-plugin-users-permissions/admin/src/translations/en.json index 70fd075bad..e9f39a019f 100644 --- a/packages/strapi-plugin-users-permissions/admin/src/translations/en.json +++ b/packages/strapi-plugin-users-permissions/admin/src/translations/en.json @@ -128,6 +128,7 @@ "PopUpForm.Providers.facebook.providerConfig.redirectURL": "The redirect URL to add in your Facebook application configurations", "PopUpForm.Providers.github.providerConfig.redirectURL": "The redirect URL to add in your GitHub application configurations", "PopUpForm.Providers.google.providerConfig.redirectURL": "The redirect URL to add in your Google application configurations", + "PopUpForm.Providers.instagram.providerConfig.redirectURL": "The redirect URL to add in your Instagram application configurations", "PopUpForm.Providers.key.label": "Client ID", "PopUpForm.Providers.key.placeholder": "TEXT", "PopUpForm.Providers.linkedin2.providerConfig.redirectURL": "The redirect URL to add in your Linkedin application configurations", diff --git a/packages/strapi-plugin-users-permissions/admin/src/translations/es.json b/packages/strapi-plugin-users-permissions/admin/src/translations/es.json index 8e12b29713..2985b7aa9b 100644 --- a/packages/strapi-plugin-users-permissions/admin/src/translations/es.json +++ b/packages/strapi-plugin-users-permissions/admin/src/translations/es.json @@ -127,6 +127,7 @@ "PopUpForm.Providers.facebook.providerConfig.redirectURL": "La URL de redirección que se debe agregar en la configuración de la aplicación Facebook", "PopUpForm.Providers.github.providerConfig.redirectURL": "La URL de redirección que se debe agregar en la configuración de la aplicación GitHub", "PopUpForm.Providers.google.providerConfig.redirectURL": "La URL de redirección que se debe agregar en la configuración de la aplicación Google", + "PopUpForm.Providers.instagram.providerConfig.redirectURL": "La URL de redirección que se debe agregar en la configuración de la aplicación Instagram", "PopUpForm.Providers.key.label": "ID de cliente", "PopUpForm.Providers.key.placeholder": "TEXTO", "PopUpForm.Providers.linkedin2.providerConfig.redirectURL": "La URL de redirección que se debe agregar en la configuración de la aplicación Linkedin", diff --git a/packages/strapi-plugin-users-permissions/admin/src/translations/fr.json b/packages/strapi-plugin-users-permissions/admin/src/translations/fr.json index 2252d65b2f..6e173d65d0 100644 --- a/packages/strapi-plugin-users-permissions/admin/src/translations/fr.json +++ b/packages/strapi-plugin-users-permissions/admin/src/translations/fr.json @@ -129,6 +129,7 @@ "PopUpForm.Providers.facebook.providerConfig.redirectURL": "L'URL de redirection à ajouter dans les configurations Facebook de votre application", "PopUpForm.Providers.github.providerConfig.redirectURL": "L'URL de redirection à ajouter dans les configurations GitHub de votre application", "PopUpForm.Providers.google.providerConfig.redirectURL": "L'URL de redirection à ajouter dans les configurations Google de votre application", + "PopUpForm.Providers.instagram.providerConfig.redirectURL": "L'URL de redirection à ajouter dans les configurations Instagram de votre application", "PopUpForm.Providers.key.label": "Client ID", "PopUpForm.Providers.key.placeholder": "TEXT", "PopUpForm.Providers.linkedin2.providerConfig.redirectURL": "L'URL de redirection à ajouter dans les configurations Linkedin de votre application", diff --git a/packages/strapi-plugin-users-permissions/admin/src/translations/it.json b/packages/strapi-plugin-users-permissions/admin/src/translations/it.json index 8c8fae0476..5f49abc40e 100644 --- a/packages/strapi-plugin-users-permissions/admin/src/translations/it.json +++ b/packages/strapi-plugin-users-permissions/admin/src/translations/it.json @@ -118,6 +118,7 @@ "PopUpForm.Providers.facebook.providerConfig.redirectURL": "L'URL di redirect per aggiungere la tua configurazione dell'applicazione Facebook", "PopUpForm.Providers.github.providerConfig.redirectURL": "L'URL di redirect per aggiungere la tua configurazione dell'applicazione Github", "PopUpForm.Providers.google.providerConfig.redirectURL": "L'URL di redirect per aggiungere la tua configurazione dell'applicazione Google", + "PopUpForm.Providers.instagram.providerConfig.redirectURL": "L'URL di redirect per aggiungere la tua configurazione dell'applicazione Instagram", "PopUpForm.Providers.key.placeholder": "TEXT", "PopUpForm.Providers.linkedin2.providerConfig.redirectURL": "L'URL di redirect per aggiungere la tua configurazione dell'applicazione Linkdin", "PopUpForm.Providers.redirectURL.front-end.label": "L'URL di redirect per la tua app di front-end", diff --git a/packages/strapi-plugin-users-permissions/admin/src/translations/ja.json b/packages/strapi-plugin-users-permissions/admin/src/translations/ja.json index 65ee3e484b..9c939785a6 100644 --- a/packages/strapi-plugin-users-permissions/admin/src/translations/ja.json +++ b/packages/strapi-plugin-users-permissions/admin/src/translations/ja.json @@ -127,6 +127,7 @@ "PopUpForm.Providers.facebook.providerConfig.redirectURL": "Facebookアプリケーション設定で追加するリダイレクトURL", "PopUpForm.Providers.github.providerConfig.redirectURL": "GitHubアプリケーションの設定で追加するリダイレクトURL", "PopUpForm.Providers.google.providerConfig.redirectURL": "Googleアプリケーション設定で追加するリダイレクトURL", + "PopUpForm.Providers.instagram.providerConfig.redirectURL": "Instagramアプリケーション設定で追加するリダイレクトURL", "PopUpForm.Providers.key.label": "クライアントID", "PopUpForm.Providers.key.placeholder": "TEXT", "PopUpForm.Providers.linkedin2.providerConfig.redirectURL": "あなたのLinkedinアプリケーション構成に追加するリダイレクトURL", diff --git a/packages/strapi-plugin-users-permissions/admin/src/translations/ko.json b/packages/strapi-plugin-users-permissions/admin/src/translations/ko.json index a26897dfba..4c3c926017 100644 --- a/packages/strapi-plugin-users-permissions/admin/src/translations/ko.json +++ b/packages/strapi-plugin-users-permissions/admin/src/translations/ko.json @@ -119,6 +119,7 @@ "PopUpForm.Providers.facebook.providerConfig.redirectURL": "Facebook 애플리케이션 구성에 추가 할 리다이렉트 URL", "PopUpForm.Providers.github.providerConfig.redirectURL": "Github 애플리케이션 구성에 추가 할 리다이렉트 URL", "PopUpForm.Providers.google.providerConfig.redirectURL": "Google 애플리케이션 구성에 추가 할 리다이렉트 URL", + "PopUpForm.Providers.instagram.providerConfig.redirectURL": "Instagram 애플리케이션 구성에 추가 할 리다이렉트 URL", "PopUpForm.Providers.key.label": "클라이언트 ID(Client ID)", "PopUpForm.Providers.key.placeholder": "텍스트", "PopUpForm.Providers.linkedin2.providerConfig.redirectURL": "Linkedin", diff --git a/packages/strapi-plugin-users-permissions/admin/src/translations/nl.json b/packages/strapi-plugin-users-permissions/admin/src/translations/nl.json index 1489e970a4..7c3fa5bc98 100644 --- a/packages/strapi-plugin-users-permissions/admin/src/translations/nl.json +++ b/packages/strapi-plugin-users-permissions/admin/src/translations/nl.json @@ -128,6 +128,7 @@ "PopUpForm.Providers.facebook.providerConfig.redirectURL": "De doorstuur URL om in je Facebook applicatie configuratie te zetten", "PopUpForm.Providers.github.providerConfig.redirectURL": "De doorstuur URL om in je GitHub applicatie configuratie te zetten", "PopUpForm.Providers.google.providerConfig.redirectURL": "De doorstuur URL om in je Google applicatie configuratie te zetten", + "PopUpForm.Providers.instagram.providerConfig.redirectURL": "De doorstuur URL om in je Instagram applicatie configuratie te zetten", "PopUpForm.Providers.key.label": "Client ID", "PopUpForm.Providers.key.placeholder": "TEXT", "PopUpForm.Providers.microsoft.providerConfig.redirectURL": "De doorstuur URL om in je Microsoft applicatie configuratie te zetten", diff --git a/packages/strapi-plugin-users-permissions/admin/src/translations/pl.json b/packages/strapi-plugin-users-permissions/admin/src/translations/pl.json index 02d401f7d5..ae36504139 100644 --- a/packages/strapi-plugin-users-permissions/admin/src/translations/pl.json +++ b/packages/strapi-plugin-users-permissions/admin/src/translations/pl.json @@ -127,6 +127,7 @@ "PopUpForm.Providers.facebook.providerConfig.redirectURL": "Adres przekierowania do dodania w aplikacji Facebook", "PopUpForm.Providers.github.providerConfig.redirectURL": "Adres przekierowania do dodania w aplikacji GitHub", "PopUpForm.Providers.google.providerConfig.redirectURL": "Adres przekierowania do dodania w aplikacji Google", + "PopUpForm.Providers.instagram.providerConfig.redirectURL": "Adres przekierowania do dodania w aplikacji Instagram", "PopUpForm.Providers.key.label": "ID klienta", "PopUpForm.Providers.key.placeholder": "TEKST", "PopUpForm.Providers.discord.providerConfig.redirectURL": "Adres przekierowania do dodania w aplikacji Discord", diff --git a/packages/strapi-plugin-users-permissions/admin/src/translations/pt-BR.json b/packages/strapi-plugin-users-permissions/admin/src/translations/pt-BR.json index 21e06ae010..8ae522dd70 100644 --- a/packages/strapi-plugin-users-permissions/admin/src/translations/pt-BR.json +++ b/packages/strapi-plugin-users-permissions/admin/src/translations/pt-BR.json @@ -119,6 +119,7 @@ "PopUpForm.Providers.facebook.providerConfig.redirectURL": "O URL de redirecionamento para adicionar em suas configurações de aplicativos do Facebook", "PopUpForm.Providers.github.providerConfig.redirectURL": "O URL de redirecionamento para adicionar nas configurações do aplicativo GitHub", "PopUpForm.Providers.google.providerConfig.redirectURL": "O URL de redirecionamento a adicionar nas suas configurações de aplicativo do Google", + "PopUpForm.Providers.instagram.providerConfig.redirectURL": "O URL de redirecionamento a adicionar nas suas configurações de aplicativo do Instagram", "PopUpForm.Providers.key.label": "ID do cliente", "PopUpForm.Providers.key.placeholder": "TEXT", "PopUpForm.Providers.linkedin2.providerConfig.redirectURL": "O URL de redirecionamento a ser adicionado nas configurações do aplicativo Linkedin", diff --git a/packages/strapi-plugin-users-permissions/admin/src/translations/pt.json b/packages/strapi-plugin-users-permissions/admin/src/translations/pt.json index 2728c36fdb..2ce14f17bb 100644 --- a/packages/strapi-plugin-users-permissions/admin/src/translations/pt.json +++ b/packages/strapi-plugin-users-permissions/admin/src/translations/pt.json @@ -127,6 +127,7 @@ "PopUpForm.Providers.facebook.providerConfig.redirectURL": "Endereço de redirecionamento para adicionar às configurações da sua aplicação do Facebook", "PopUpForm.Providers.github.providerConfig.redirectURL": "Endereço de redirecionamento para adicionar às configurações da sua aplicação de GitHub", "PopUpForm.Providers.google.providerConfig.redirectURL": "Endereço de redirecionamento para adicionar às configurações da sua aplicação da Google", + "PopUpForm.Providers.instagram.providerConfig.redirectURL": "Endereço de redirecionamento para adicionar às configurações da sua aplicação da Instagram", "PopUpForm.Providers.key.label": "ID de Client", "PopUpForm.Providers.key.placeholder": "TEXTO", "PopUpForm.Providers.linkedin2.providerConfig.redirectURL": "Endereço de redirecionamento para adicionar às configurações da sua aplicação de Linkedin", diff --git a/packages/strapi-plugin-users-permissions/admin/src/translations/ru.json b/packages/strapi-plugin-users-permissions/admin/src/translations/ru.json index 70cbaa9632..990246ac69 100644 --- a/packages/strapi-plugin-users-permissions/admin/src/translations/ru.json +++ b/packages/strapi-plugin-users-permissions/admin/src/translations/ru.json @@ -129,6 +129,7 @@ "PopUpForm.Providers.facebook.providerConfig.redirectURL": "URL-адрес перенаправления, который необходимо добавить в настройки Facebook приложения", "PopUpForm.Providers.github.providerConfig.redirectURL": "URL-адрес перенаправления, который необходимо добавить в настройки GitHub приложения", "PopUpForm.Providers.google.providerConfig.redirectURL": "URL-адрес перенаправления, который необходимо добавить в настройки Google приложения", + "PopUpForm.Providers.instagram.providerConfig.redirectURL": "URL-адрес перенаправления, который необходимо добавить в настройки Instagram приложения", "PopUpForm.Providers.key.label": "Client ID", "PopUpForm.Providers.key.placeholder": "TEXT", "PopUpForm.Providers.linkedin2.providerConfig.redirectURL": "URL-адрес перенаправления, который необходимо добавить в настройки Linkedin приложения", diff --git a/packages/strapi-plugin-users-permissions/admin/src/translations/tr.json b/packages/strapi-plugin-users-permissions/admin/src/translations/tr.json index ea9471692e..443e1688d3 100644 --- a/packages/strapi-plugin-users-permissions/admin/src/translations/tr.json +++ b/packages/strapi-plugin-users-permissions/admin/src/translations/tr.json @@ -20,7 +20,7 @@ "Auth.form.error.password.matching": "Parolalar uyuşmuyor.", "Auth.form.error.password.provide": "Lütfen şifrenizi girin.", "Auth.form.error.ratelimit": "Çok fazla deneme var. Lütfen bir dakika sonra tekrar deneyin.", - "Auth.form.error.user.not-exist": "Bu e-posta bulunmamaktadır..", + "Auth.form.error.user.not-exist": "Bu e-posta bulunmamaktadır..", "Auth.form.error.username.taken": "Kullanıcı adı zaten alınmış", "Auth.form.forgot-password.email.label": "E-postanızı giriniz", "Auth.form.forgot-password.email.label.success": "E-posta başarıyla gönderildi, ", @@ -122,12 +122,13 @@ "PopUpForm.Email.validation_email.options.message.placeholder": "

Hesabınızı doğrulamak için lütfen bu bağlantıyı tıklayın.

", "PopUpForm.Email.validation_email.options.object.placeholder": "Lütfen %APP_NAME% için e-posta adresinizi onaylayın", "PopUpForm.Providers.discord.providerConfig.redirectURL": "Discord uygulama yapılandırmalarınıza eklenecek yönlendirme URL'si", - "PopUpForm.Providers.callback.placeholder": "METİN", + "PopUpForm.Providers.callback.placeholder": "METİN", "PopUpForm.Providers.enabled.description": "Devre dışı bırakıldıysa kullanıcılar bu sağlayıcıyı kullanamaz.", "PopUpForm.Providers.enabled.label": "Etkinleştirme", "PopUpForm.Providers.facebook.providerConfig.redirectURL": "Facebook uygulama yapılandırmalarınıza eklenecek yönlendirme URL'si", "PopUpForm.Providers.github.providerConfig.redirectURL": "GitHub uygulama yapılandırmalarınıza eklenecek yönlendirme URL'si", "PopUpForm.Providers.google.providerConfig.redirectURL": "Google uygulama yapılandırmalarınıza eklenecek yönlendirme URL'si", + "PopUpForm.Providers.instagram.providerConfig.redirectURL": "Instagram uygulama yapılandırmalarınıza eklenecek yönlendirme URL'si", "PopUpForm.Providers.key.label": "Web istemcisi ID", "PopUpForm.Providers.key.placeholder": "METİN", "PopUpForm.Providers.linkedin2.providerConfig.redirectURL": "Linkedin uygulama yapılandırmalarınıza eklenecek yönlendirme URL'si", diff --git a/packages/strapi-plugin-users-permissions/admin/src/translations/zh-Hans.json b/packages/strapi-plugin-users-permissions/admin/src/translations/zh-Hans.json index 4573fea3a4..580a17829f 100644 --- a/packages/strapi-plugin-users-permissions/admin/src/translations/zh-Hans.json +++ b/packages/strapi-plugin-users-permissions/admin/src/translations/zh-Hans.json @@ -119,6 +119,7 @@ "PopUpForm.Providers.facebook.providerConfig.redirectURL": "Facebook应用中配置的重定向URL", "PopUpForm.Providers.github.providerConfig.redirectURL": "GitHub应用中配置的重定向URL", "PopUpForm.Providers.google.providerConfig.redirectURL": "Google应用中配置的重定向URL", + "PopUpForm.Providers.instagram.providerConfig.redirectURL": "Instagram应用中配置的重定向URL", "PopUpForm.Providers.key.label": "Client ID", "PopUpForm.Providers.key.placeholder": "TEXT", "PopUpForm.Providers.linkedin2.providerConfig.redirectURL": "Linkedin应用中配置的重定向URL", diff --git a/packages/strapi-plugin-users-permissions/admin/src/translations/zh.json b/packages/strapi-plugin-users-permissions/admin/src/translations/zh.json index ccd059cfeb..a46a8cfeca 100644 --- a/packages/strapi-plugin-users-permissions/admin/src/translations/zh.json +++ b/packages/strapi-plugin-users-permissions/admin/src/translations/zh.json @@ -127,6 +127,7 @@ "PopUpForm.Providers.facebook.providerConfig.redirectURL": "在 Facebook 的設定中填入的重新導向網址", "PopUpForm.Providers.github.providerConfig.redirectURL": "在 GitHub 的設定中填入的重新導向網址", "PopUpForm.Providers.google.providerConfig.redirectURL": "在 Google 的設定中填入的重新導向網址", + "PopUpForm.Providers.instagram.providerConfig.redirectURL": "在 Instagram 的設定中填入的重新導向網址", "PopUpForm.Providers.key.label": "客戶端 ID", "PopUpForm.Providers.key.placeholder": "TEXT", "PopUpForm.Providers.linkedin2.providerConfig.redirectURL": "在 Linkedin 的設定中填入的重新導向網址", diff --git a/packages/strapi-plugin-users-permissions/config/functions/bootstrap.js b/packages/strapi-plugin-users-permissions/config/functions/bootstrap.js index 4fc28d7b26..9d87c4e807 100644 --- a/packages/strapi-plugin-users-permissions/config/functions/bootstrap.js +++ b/packages/strapi-plugin-users-permissions/config/functions/bootstrap.js @@ -76,6 +76,13 @@ module.exports = async cb => { secret: '', callback: '/auth/twitter/callback', }, + instagram: { + enabled: false, + icon: 'instagram', + key: '', + secret: '', + callback: '/auth/instagram/callback', + }, }; const prevGrantConfig = (await pluginStore.get({ key: 'grant' })) || {}; // store grant auth config to db diff --git a/packages/strapi-plugin-users-permissions/services/Providers.js b/packages/strapi-plugin-users-permissions/services/Providers.js index 1bb0865a1f..42c1e1fd20 100644 --- a/packages/strapi-plugin-users-permissions/services/Providers.js +++ b/packages/strapi-plugin-users-permissions/services/Providers.js @@ -279,6 +279,25 @@ const getProfile = async (provider, query, callback) => { }); break; } + case 'instagram': { + const instagram = new Purest({ + provider: 'instagram', + key: grant.instagram.key, + secret: grant.instagram.secret + }); + + instagram.query().get('users/self').qs({access_token}).request((err, res, body) => { + if (err) { + callback(err); + } else { + callback(null, { + username: body.data.username, + email: `${body.data.username}@strapi.io` // dummy email as Instagram does not provide user email + }); + } + }); + break; + } default: callback({ message: 'Unknown provider.' From 64b70659cfee2e8fa2faf5099006531d030155c7 Mon Sep 17 00:00:00 2001 From: Natalia Tsvetkova Date: Fri, 6 Sep 2019 09:34:50 +0200 Subject: [PATCH 02/13] Adjusted version --- packages/strapi-plugin-users-permissions/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/strapi-plugin-users-permissions/package.json b/packages/strapi-plugin-users-permissions/package.json index b54f9835ec..5eb56fbb34 100644 --- a/packages/strapi-plugin-users-permissions/package.json +++ b/packages/strapi-plugin-users-permissions/package.json @@ -1,6 +1,6 @@ { "name": "strapi-plugin-users-permissions", - "version": "3.0.0-beta.15", + "version": "3.0.0-beta.16", "description": "Protect your API with a full-authentication process based on JWT", "strapi": { "name": "Roles & Permissions", From 822e4c65984a40cd0fcf702600c79cb2043b4d8a Mon Sep 17 00:00:00 2001 From: Natalia Tsvetkova Date: Fri, 6 Sep 2019 09:43:09 +0200 Subject: [PATCH 03/13] Revert "Adjusted version" This reverts commit 64b70659cfee2e8fa2faf5099006531d030155c7. --- packages/strapi-plugin-users-permissions/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/strapi-plugin-users-permissions/package.json b/packages/strapi-plugin-users-permissions/package.json index 5eb56fbb34..b54f9835ec 100644 --- a/packages/strapi-plugin-users-permissions/package.json +++ b/packages/strapi-plugin-users-permissions/package.json @@ -1,6 +1,6 @@ { "name": "strapi-plugin-users-permissions", - "version": "3.0.0-beta.16", + "version": "3.0.0-beta.15", "description": "Protect your API with a full-authentication process based on JWT", "strapi": { "name": "Roles & Permissions", From 861d5d111ae45863a7defa72062541e4eb3d93c8 Mon Sep 17 00:00:00 2001 From: jasongitmail <50032291+jasongitmail@users.noreply.github.com> Date: Tue, 10 Sep 2019 21:17:03 +0000 Subject: [PATCH 04/13] Update InputNumber to default to step="any" --- .../lib/src/components/InputNumber/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/strapi-helper-plugin/lib/src/components/InputNumber/index.js b/packages/strapi-helper-plugin/lib/src/components/InputNumber/index.js index 5aafe09b9b..8d57b1a362 100644 --- a/packages/strapi-helper-plugin/lib/src/components/InputNumber/index.js +++ b/packages/strapi-helper-plugin/lib/src/components/InputNumber/index.js @@ -29,7 +29,7 @@ function InputNumber(props) { onFocus={props.onFocus} placeholder={message} ref={props.inputRef} - step={!Number.isNaN(Number(props.step)) ? Number(props.step) : 1} + step={!Number.isNaN(Number(props.step)) ? Number(props.step) : 'any'} style={props.style} tabIndex={props.tabIndex} type="number" From 1b247554fe36dac3db798a48f1df7ab5647642e5 Mon Sep 17 00:00:00 2001 From: jasongitmail <50032291+jasongitmail@users.noreply.github.com> Date: Tue, 10 Sep 2019 21:19:59 +0000 Subject: [PATCH 05/13] Update InputNumberWithErrors to default to step="any" --- .../lib/src/components/InputNumberWithErrors/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/strapi-helper-plugin/lib/src/components/InputNumberWithErrors/index.js b/packages/strapi-helper-plugin/lib/src/components/InputNumberWithErrors/index.js index f7cd4988b5..1080d96696 100644 --- a/packages/strapi-helper-plugin/lib/src/components/InputNumberWithErrors/index.js +++ b/packages/strapi-helper-plugin/lib/src/components/InputNumberWithErrors/index.js @@ -165,7 +165,7 @@ InputNumberWithErrors.defaultProps = { labelStyle: {}, noErrorsDescription: false, placeholder: 'app.utils.placeholder.defaultMessage', - step: 1, + step: 'any', style: {}, tabIndex: '0', validations: {}, From 83173d88829ffd96a314cb89d5669ac03f4c0bbf Mon Sep 17 00:00:00 2001 From: jasongitmail <50032291+jasongitmail@users.noreply.github.com> Date: Thu, 12 Sep 2019 18:03:16 +0000 Subject: [PATCH 06/13] Change InputNumber.js defaultProps to step: 'any' --- .../lib/src/components/InputNumber/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/strapi-helper-plugin/lib/src/components/InputNumber/index.js b/packages/strapi-helper-plugin/lib/src/components/InputNumber/index.js index 8d57b1a362..5ef2d7699a 100644 --- a/packages/strapi-helper-plugin/lib/src/components/InputNumber/index.js +++ b/packages/strapi-helper-plugin/lib/src/components/InputNumber/index.js @@ -50,7 +50,7 @@ InputNumber.defaultProps = { onBlur: () => {}, onFocus: () => {}, placeholder: 'app.utils.placeholder.defaultMessage', - step: 1, + step: 'any', style: {}, tabIndex: '0', }; From fd88eeb6db8eaa50c58abed4496950c3561b0944 Mon Sep 17 00:00:00 2001 From: Trevor Fitzgerald Date: Fri, 13 Sep 2019 10:54:40 -0400 Subject: [PATCH 07/13] Update minimum webpack version for strapi-admin --- packages/strapi-admin/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/strapi-admin/package.json b/packages/strapi-admin/package.json index 66312da608..7193084b6b 100644 --- a/packages/strapi-admin/package.json +++ b/packages/strapi-admin/package.json @@ -79,7 +79,7 @@ "terser-webpack-plugin": "^1.2.3", "url-loader": "^1.1.2", "video-react": "^0.13.2", - "webpack": "^4.29.6", + "webpack": "^4.40.1", "webpackbar": "^3.2.0", "yup": "^0.27.0" }, @@ -102,7 +102,7 @@ "license": "MIT", "gitHead": "c85658a19b8fef0f3164c19693a45db305dc07a9", "devDependencies": { - "webpack": "^4.29.6", + "webpack": "^4.40.1", "webpack-cli": "^3.3.2", "webpack-dev-server": "^3.4.1" } From 53f4a28517d433f60d469c796479925a04356fb5 Mon Sep 17 00:00:00 2001 From: Martin Georgiu Date: Sun, 15 Sep 2019 16:59:34 +0200 Subject: [PATCH 08/13] Use created_at instead of createdAt --- docs/3.0.0-beta.x/guides/filters.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/3.0.0-beta.x/guides/filters.md b/docs/3.0.0-beta.x/guides/filters.md index 8c09d9deb5..25fc2a4996 100644 --- a/docs/3.0.0-beta.x/guides/filters.md +++ b/docs/3.0.0-beta.x/guides/filters.md @@ -91,7 +91,7 @@ Sort users by email. Sorting on multiple fileds -- `GET /users?_sort=email:asc,createdAt:desc` +- `GET /users?_sort=email:asc,created_at:desc` - `GET /users?_sort=email:DESC,username:ASC` ### Limit From 603d3ed7571cf653fa103a92411425799ca7da89 Mon Sep 17 00:00:00 2001 From: jasongitmail <50032291+jasongitmail@users.noreply.github.com> Date: Mon, 16 Sep 2019 18:30:35 +0000 Subject: [PATCH 09/13] Change to step={props.step} --- .../lib/src/components/InputNumber/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/strapi-helper-plugin/lib/src/components/InputNumber/index.js b/packages/strapi-helper-plugin/lib/src/components/InputNumber/index.js index 5ef2d7699a..f737d59a9e 100644 --- a/packages/strapi-helper-plugin/lib/src/components/InputNumber/index.js +++ b/packages/strapi-helper-plugin/lib/src/components/InputNumber/index.js @@ -29,7 +29,7 @@ function InputNumber(props) { onFocus={props.onFocus} placeholder={message} ref={props.inputRef} - step={!Number.isNaN(Number(props.step)) ? Number(props.step) : 'any'} + step={props.step} style={props.style} tabIndex={props.tabIndex} type="number" From 0f9ee8bd2593b8c9bb816a8f74431cb6e7f65391 Mon Sep 17 00:00:00 2001 From: tcvmdev <54483758+tcvmdev@users.noreply.github.com> Date: Wed, 18 Sep 2019 16:52:19 -0500 Subject: [PATCH 10/13] Update Bootstrap function - 4th option For someone who wrote no bootstrap functions, my code looks like: ```js module.exports = () => {}; ``` I had to start a new Strapi project to understand how to solve my "cb is not a function" and "fn is not a function" typeerrors. I think it would be useful for future basic Strapi users like me! --- .../migration-guide/migration-guide-beta.15-to-beta.16.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docs/3.0.0-beta.x/migration-guide/migration-guide-beta.15-to-beta.16.md b/docs/3.0.0-beta.x/migration-guide/migration-guide-beta.15-to-beta.16.md index de3d4e79b2..bc34092dee 100644 --- a/docs/3.0.0-beta.x/migration-guide/migration-guide-beta.15-to-beta.16.md +++ b/docs/3.0.0-beta.x/migration-guide/migration-guide-beta.15-to-beta.16.md @@ -159,6 +159,12 @@ module.exports = () => { }; ``` +**No Function** + +```js +module.exports = () => {}; +``` + ### Custom hooks If you have custom [hooks](../advanced/hooks.md) in your project, the `initialize` function will not receive a callback anymore. You can either use an async function, return a promise or simply run a synchronous function. From 712848b378a14e412753318de940bc70b2c4700a Mon Sep 17 00:00:00 2001 From: HuyNQ Date: Wed, 18 Sep 2019 17:11:41 +0700 Subject: [PATCH 11/13] Fix filterOption of SelectMany to enable searching in multiple select --- .../admin/src/components/SelectMany/index.js | 24 +++++++++++++++---- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/packages/strapi-plugin-content-manager/admin/src/components/SelectMany/index.js b/packages/strapi-plugin-content-manager/admin/src/components/SelectMany/index.js index 69ddd37138..2f36dffb85 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/SelectMany/index.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/SelectMany/index.js @@ -3,7 +3,7 @@ import PropTypes from 'prop-types'; import { isEmpty } from 'lodash'; import { useDrop } from 'react-dnd'; -import Select from 'react-select'; +import Select, { createFilter } from 'react-select'; import ItemTypes from '../../utils/ItemTypes'; import { ListShadow, ListWrapper } from './components'; @@ -48,17 +48,31 @@ function SelectMany({ [value] ); + const filterConfig = { + ignoreCase: true, + ignoreAccents: true, + trim: false, + matchFrom: 'any', + }; + return ( <>