Skip to content
This repository has been archived by the owner on Aug 30, 2021. It is now read-only.

fix(users) Handle missing email - OAuth #1501

Merged
merged 18 commits into from
Sep 21, 2016
Merged

Conversation

Wuntenn
Copy link
Contributor

@Wuntenn Wuntenn commented Sep 11, 2016

  • Intentionally omit setting email in constructor to trigger defaults when creating user.

This is done to handle cases where email is not authorised or given by provider.

Related to issue #1250

@coveralls
Copy link

coveralls commented Sep 11, 2016

Coverage Status

Coverage decreased (-0.06%) to 72.937% when pulling 5c649459287aee083de43c634eac717f06d9d8f6 on Wuntenn:fixEmptyEmail into b2a5cb5 on meanjs:master.


// And save the user
user.save(function (err) {
return done(err, user);
return done(err, user);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

spacing if off here. Looks like 4 spaces, but should be 2.

@mleanos
Copy link
Member

mleanos commented Sep 17, 2016

@Wuntenn Have you seen my comments? Let's try to wrap this up so we can get this in for 0.5.0

@Wuntenn
Copy link
Contributor Author

Wuntenn commented Sep 19, 2016

Sorry @mleanos, I wasn't quite sure if I had, but had the feeling that I'd done it. Gimmie a sec

Copy link
Member

@mleanos mleanos left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Wuntenn Can you remove the IIFE from this server-side controller? We're only using IIFE's on the client-side, as part of our Angular Style-guide. Once this is fixed, I'll give it a final review & merge it in.

// Remove sensitive data before login
user.password = undefined;
user.salt = undefined;
(function () {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's no need for an IIFE on the server-side. Can you remove it?

@mleanos
Copy link
Member

mleanos commented Sep 19, 2016

@Wuntenn Looks like there's conflicts. Can you rebase this as well?

@Wuntenn
Copy link
Contributor Author

Wuntenn commented Sep 20, 2016

I was having a few issues fetching from master. It kept on saying "everything up to date" rebase wouldn't do anything. I must've been doing something wrong.

@hyperreality
Copy link
Contributor

hyperreality commented Sep 20, 2016

@Wuntenn make sure your upstream repo is pointing to the correct remote url

@coveralls
Copy link

coveralls commented Sep 20, 2016

Coverage Status

Coverage decreased (-0.1%) to 73.187% when pulling 5c910493fbaf82675cacbe151488ed19a2303625 on Wuntenn:fixEmptyEmail into 89e8d13 on meanjs:master.

lirantal and others added 12 commits September 21, 2016 00:41
- Intentionally omits setting email in constructor to trigger defaults when
creating user. Handles cases where email is not authorized/given by provider.

Related to issue meanjs#1250
Fixes css lintings warnings of properties not alphabetized.
Uses the passport info object to simplify login and remove the need to
temporarily cache the redirect within the session.
…he server configs.

Also added a time indicator on failed login attempts to give the user feedback on subsequent failed login attempts.
…down to the client.

reverted some of the other changes (regarding the http request).
Modified config to be "shared". This will allow future configurations to be easily passed to the client.
For New Article, delete function no required
codydaig and others added 5 commits September 21, 2016 00:45
Replaces the $http service calls with promise based methods
of the client-side UsersService for the following:
  Users Change Password
  Users Manage Social Accounts
  Users Password Forgot
  Users Password Reset
  Users Signup
  Users Signin

Modifies tests to reflect changes.

Closes meanjs#1479
… date (meanjs#1516)

* attempting to update karma and gulp-load-plugins to check build status

* updating karma to 1.3.0

* updating other karma related packages to latest versions

* updating package dependencies to keep up to date
@coveralls
Copy link

coveralls commented Sep 21, 2016

Coverage Status

Coverage decreased (-0.06%) to 73.224% when pulling ff5d1c0 on Wuntenn:fixEmptyEmail into 89e8d13 on meanjs:master.

1 similar comment
@coveralls
Copy link

Coverage Status

Coverage decreased (-0.06%) to 73.224% when pulling ff5d1c0 on Wuntenn:fixEmptyEmail into 89e8d13 on meanjs:master.

@coveralls
Copy link

coveralls commented Sep 21, 2016

Coverage Status

Coverage decreased (-0.06%) to 73.224% when pulling ff5d1c0 on Wuntenn:fixEmptyEmail into 89e8d13 on meanjs:master.

1 similar comment
@coveralls
Copy link

Coverage Status

Coverage decreased (-0.06%) to 73.224% when pulling ff5d1c0 on Wuntenn:fixEmptyEmail into 89e8d13 on meanjs:master.

Copy link
Member

@mleanos mleanos left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM now. Thanks @Wuntenn

@mleanos mleanos merged commit e3eafa6 into meanjs:master Sep 21, 2016
@Wuntenn
Copy link
Contributor Author

Wuntenn commented Sep 21, 2016

May have to revert this commit commit @mleanos I wanted to ask you about removing the duplicated rebased commits first.

@mleanos
Copy link
Member

mleanos commented Sep 21, 2016

What seems to be the problem? I don't see any duplicate commits on master.

@Wuntenn
Copy link
Contributor Author

Wuntenn commented Sep 21, 2016

It's that there are extra commits above and when I did a git log. I thought it had duplicated some of the commits (it looked that way on my version). Looks fine here though (besides there being 18 commits).

I tried a fetch and merge before trying the reset and my local branch showed that it was level with master so all is good.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants