Skip to content
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.

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

Uid visible to admin and account holder #3039

Merged
merged 9 commits into from
Jul 11, 2018
Merged

Conversation

SidharthBansal
Copy link
Member

@SidharthBansal SidharthBansal commented Jul 10, 2018

Fixes #3038
Make sure these boxes are checked before your pull request (PR) is ready to be reviewed and merged. Thanks!

  • tests pass -- look for a green checkbox ✔️ a few minutes after opening your PR -- or run tests locally with rake test
  • code is in uniquely-named feature branch and has no merge conflicts
  • PR is descriptively titled
  • PR body includes fixes #0000-style reference to original issue #
  • ask @publiclab/reviewers for help, in a comment below

We're happy to help you get this ready -- don't be afraid to ask for help, and don't be discouraged if your tests fail at first!

If tests do fail, click on the red X to learn why by reading the logs.

Please be sure you've reviewed our contribution guidelines at https://publiclab.org/contributing-to-public-lab-software

We have a loose schedule of reviewing and pulling in changes every Tuesday and Friday, and publishing changes on Fridays.

Thanks!

@ghost ghost assigned SidharthBansal Jul 10, 2018
@ghost ghost added the in progress label Jul 10, 2018
@SidharthBansal
Copy link
Member Author

@jywarren this is in progress

@plotsbot
Copy link
Collaborator

plotsbot commented Jul 10, 2018

1 Warning
⚠️ It looks like you merged from master in this pull request. Please rebase to get rid of the merge commits – you may want to rewind the master branch and rebase instead of merging in from master, which can cause problems when accepting new code!
2 Messages
📖 @SidharthBansal Thank you for your pull request! I’m here to help with some tips and recommendations. Please take a look at the list provided and help us review and accept your contribution! And don’t be discouraged if you see errors – we’re here to help.
📖 It looks like you haven’t marked all the checkboxes. Help us review and accept your suggested changes by going through the steps one by one. If it is still a ‘Work in progresss’, please include ‘[WIP]’ in the title.

Generated by 🚫 Danger

@SidharthBansal
Copy link
Member Author

I have tested this on my localhost:3000.
Where do we display the user_tags apart from the profile page?

@jywarren
Copy link
Member

Nowhere else -- does this need the tests restarted or is there an error we can fix?

@SidharthBansal
Copy link
Member Author

i am not having any error on my local machine. I have restarted the tests. Hope it passes

@SidharthBansal
Copy link
Member Author

ERROR["test_digest_emails", Minitest::Result, 35.865290699999605]
test_digest_emails#Minitest::Result (35.87s)
Redis::CannotConnectError: Redis::CannotConnectError: Error connecting to Redis on 127.0.0.1:6379 (Errno::ECONNREFUSED)
app/controllers/users_controller.rb:308:in test_digest_email' test/functional/users_controller_test.rb:252:in block in class:UsersControllerTest'

784/784: [===============================================================================================] 100% Time: 00:01:35, Time: 00:01:35

Finished in 95.34637s
784 tests, 2369 assertions, 0 failures, 1 errors, 0 skips

I am getting this error. is this error related to my patch?

@grvsachdeva
Copy link
Member

The error is about Junit. Restarting build!

@grvsachdeva
Copy link
Member

ok, actual error revealed now.

@SidharthBansal SidharthBansal added this to the OAuth Login milestone Jul 10, 2018
@SidharthBansal
Copy link
Member Author

@Gauravano what's the error? This pr is a little urgent one

@grvsachdeva
Copy link
Member

Here it is @SidharthBansal

error

@ghost ghost added in progress and removed high-priority labels Jul 11, 2018
@SidharthBansal
Copy link
Member Author

Finally all tests passed.
@jywarren can you please suggest changes to this?

@jywarren
Copy link
Member

Looks good but did I see that one of the tags starts with oa- instead of oauth? Let's be sure this is standard -- where should we look?

Also, if you want to replace the select assertion with an assertion that they do NOT exist, maybe that's a good idea... is there test fixture data including oauth related tags for that page so it's a good test of this?

Thanks!!!

@SidharthBansal
Copy link
Member Author

What are oa- tags used for?
My patch addresses that the user tags starting with oauth will be only visible to admin or user themselves ELSE if it is not starting with oauth we do what we were doing earlier. So there will be no conflict

@SidharthBansal
Copy link
Member Author

Can we merge this one? I will write tests in next PR. I just want to hide the oauth based usertag as quickly as we can on production

@jywarren
Copy link
Member

jywarren commented Jul 11, 2018 via email

@jywarren jywarren merged commit 4bc23af into publiclab:master Jul 11, 2018
@ghost ghost removed the ready label Jul 11, 2018
@jywarren
Copy link
Member

👍

@SidharthBansal
Copy link
Member Author

Looking at them

@SidharthBansal
Copy link
Member Author

Initially in April when we were adjusting the usertag to behave as identity model we created some usertags on our profile to test the feature. They are now not needed. You can delete the following from your profile

  • github:jywarren
  • oa-twitter:jywarren
    I have deleted mine. No one else apart from you and me have created such tags.

@jywarren
Copy link
Member

jywarren commented Jul 11, 2018 via email

jywarren pushed a commit that referenced this pull request Jul 12, 2018
* changed color of github icon and refactored code

* Update _comment.html.erb (#3048)

* changed icons styles

* changed env back

* some fixes

* all icons width set same

* fix

* added back env

* some fix

* Update API.md

* center align the text

* center align and added or

* added back env

* added spacing in or

* added env back

* errors on signup page (#3044)

* Update .travis.yml

* Swap the providers and email-password login (#3021)

* Change Login page & remove Gemfile.lock from PR

* Add Rails production environment check back in

* Uid visible to admin and account holder (#3039)

* Uid visible to admin and account holder

* few changes

* .

* minor tweaks

* test rectified

* ..

* test rectified

* Fallback email and welcome email with Oauth  (#3052)

* fallback welcome email

* sending welcome mail in oauth

* test

* added back env

* fixes

* removed extra spaves
SrinandanPai pushed a commit to SrinandanPai/plots2 that referenced this pull request May 5, 2019
* Uid visible to admin and account holder

* few changes

* .

* minor tweaks

* test rectified

* ..

* test rectified
SrinandanPai pushed a commit to SrinandanPai/plots2 that referenced this pull request May 5, 2019
…iclab#3050)

* changed color of github icon and refactored code

* Update _comment.html.erb (publiclab#3048)

* changed icons styles

* changed env back

* some fixes

* all icons width set same

* fix

* added back env

* some fix

* Update API.md

* center align the text

* center align and added or

* added back env

* added spacing in or

* added env back

* errors on signup page (publiclab#3044)

* Update .travis.yml

* Swap the providers and email-password login (publiclab#3021)

* Change Login page & remove Gemfile.lock from PR

* Add Rails production environment check back in

* Uid visible to admin and account holder (publiclab#3039)

* Uid visible to admin and account holder

* few changes

* .

* minor tweaks

* test rectified

* ..

* test rectified

* Fallback email and welcome email with Oauth  (publiclab#3052)

* fallback welcome email

* sending welcome mail in oauth

* test

* added back env

* fixes

* removed extra spaves
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

User Tag must be visible to admins or themselves
4 participants