Skip to content

Fix no session on social logins #1165

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix no session on social logins #1165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c65a3a0
Fix no session on social logins
larixer Nov 13, 2019
368de29
Use better refresh salt
larixer Nov 13, 2019
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
4 changes: 2 additions & 2 deletions modules/authentication/server-ts/access/AccessModule.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ class AccessModule extends ServerModule {
}

get grantAccess() {
return async (identity: any, req: Request, passwordHash: string) => {
return async (identity: any, req: Request, refreshSalt: string) => {
let result = {};
for (const grant of this.grant) {
result = merge(result, await grant(identity, req, passwordHash));
result = merge(result, await grant(identity, req, refreshSalt));
}
return result;
};
Expand Down
2 changes: 1 addition & 1 deletion modules/user/server-ts/password/resolvers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export default () => ({
const user = await User.getUserByUsernameOrEmail(usernameOrEmail);
const errors = await validateUserPassword(user, password, req.t);
if (!isEmpty(errors)) throw new UserInputError('Failed valid user password', { errors });
const tokens = await access.grantAccess(user, req, user.passwordHash);
const tokens = await access.grantAccess(user, req, user.id + (user.passwordHash || ''));
return { user, tokens };
},
async register(obj, { input }, { mailer, User, req }) {
Expand Down
5 changes: 2 additions & 3 deletions modules/user/server-ts/social/shared.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import User from '../sql';
export async function onAuthenticationSuccess(req, res) {
const user = await User.getUserWithPassword(req.user.id);
const redirectUrl = req.query.state;
const tokens = await access.grantAccess(user, req, user.passwordHash);
const tokens = await access.grantAccess(user, req, user.id + (user.passwordHash || ''));

if (redirectUrl) {
res.redirect(redirectUrl + (tokens ? '?data=' + JSON.stringify({ tokens }) : ''));
Expand All @@ -13,11 +13,10 @@ export async function onAuthenticationSuccess(req, res) {
}
}

export const registerUser = async ({ id, username, displayName, emails: [{ value }] }) => {
export const registerUser = async ({ username, displayName, emails: [{ value }] }) => {
return User.register({
username: username || displayName,
email: value,
password: id,
isActive: true
});
};