mirror of
https://github.com/ets-cfuhrman-pfe/EvalueTonSavoir.git
synced 2025-08-11 21:23:54 -04:00
Compare commits
No commits in common. "e200973af77c4de9383600d447e12f7255be4e0b" and "1317d3b1afd803f79d75a7fc0485f5881d409931" have entirely different histories.
e200973af7
...
1317d3b1af
1 changed files with 1 additions and 13 deletions
|
|
@ -46,8 +46,6 @@ class PassportOpenIDConnect {
|
|||
},
|
||||
// patch pour la librairie permet d'obtenir les groupes, PR en cours mais "morte" : https://github.com/jaredhanson/passport-openidconnect/pull/101
|
||||
async function (req, issuer, profile, times, tok, done) {
|
||||
console.log(`oidc.js: register: issuer: ${JSON.stringify(issuer)}`);
|
||||
console.log(`oidc.js: register: profile: ${JSON.stringify(profile)}`);
|
||||
try {
|
||||
const received_user = {
|
||||
auth_id: profile.id,
|
||||
|
|
@ -59,35 +57,25 @@ class PassportOpenIDConnect {
|
|||
if (hasNestedValue(profile, provider.OIDC_ROLE_TEACHER_VALUE)) received_user.roles.push('teacher')
|
||||
if (hasNestedValue(profile, provider.OIDC_ROLE_STUDENT_VALUE)) received_user.roles.push('student')
|
||||
|
||||
console.log(`oidc.js: register: received_user: ${JSON.stringify(received_user)}`);
|
||||
const user_association = await authUserAssoc.find_user_association(self.auth_name, received_user.auth_id);
|
||||
console.log(`oidc.js: register: user_association: ${JSON.stringify(user_association)}`);
|
||||
const user_association = await authUserAssoc.find_user_association(self.auth_name, received_user.auth_id)
|
||||
|
||||
let user_account
|
||||
if (user_association) {
|
||||
console.log(`oidc.js: register: user_association: ${JSON.stringify(user_association)}`);
|
||||
user_account = await userModel.getById(user_association.user_id)
|
||||
console.log(`oidc.js: register: user_account: ${JSON.stringify(user_account)}`);
|
||||
}
|
||||
else {
|
||||
console.log(`oidc.js: register: user_association: ${JSON.stringify(user_association)}`);
|
||||
let user_id = await userModel.getId(received_user.email)
|
||||
console.log(`oidc.js: register: user_id: ${JSON.stringify(user_id)}`);
|
||||
if (user_id) {
|
||||
user_account = await userModel.getById(user_id);
|
||||
console.log(`oidc.js: register: user_account: ${JSON.stringify(user_account)}`);
|
||||
} else {
|
||||
received_user.password = userModel.generatePassword()
|
||||
user_account = await self.passportjs.register(received_user)
|
||||
console.log(`oidc.js: register: user_account: ${JSON.stringify(user_account)}`);
|
||||
}
|
||||
console.log(`oidc.js: register: authUserAssoc.ling.`);
|
||||
await authUserAssoc.link(self.auth_name, received_user.auth_id, user_account._id)
|
||||
}
|
||||
|
||||
user_account.name = received_user.name
|
||||
user_account.roles = received_user.roles
|
||||
console.log(`oidc.js: register: calling userModel.editUser: ${JSON.stringify(user_account)}`);
|
||||
await userModel.editUser(user_account);
|
||||
|
||||
return done(null, user_account);
|
||||
|
|
|
|||
Loading…
Reference in a new issue