Skip to content

Commit

Permalink
Fix for #14
Browse files Browse the repository at this point in the history
  • Loading branch information
@jgomer2001
jgomer2001 committed Jul 3, 2018
1 parent 1f85364 commit 9c2d463
Show file tree
Hide file tree
Showing 9 changed files with 44 additions and 54 deletions.
11 changes: 5 additions & 6 deletions server/auth/dropbox.js
View file
Expand Up @@ -11,15 +11,14 @@ var setCredentials = function(credentials) {
},
function(accessToken, refreshToken, profile, done) {
var userProfile = {
id: profile.id,
name: profile.displayName || profile.username,
username: profile.username || profile.id,
id: profile.id || "",
name: profile.displayName || profile.username || "",
username: profile.username || profile.id || "",
email: profile.emails[0].value || "",
givenName: profile.first_name || "",
familyName: profile.last_name || "",
provider: profile.provider,
accessToken: accessToken
}
provider: "dropbox"
}
return done(null, userProfile);
}
));
Expand Down
13 changes: 6 additions & 7 deletions server/auth/facebook.js
View file
Expand Up @@ -12,14 +12,13 @@ var setCredentials = function(credentials) {
},
function(accessToken, refreshToken, profile, done) {
var userProfile = {
id: profile._json.id,
name: profile.displayName,
id: profile._json.id || "",
name: profile.displayName || "",
username: profile.username || profile._json.id,
email: profile._json.email,
givenName: profile._json.first_name,
familyName: profile._json.last_name,
provider: profile.provider,
accessToken: accessToken
email: profile._json.email || "",
givenName: profile._json.first_name || "",
familyName: profile._json.last_name || "",
provider: "facebook"
};
return done(null, userProfile);
}
Expand Down
9 changes: 4 additions & 5 deletions server/auth/github.js
View file
Expand Up @@ -11,14 +11,13 @@ var setCredentials = function(credentials) {
},
function(accessToken, refreshToken, profile, done) {
var userProfile = {
id: profile.id,
name: profile.displayName || profile.username,
username: profile.username || profile.id,
id: profile.id || "",
name: profile.displayName || profile.username || "",
username: profile.username || profile.id || "",
email: profile.emails[0].value || "",
givenName: profile.first_name || "",
familyName: profile.last_name || "",
provider: profile.provider,
accessToken: accessToken
provider: "github"
};
return done(null, userProfile);
}
Expand Down
15 changes: 7 additions & 8 deletions server/auth/google.js
View file
Expand Up @@ -11,14 +11,13 @@ var setCredentials = function(credentials) {
},
function(request, accessToken, refreshToken, profile, done) {
var userProfile = {
id: profile.id,
name: profile.displayName,
username: profile.username || profile.id,
email: profile.email,
givenName: profile.name.givenName,
familyName: profile.name.familyName,
provider: profile.provider,
accessToken: accessToken
id: profile.id || "",
name: profile.displayName || "",
username: profile.username || profile.id || "",
email: profile.email || "",
givenName: profile.name.givenName || "",
familyName: profile.name.familyName || "",
provider: "google"
};
return done(null, userProfile);
}
Expand Down
15 changes: 7 additions & 8 deletions server/auth/linkedin.js
View file
Expand Up @@ -12,14 +12,13 @@ var setCredentials = function(credentials) {
},
function(token, tokenSecret, profile, done) {
var userProfile = {
id: profile.id,
name: profile.displayName,
username: profile.username || profile.id,
email: profile._json.emailAddress,
givenName: profile.name.givenName,
familyName: profile.name.familyName,
provider: profile.provider,
accessToken: token
id: profile.id || "",
name: profile.displayName || "",
username: profile.username || profile.id || "",
email: profile._json.emailAddress || "",
givenName: profile.name.givenName || "",
familyName: profile.name.familyName || "",
provider: "linkedin"
};
return done(null, userProfile);
}
Expand Down
6 changes: 2 additions & 4 deletions server/auth/saml.js
View file
Expand Up @@ -52,7 +52,6 @@ var setCredentials = function () {
}
else {
strategyConfigOptions.requestIdExpirationPeriodMs = 3600000;

}

strategyConfigOptions.decryptionPvk = fs.readFileSync('/etc/certs/passport-sp.key', 'utf-8');
Expand All @@ -63,7 +62,7 @@ var setCredentials = function () {
function (req, profile, done) {
logger.debug("profile: %s", profile)
var idp = req.originalUrl.replace("/passport/auth/saml/","").replace("/callback","");
var mapping =global.saml_config[idp].reverseMapping;
var mapping = global.saml_config[idp].reverseMapping;
logger.silly("SAML reponse in body:\n%s", req.body.SAMLResponse)

var userProfile = {
Expand All @@ -74,8 +73,7 @@ var setCredentials = function () {
email: profile[mapping["email"]],
givenName: profile[mapping["givenName"]] || '',
familyName: profile[mapping["familyName"]] || '',
provider: profile[mapping["provider"]] || '',
accessToken: "accesstoken"
provider: profile[mapping["provider"]] || ''
};
return done(null, userProfile);
});
Expand Down
9 changes: 4 additions & 5 deletions server/auth/tumblr.js
View file
Expand Up @@ -10,14 +10,13 @@ var setCredentials = function(credentials) {
},
function(accessToken, refreshToken, profile, done) {
var userProfile = {
id: profile.id || accessToken,
name: profile._json.response.user.name,
username: profile.username || profile.id,
id: profile.id || "",
name: profile._json.response.user.name || "",
username: profile.username || profile.id || "",
email: profile.email || "",
givenName: profile.givenName || "",
familyName: profile.familyName || "",
provider: profile.provider || "tumblr",
accessToken: accessToken
provider: "tumblr"
};
return done(null, userProfile);
}
Expand Down
9 changes: 4 additions & 5 deletions server/auth/twitter.js
View file
Expand Up @@ -12,14 +12,13 @@ var setCredentials = function(credentials) {
},
function(accessToken, refreshToken, profile, done) {
var userProfile = {
id: profile.id,
name: profile.displayName || profile.username,
username: profile.username || profile.id,
id: profile.id || "",
name: profile.displayName || profile.username || "",
username: profile.username || profile.id || "",
email: profile._json.email || "",
givenName: profile.first_name || "",
familyName: profile.last_name || "",
provider: profile.provider,
accessToken: accessToken
provider: "twitter"
};
return done(null, userProfile);
}
Expand Down
11 changes: 5 additions & 6 deletions server/auth/yahoo.js
View file
Expand Up @@ -11,14 +11,13 @@ var setCredentials = function(credentials) {
function(id, profile, profileMethods, done) {
var displayname = profile.displayName.split(" ");
var userProfile = {
id: id,
name: profile.displayName,
username: profile.username || id,
email: profile.emails[0].value,
id: id || "",
name: profile.displayName || "",
username: profile.username || id || "",
email: profile.emails[0].value || "",
givenName: displayname[0] || profile.name.givenName || "",
familyName: displayname[1] || profile.name.familyName || "",
provider: profile.provider || "yahoo",
accessToken: profile.accessToken || ""
provider: "yahoo"
};
return done(null, userProfile);
}
Expand Down

0 comments on commit 9c2d463

Please sign in to comment.