-
Notifications
You must be signed in to change notification settings - Fork 2k
Conversation
Added field |
You should use tabs instead of spaces for indentation (yeah..). Consider installing http://editorconfig.org/ |
@simison is that agreed standard for the project? (how?!) |
Yeah, if you look at the surrounding code, it's all tabs. https://github.com/meanjs/mean/blob/master/.editorconfig#L11 |
Atom has this nice little feature. |
I'll take a look once the spacing is fixed. |
f1b8047
to
1417925
Compare
Tabs added |
Ok, updated. Didn't realised formatter made new conflict ;) Hope you are not against few spaces here and there. Don't like cluttered code. |
@@ -5,9 +5,10 @@ | |||
*/ | |||
var passport = require('passport'), | |||
FacebookStrategy = require('passport-facebook').Strategy, | |||
users = require('../../controllers/users.server.controller'); | |||
User = require('mongoose').model('User'), | |||
users = require('./../../controllers/users.server.controller'); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the ./
isn't necessary here
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What do you think of
path = require('path'),
users = require(path.resolve('./modules/users/server/controllers/users.server.controller')),
?
I find it always hard to try track down those .../../.....'s. ;-)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's pretty clear for me, but adding a resolve doesn't make much sense when it's just a one time thing and you can check the file tree in Sublime/Atom etc. to verify it.
Left some comments, looks good mostly. |
@ilanbiala cheers, will review over weekend |
@ilanbiala Updated and left few comments. PS you always learn something new - like reverse while ;) |
@lirantal do you think 0.4.0 can be merged in? Most of the remaining issues in the 0.4.0 milestone are documentation and also not necessary for initial release, so I think now is a good time. |
@lirantal Thanks for responding so quickly. I got side-tracked yesterday. I would love to help merge 0.4 into master. Is there anything in particular that I can work on? This will be my first contribution, so some direction might be in order. On a side note, I pulled the most recent 0.4.0 branch down locally a few hours ago, and I'm having some significant issues. I'm about to create a couple issues to track them. All in all, I'm very happy with the 0.4.0 branch. You all have done a wonderful job with this project. Thanks much! |
@mleanos tell me, if you have problems with that PR. This week I will be releasing my project basing on it with very high test coverage (it will be under CPAL license, but with option for MIT merge backs to this particular project). |
@ilanbiala this PR is making changes across 30+ files and is in the very core of user handling so I would definitely think it's safer to just merge 0.4 into master and then merge this PR in. @mleanos I'll take a look at the state of 0.4 now and we'll see how to co-ordinate the effort. |
@lirantal I agree this should be merged after the master branch has been merged with 0.4. Makes most sense. Is there a conversation that's driving the coordination of getting master merged with 0.4? |
@sielay we can't auto merge it due to conflicts, can you look what's going on there and updated this PR so it's ready for a merge? |
@lirantal @ilanbiala @sielay I do not like that the username provider is under the identities object. A user should only have 1 username - why can't this be left outside of the identities? Additionally, you have no support for primary email address. I think this is important for "forgot" emails. Right now, it looks like you just select the first e-mail in the list. |
@rhutchison what new structure are you thinking of? I'm open to improvements. |
|
Also, this PR has an admin feature. We need to have a decision on #615 (comment) before we proceed with a soltuion. |
@rhutchison sounds reasonable though I admit I did not review this PR properly. |
Yes, but @rhutchison are we waiting for #615 or can we proceed without it? |
@ilanbiala @lirantal if @sielay can pull out his admin code and fix the user model / supporting methods then this could be merged ahead of #615. @sielay please let us know your thoughts and if you would be able to make the necessary updates. |
@rhutchison what is difference between email and for instance twitter id? It's identity. In most of ACL systems you will use schema to differ them. You can use helpers to filter them. Blocking multiple usernames has sense. |
@rhutchison @sielay can we resolve this PR or will it need to be part of 0.5.0? |
@lirantal @sielay @rhutchison judging by how much room for improvement and discussion there still is in this PR, I suggest we push it off to 0.5.0 and we'll release 0.5.0 whenever this is resolved. If it happens in a week, great, if not then 0.5.0 will not be too far off anyway, but this will probably hold up 0.4.0. |
I agree, updated the issue. |
Can you give timeline for 0.5.0? Honestly I am so covered by work, that I am not able to rebase it soon. |
I don't have any timeline for 0.5.0, sorry, but maybe you'll have some time in the future. |
Closing this PR as for now we're unable to get there. |
Hi. It took time, but this version IS aligned to 0.4.0 and it would be quite clever to merge/agree on it before any further changes to users. I don't remember such a nasty merge so far ;)
This changes introduce major changes:
This includes:
admin
role in/admin/users
This pass
grunt test
for me and work in currently developer project.This was tested against actual integration with facebook, google+, twitter, linkedin and github.