Merge branch 'master' into enhance/generate

packages/strapi-admin/admin/src/components/LeftMenuFooter/index.js

@@ -17,8 +17,10 @@ defineMessages(messages);
 function LeftMenuFooter({ version }) { // eslint-disable-line react/prefer-stateless-function
   return (
     <div className={styles.leftMenuFooter}>
-      <FormattedMessage {...messages.poweredBy} />
+      <div>
-      <a href="https://strapi.io" target="_blank">v{version}</a>
+        <FormattedMessage {...messages.poweredBy} />
+        <a href="https://strapi.io" target="_blank">v{version}</a>
+      </div>
       <LocaleToggle />
     </div>
   );

packages/strapi-admin/admin/src/components/LeftMenuFooter/styles.scss

@@ -3,7 +3,9 @@
 
 .leftMenuFooter { /* stylelint-disable */
   position: absolute;
-  width: 100%;
+  width: calc(100% - 2 * 15px);
+  display: flex;
+  justify-content: space-between;
   bottom: 0;
   height: 3rem;
   padding-left: 15px;

packages/strapi-plugin-users-permissions/config/functions/bootstrap.js

@@ -34,49 +34,58 @@ module.exports = async cb => {
     name: 'users-permissions'
   });
 
-  if (!await pluginStore.get({key: 'grant'})) {
+  const grantConfig = {
-    const value = {
+    email: {
-      email: {
+      enabled: true,
-        enabled: true,
+      icon: 'envelope'
-        icon: 'envelope'
+    },
-      },
+    facebook: {
-      facebook: {
+      enabled: false,
-        enabled: false,
+      icon: 'facebook-official',
-        icon: 'facebook-official',
+      key: '',
-        key: '',
+      secret: '',
-        secret: '',
+      callback: '/auth/facebook/callback',
-        callback: '/auth/facebook/callback',
+      scope: ['email']
-        scope: ['email']
+    },
-      },
+    google: {
-      google: {
+      enabled: false,
-        enabled: false,
+      icon: 'google',
-        icon: 'google',
+      key: '',
-        key: '',
+      secret: '',
-        secret: '',
+      callback: '/auth/google/callback',
-        callback: '/auth/google/callback',
+      scope: ['email']
-        scope: ['email']
+    },
-      },
+    github: {
-      github: {
+      enabled: false,
-        enabled: false,
+      icon: 'github',
-        icon: 'github',
+      key: '',
-        key: '',
+      secret: '',
-        secret: '',
+      redirect_uri: '/auth/github/callback',
-        redirect_uri: '/auth/github/callback',
+      scope: [
-        scope: [
+        'user',
-          'user',
+        'user:email'
-          'user:email'
+      ]
-        ]
+    },
-      },
+    twitter: {
-      twitter: {
+      enabled: false,
-        enabled: false,
+      icon: 'twitter',
-        icon: 'twitter',
+      key: '',
-        key: '',
+      secret: '',
-        secret: '',
+      callback: '/auth/twitter/callback'
-        callback: '/auth/twitter/callback'
+    }
+  };
+  const prevGrantConfig = await pluginStore.get({key: 'grant'})
+  // store grant auth config to db
+  // when plugin_users-permissions_grant is not existed in db
+  // or we have added/deleted provider here.
+  if (!prevGrantConfig || !_.isEqual(_.keys(prevGrantConfig), _.keys(grantConfig))) {
+    // merge with the previous provider config.
+    _.keys(grantConfig).forEach((key) => {
+      if (key in prevGrantConfig) {
+        grantConfig[key] = _.merge(grantConfig[key], prevGrantConfig[key]);
       }
-    };
+    });
-
+    await pluginStore.set({key: 'grant', value: grantConfig});
-    await pluginStore.set({key: 'grant', value});
   }
 
   if (!await pluginStore.get({key: 'email'})) {