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

11893 oauth auto login #12029

Merged
merged 2 commits into from Nov 19, 2018
Merged

11893 oauth auto login #12029

merged 2 commits into from Nov 19, 2018

Conversation

Nick-Triller
Copy link
Contributor

See issue #11893 for the relevant proposal.

Changes:

  • Implemented proposed OAuth auto login option.
  • Added redirect screen because the login screen was visible for a short moment when redirecting to the OAuth endpoint.
  • Updated docs.
  • Fixed font awesome sizing css (e. g. fa-5x class).

@Nick-Triller
Copy link
Contributor Author

The build seems to have failed because CircleCI has problems accessing npm (see status page).

@bergquist
Copy link
Contributor

bergquist commented May 22, 2018

Rebase onto master to get ride of the codespell errors.

circle ci seem to have problems with npm right now.

@Nick-Triller
Copy link
Contributor Author

Nick-Triller commented May 23, 2018

I rebased the code on master. CircleCI seems to be fine again, too.

$location.path('/redirect');
window.location.href = url;
};
if ($scope.oauth.google) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Not sure the redirect should have handled in the frontend. Seems easier to redirect the user in the backend. Any specific reason for doing it in the frontend?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

You are absolutely right, redirecting in the backend is cleaner. I will update the PR.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The PR is ready for review.

@Nick-Triller
Copy link
Contributor Author

Do you want me to change anything else?

@bergquist
Copy link
Contributor

bergquist commented Jun 21, 2018

Sorry! No maintainer had time to review this. We are quite a bit behind but we will get to this. It's a good feature, we just want to review the implementation before merging it.

Please be patient :)

Copy link
Contributor

@bergquist bergquist left a comment

Choose a reason for hiding this comment

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

Looks good! Could you please rebase this onto master? Id be happy to merge it once that's done :)

@bergquist bergquist self-assigned this Sep 17, 2018
@Nick-Triller
Copy link
Contributor Author

Great! I rebased onto master.

pkg/api/login.go Outdated Show resolved Hide resolved
pkg/api/login.go Outdated Show resolved Hide resolved
@Nick-Triller
Copy link
Contributor Author

I rebased onto master again to include the new changes.

Copy link
Contributor

@bergquist bergquist left a comment

Choose a reason for hiding this comment

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

Looks good! I will merge this once the scss change have been reverted since its not related to this feature.

public/sass/base/font-awesome/_larger.scss Outdated Show resolved Hide resolved
Copy link
Collaborator

@DanCech DanCech left a comment

Choose a reason for hiding this comment

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

LGTM

@torkelo torkelo added this to the 5.4.0-beta1 milestone Nov 17, 2018
@bergquist bergquist merged commit 03ac9c5 into grafana:master Nov 19, 2018
@bergquist
Copy link
Contributor

Thank you for contributing!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
pr/external This PR is from external contributor
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants