From 957e7a08cb15cef27bfda104f052135e2404e6f8 Mon Sep 17 00:00:00 2001
From: Jim Laurie <j.laurie6993@gmail.com>
Date: Tue, 13 Feb 2018 15:04:21 +0100
Subject: [PATCH] Environment agnostic for users-permissions configs

---
 .../config/functions/bootstrap.js                           | 2 +-
 .../strapi-plugin-users-permissions/controllers/Auth.js     | 3 +++
 .../strapi-plugin-users-permissions/controllers/User.js     | 2 ++
 .../controllers/UsersPermissions.js                         | 6 ++++++
 .../strapi-plugin-users-permissions/services/Providers.js   | 2 ++
 5 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/packages/strapi-plugin-users-permissions/config/functions/bootstrap.js b/packages/strapi-plugin-users-permissions/config/functions/bootstrap.js
index b1ad737fe9..5e3d351851 100644
--- a/packages/strapi-plugin-users-permissions/config/functions/bootstrap.js
+++ b/packages/strapi-plugin-users-permissions/config/functions/bootstrap.js
@@ -29,7 +29,7 @@ module.exports = async cb => {
   }
 
   const pluginStore = strapi.store({
-    environment: strapi.config.environment,
+    environment: '',
     type: 'plugin',
     name: 'users-permissions'
   });
diff --git a/packages/strapi-plugin-users-permissions/controllers/Auth.js b/packages/strapi-plugin-users-permissions/controllers/Auth.js
index a32a50135a..b118b823fc 100644
--- a/packages/strapi-plugin-users-permissions/controllers/Auth.js
+++ b/packages/strapi-plugin-users-permissions/controllers/Auth.js
@@ -16,6 +16,7 @@ module.exports = {
     const params = ctx.request.body;
 
     const store = await strapi.store({
+      environment: '',
       type: 'plugin',
       name: 'users-permissions'
     });
@@ -128,6 +129,7 @@ module.exports = {
 
   connect: async (ctx, next) => {
     const grantConfig = await strapi.store({
+      environment: '',
       type: 'plugin',
       name: 'users-permissions',
       key: 'grant'
@@ -204,6 +206,7 @@ module.exports = {
 
   register: async (ctx) => {
     if (!(await strapi.store({
+      environment: '',
       type: 'plugin',
       name: 'users-permissions',
       key: 'advanced'
diff --git a/packages/strapi-plugin-users-permissions/controllers/User.js b/packages/strapi-plugin-users-permissions/controllers/User.js
index 91731da56d..98fc89d1b7 100644
--- a/packages/strapi-plugin-users-permissions/controllers/User.js
+++ b/packages/strapi-plugin-users-permissions/controllers/User.js
@@ -71,6 +71,7 @@ module.exports = {
 
   create: async (ctx) => {
     if ((await strapi.store({
+      environment: '',
       type: 'plugin',
       name: 'users-permissions',
       key: 'advanced'
@@ -101,6 +102,7 @@ module.exports = {
   update: async (ctx, next) => {
     try {
       const advancedConfigs = await strapi.store({
+        environment: '',
         type: 'plugin',
         name: 'users-permissions',
         key: 'advanced'
diff --git a/packages/strapi-plugin-users-permissions/controllers/UsersPermissions.js b/packages/strapi-plugin-users-permissions/controllers/UsersPermissions.js
index eebac57775..5e067e0110 100644
--- a/packages/strapi-plugin-users-permissions/controllers/UsersPermissions.js
+++ b/packages/strapi-plugin-users-permissions/controllers/UsersPermissions.js
@@ -172,6 +172,7 @@ module.exports = {
 
   getEmailTemplate: async (ctx) => {
     ctx.send(await strapi.store({
+      environment: '',
       type: 'plugin',
       name: 'users-permissions',
       key: 'email'
@@ -184,6 +185,7 @@ module.exports = {
     }
 
     await strapi.store({
+      environment: '',
       type: 'plugin',
       name: 'users-permissions',
       key: 'email'
@@ -194,6 +196,7 @@ module.exports = {
 
   getAdvancedSettings: async (ctx) => {
     ctx.send(await strapi.store({
+      environment: '',
       type: 'plugin',
       name: 'users-permissions',
       key: 'advanced'
@@ -206,6 +209,7 @@ module.exports = {
     }
 
     await strapi.store({
+      environment: '',
       type: 'plugin',
       name: 'users-permissions',
       key: 'advanced'
@@ -216,6 +220,7 @@ module.exports = {
 
   getProviders: async (ctx) => {
     ctx.send(await strapi.store({
+      environment: '',
       type: 'plugin',
       name: 'users-permissions',
       key: 'grant'
@@ -228,6 +233,7 @@ module.exports = {
     }
 
     await strapi.store({
+      environment: '',
       type: 'plugin',
       name: 'users-permissions',
       key: 'grant'
diff --git a/packages/strapi-plugin-users-permissions/services/Providers.js b/packages/strapi-plugin-users-permissions/services/Providers.js
index 9a3fdb7414..0e7f95be4c 100644
--- a/packages/strapi-plugin-users-permissions/services/Providers.js
+++ b/packages/strapi-plugin-users-permissions/services/Providers.js
@@ -50,6 +50,7 @@ exports.connect = (provider, query) => {
         });
 
         const advanced = await strapi.store({
+          environment: '',
           type: 'plugin',
           name: 'users-permissions',
           key: 'advanced'
@@ -97,6 +98,7 @@ const getProfile = async (provider, query, callback) => {
   const access_token = query.access_token || query.code || query.oauth_token;
 
   const grant = await strapi.store({
+    environment: '',
     type: 'plugin',
     name: 'users-permissions',
     key: 'grant'