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

Moved expires to resource metadata for services.Users. #2564

Merged
merged 3 commits into from
Feb 19, 2019

Conversation

russjones
Copy link
Contributor

Description

Moved expiry field from spec to metadata for services.Users and updated
expiry check to prefer metadata and fallback to spec if not found. Added
test coverage.

lib/services/suite/suite.go Show resolved Hide resolved
lib/auth/saml_test.go Show resolved Hide resolved
@russjones russjones force-pushed the rjones/fix-user-ttl branch 2 times, most recently from 14b2458 to e27f399 Compare February 14, 2019 01:13
@klizhentas
Copy link
Contributor

I think this problem applies to all users, not just github ones

Copy link
Contributor

@klizhentas klizhentas left a comment

Choose a reason for hiding this comment

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

Can you please check that if this problem applies to all external types

@russjones
Copy link
Contributor Author

@klizhentas It does and I fixed it for all external identity providers. I've fixed it for all and covered all with tests. That's what the bulk of the PR was.

Moved expiry field from spec to metadata for services.Users and updated
expiry check to prefer metadata and fallback to spec if not found. Added
test coverage.
@klizhentas
Copy link
Contributor

k, sorry the PR only showed me two github files, let me re-review

@klizhentas
Copy link
Contributor

retest this please

lib/auth/github.go Outdated Show resolved Hide resolved
Copy link
Contributor

@klizhentas klizhentas left a comment

Choose a reason for hiding this comment

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

still have a couple of comments and one actual change

lib/auth/github.go Outdated Show resolved Hide resolved
lib/auth/github.go Outdated Show resolved Hide resolved
lib/auth/oidc.go Outdated Show resolved Hide resolved
lib/auth/saml.go Outdated Show resolved Hide resolved
@russjones russjones merged commit 75fe74d into master Feb 19, 2019
@russjones russjones deleted the rjones/fix-user-ttl branch February 19, 2019 02:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants