Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/controllers.js
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ Controllers.editStrategy = async (req, res) => {

payload.enabled = !!req.body.enabled;

const checkboxes = ['forceUsernameViaEmail', 'usernameViaEmail', 'trustEmailVerified', 'syncFullname', 'syncPicture'];
const checkboxes = ['forceUsernameViaEmail', 'usernameViaEmail', 'trustEmailVerified', 'skipEmailVerification', 'syncFullname', 'syncPicture'];
checkboxes.forEach((prop) => {
payload[prop] = payload.hasOwnProperty(prop) && payload[prop] === 'on' ? 1 : 0;
});
Expand Down
41 changes: 36 additions & 5 deletions library.js
Original file line number Diff line number Diff line change
Expand Up @@ -211,22 +211,53 @@ OAuth.getAssociations = async () => {
}));
};

OAuth.isEmailVerifiedByProvider = (strategy, payload) => (
!!parseInt(strategy.trustEmailVerified, 10) &&
(payload.email_verified || payload.email_verified === true)
);

OAuth.isEmailTrusted = (strategy, payload) => {
if (parseInt(strategy.skipEmailVerification, 10)) {
return true;
}

return OAuth.isEmailVerifiedByProvider(strategy, payload);
};

OAuth.confirmEmailIfTrusted = async (payload, uid) => {
const strategy = await OAuth.getStrategy(payload.name);
if (!payload.email || !OAuth.isEmailTrusted(strategy, payload)) {
return;
}

const { email, 'email:confirmed': confirmed } = await user.getUserFields(uid, ['email', 'email:confirmed']);
if (parseInt(confirmed, 10) === 1 || (email && email.toLowerCase() !== payload.email.toLowerCase())) {
return;
}

if (!email) {
await user.setUserField(uid, 'email', payload.email);
}

await user.email.confirmByUid(uid);
winston.verbose(`[plugin/sso-oauth2-multiple] Confirmed email for uid ${uid} via ${payload.name}`);
};

OAuth.login = async (payload) => {
let uid = await OAuth.getUidByOAuthid(payload.name, payload.oAuthid);
if (uid !== null) {
// Existing User
await OAuth.confirmEmailIfTrusted(payload, uid);
return ({ uid });
}

const { trustEmailVerified } = await OAuth.getStrategy(payload.name);
const strategy = await OAuth.getStrategy(payload.name);
const { email } = payload;
const email_verified =
parseInt(trustEmailVerified, 10) &&
(payload.email_verified || payload.email_verified === true);
const email_verified = OAuth.isEmailTrusted(strategy, payload);


// Check for user via email fallback
if (email && email_verified) {
if (email && OAuth.isEmailVerifiedByProvider(strategy, payload)) {
uid = await user.getUidByEmail(payload.email);
}

Expand Down
5 changes: 5 additions & 0 deletions static/templates/partials/edit-oauth2-strategy.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,11 @@
<label for="trustEmailVerified" class="form-check-label">Automatically confirm emails when <code>email_verified</code> is true.</code></label>
</div>

<div class="form-check form-switch mb-3">
<input type="checkbox" class="form-check-input" id="skipEmailVerification" name="skipEmailVerification" {{{ if (./skipEmailVerification == "1") }}}checked{{{ end }}}>
<label for="skipEmailVerification" class="form-check-label">Skip email verification for people who register using SSO?</label>
</div>

<div class="mb-3">
<label class="form-label" for="idKey">Alternative <code>id</code> key</label>
<input type="text" id="idKey" name="idKey" title="Alternative id key" class="form-control" placeholder="e.g. auth0Id" value="{./idKey}">
Expand Down