From 7fdccc62eeae98a0bebee011610fac4f9cd6aa74 Mon Sep 17 00:00:00 2001 From: Jim LAURIE Date: Thu, 23 Aug 2018 18:28:13 +0200 Subject: [PATCH] PR feedback --- packages/strapi-generate-api/package.json | 2 +- .../strapi-generate-controller/package.json | 2 +- packages/strapi-generate-model/package.json | 2 +- packages/strapi-generate-new/package.json | 2 +- packages/strapi-generate-plugin/package.json | 2 +- packages/strapi-generate-policy/package.json | 2 +- packages/strapi-generate-service/package.json | 2 +- packages/strapi-hook-bookshelf/package.json | 2 +- packages/strapi-hook-ejs/package.json | 2 +- .../strapi-plugin-email/services/Email.js | 28 +++++++++--------- packages/strapi-plugin-graphql/package.json | 2 +- .../config/functions/bootstrap.js | 2 +- .../controllers/Auth.js | 29 ++++++++++++------- 13 files changed, 43 insertions(+), 36 deletions(-) diff --git a/packages/strapi-generate-api/package.json b/packages/strapi-generate-api/package.json index 5c45719c0a..edd1955b79 100755 --- a/packages/strapi-generate-api/package.json +++ b/packages/strapi-generate-api/package.json @@ -43,4 +43,4 @@ "npm": ">= 5.3.0" }, "license": "MIT" -} +} \ No newline at end of file diff --git a/packages/strapi-generate-controller/package.json b/packages/strapi-generate-controller/package.json index 23eeed6231..1c4c981e53 100755 --- a/packages/strapi-generate-controller/package.json +++ b/packages/strapi-generate-controller/package.json @@ -43,4 +43,4 @@ "npm": ">= 5.3.0" }, "license": "MIT" -} +} \ No newline at end of file diff --git a/packages/strapi-generate-model/package.json b/packages/strapi-generate-model/package.json index d297308cea..afb74dee4f 100755 --- a/packages/strapi-generate-model/package.json +++ b/packages/strapi-generate-model/package.json @@ -43,4 +43,4 @@ "npm": ">= 5.3.0" }, "license": "MIT" -} +} \ No newline at end of file diff --git a/packages/strapi-generate-new/package.json b/packages/strapi-generate-new/package.json index 7d00a873c8..adba7007e8 100755 --- a/packages/strapi-generate-new/package.json +++ b/packages/strapi-generate-new/package.json @@ -49,4 +49,4 @@ "npm": ">= 5.3.0" }, "license": "MIT" -} +} \ No newline at end of file diff --git a/packages/strapi-generate-plugin/package.json b/packages/strapi-generate-plugin/package.json index f8a862e611..d0141326c5 100755 --- a/packages/strapi-generate-plugin/package.json +++ b/packages/strapi-generate-plugin/package.json @@ -44,4 +44,4 @@ "npm": ">= 5.3.0" }, "license": "MIT" -} +} \ No newline at end of file diff --git a/packages/strapi-generate-policy/package.json b/packages/strapi-generate-policy/package.json index bad4e49062..95020ab91a 100755 --- a/packages/strapi-generate-policy/package.json +++ b/packages/strapi-generate-policy/package.json @@ -43,4 +43,4 @@ "npm": ">= 5.3.0" }, "license": "MIT" -} +} \ No newline at end of file diff --git a/packages/strapi-generate-service/package.json b/packages/strapi-generate-service/package.json index f16d1811d1..52e765a4ed 100755 --- a/packages/strapi-generate-service/package.json +++ b/packages/strapi-generate-service/package.json @@ -43,4 +43,4 @@ "npm": ">= 5.3.0" }, "license": "MIT" -} +} \ No newline at end of file diff --git a/packages/strapi-hook-bookshelf/package.json b/packages/strapi-hook-bookshelf/package.json index 07156e5c76..e49a380396 100755 --- a/packages/strapi-hook-bookshelf/package.json +++ b/packages/strapi-hook-bookshelf/package.json @@ -55,4 +55,4 @@ "npm": ">= 5.3.0" }, "license": "MIT" -} +} \ No newline at end of file diff --git a/packages/strapi-hook-ejs/package.json b/packages/strapi-hook-ejs/package.json index 6c38f3bf9a..6aaca79b7c 100755 --- a/packages/strapi-hook-ejs/package.json +++ b/packages/strapi-hook-ejs/package.json @@ -43,4 +43,4 @@ "npm": ">= 5.3.0" }, "license": "MIT" -} +} \ No newline at end of file diff --git a/packages/strapi-plugin-email/services/Email.js b/packages/strapi-plugin-email/services/Email.js index b6e3796dd6..52fe32461a 100644 --- a/packages/strapi-plugin-email/services/Email.js +++ b/packages/strapi-plugin-email/services/Email.js @@ -10,20 +10,20 @@ const _ = require('lodash'); const createDefaultEnvConfig = async (env) => { const pluginStore = strapi.store({ - environment: env, - type: 'plugin', + environment: env, + type: 'plugin', name: 'email' }); - const provider = _.find(strapi.plugins.email.config.providers, {provider: 'sendmail'}); - const value = _.assign({}, provider, {}); - - await pluginStore.set({key: 'provider', value}); + const provider = _.find(strapi.plugins.email.config.providers, {provider: 'sendmail'}); + const value = _.assign({}, provider, {}); + + await pluginStore.set({key: 'provider', value}); return await strapi.store({ - environment: env, - type: 'plugin', + environment: env, + type: 'plugin', name: 'email' - }).get({key: 'provider'}); + }).get({key: 'provider'}); }; const getProviderConfig = async (env) => { @@ -34,18 +34,18 @@ const getProviderConfig = async (env) => { }).get({key: 'provider'}); if(!config) { - config = await createDefaultEnvConfig(env); + config = await createDefaultEnvConfig(env); } - return config; + return config; }; module.exports = { - getProviderConfig, + getProviderConfig, send: async (options, config, cb) => { // Get email provider settings to configure the provider to use. if(!config) { - config = await getProviderConfig(strapi.config.environment); + config = await getProviderConfig(strapi.config.environment); } const provider = _.find(strapi.plugins.email.config.providers, { provider: config.provider }); @@ -57,6 +57,6 @@ module.exports = { const actions = provider.init(config); // Execute email function of the provider for all files. - return actions.send(options, cb); + return actions.send(options, cb); } }; diff --git a/packages/strapi-plugin-graphql/package.json b/packages/strapi-plugin-graphql/package.json index 33960c0271..67b9741144 100644 --- a/packages/strapi-plugin-graphql/package.json +++ b/packages/strapi-plugin-graphql/package.json @@ -49,4 +49,4 @@ "npm": ">= 5.3.0" }, "license": "MIT" -} +} \ No newline at end of file diff --git a/packages/strapi-plugin-users-permissions/config/functions/bootstrap.js b/packages/strapi-plugin-users-permissions/config/functions/bootstrap.js index 0ea663e40e..06589edc46 100644 --- a/packages/strapi-plugin-users-permissions/config/functions/bootstrap.js +++ b/packages/strapi-plugin-users-permissions/config/functions/bootstrap.js @@ -89,7 +89,7 @@ module.exports = async cb => { enabled: false, icon: 'twitter', key: '', - secret: '',ad + secret: '', callback: '/auth/twitter/callback' } }; diff --git a/packages/strapi-plugin-users-permissions/controllers/Auth.js b/packages/strapi-plugin-users-permissions/controllers/Auth.js index d1513ca66b..72ba075327 100644 --- a/packages/strapi-plugin-users-permissions/controllers/Auth.js +++ b/packages/strapi-plugin-users-permissions/controllers/Auth.js @@ -55,7 +55,7 @@ module.exports = { if (_.get(await store.get({key: 'advanced'}), 'email_confirmation') && user.confirmed !== true) { return ctx.badRequest(null, ctx.request.admin ? [{ messages: [{ id: 'Auth.form.error.confirmed' }] }] : 'Your account email is not confirmed.'); } - + if (user.blocked === true) { return ctx.badRequest(null, ctx.request.admin ? [{ messages: [{ id: 'Auth.form.error.blocked' }] }] : 'Your account has been blocked by the administrator.'); } @@ -224,12 +224,15 @@ module.exports = { }, register: async (ctx) => { - const settings = await strapi.store({ + const pluginStore = await strapi.store({ environment: '', type: 'plugin', - name: 'users-permissions', + name: 'users-permissions' + }); + + const settings = await pluginStore.get({ key: 'advanced' - }).get(); + }); if (!settings.allow_register) { return ctx.badRequest(null, ctx.request.admin ? [{ messages: [{ id: 'Auth.advanced.allow_register' }] }] : 'Register action is currently disabled.'); @@ -287,16 +290,20 @@ module.exports = { } try { + if (!settings.email_confirmation) { + params.confirmed = true; + } + const user = await strapi.query('user', 'users-permissions').create(params); const jwt = strapi.plugins['users-permissions'].services.jwt.issue(_.pick(user.toJSON ? user.toJSON() : user, ['_id', 'id'])); if (settings.email_confirmation) { - const settings = (await strapi.store({ - environment: '', - type: 'plugin', - name: 'users-permissions' - }).get({ key: 'email' }))['email_confirmation'].options; + const storeEmail = (await pluginStore.get({ + key: 'email' + })) || {}; + + const settings = storeEmail['email_confirmation'] ? storeEmail['email_confirmation'].options : {}; settings.message = await strapi.plugins['users-permissions'].services.userspermissions.template(settings.message, { URL: `http://${strapi.config.currentEnvironment.server.host}:${strapi.config.currentEnvironment.server.port}/auth/email-confirmation`, @@ -312,7 +319,7 @@ module.exports = { // Send an email to the user. await strapi.plugins['email'].services.email.send({ to: user.email, - from: (settings.from.email || settings.from.name) ? `"${settings.from.name}" <${settings.from.email}>` : undefined, + from: (settings.from.email && settings.from.name) ? `"${settings.from.name}" <${settings.from.email}>` : undefined, replyTo: settings.response_email, subject: settings.object, text: settings.message, @@ -348,6 +355,6 @@ module.exports = { key: 'advanced' }).get(); - ctx.redirect(settings.email_confirmation_redirection); + ctx.redirect(settings.email_confirmation_redirection || '/'); } };