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

Pass localAuthEnabled flag to UI #3412

Merged
merged 3 commits into from
Mar 9, 2020
Merged

Conversation

kimlisa
Copy link
Contributor

@kimlisa kimlisa commented Mar 6, 2020

part of issue #2789

  • Added LocalAuthEnabled prop to WebConfigAuthSetting struct in webconfig.go
  • Pass LocalAuthEnabled state as part of webCfg in apiserver.go

tested in UI:
Screenshot from 2020-03-09 13-54-12

- Added LocalAuth prop to WebConfigAuthSetting struct in webconfig.go
- Pass LocalAuth state as part of webCfg in  apiserver.go
@kimlisa kimlisa requested review from r0mant, alex-kovoy, russjones and fspmarshall and removed request for r0mant March 6, 2020 01:37
@@ -61,4 +61,6 @@ type WebConfigAuthSettings struct {
SecondFactor string `json:"second_factor,omitempty"`
// Providers contains a list of configured auth providers
Providers []WebConfigAuthProvider `json:"providers,omitempty"`
// LocalAuth enables/disables local logins
LocalAuth bool `json:"localAuth,omitempty"`
Copy link
Contributor

Choose a reason for hiding this comment

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

We typically use snake_case for JSON fields.

Copy link
Contributor

Choose a reason for hiding this comment

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

webapps use camelCase :) (this is for webapi)

@@ -61,4 +61,6 @@ type WebConfigAuthSettings struct {
SecondFactor string `json:"second_factor,omitempty"`
// Providers contains a list of configured auth providers
Providers []WebConfigAuthProvider `json:"providers,omitempty"`
// LocalAuth enables/disables local logins
Copy link
Contributor

Choose a reason for hiding this comment

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

// LocalAuth is a flag that enables local authentication

Copy link
Contributor Author

Choose a reason for hiding this comment

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

revised

@kimlisa kimlisa merged this pull request into alexey/webapps Mar 9, 2020
@kimlisa kimlisa deleted the lisa/localauth-flag branch March 9, 2020 21:38
@kimlisa kimlisa changed the title Pass localAuth flag to UI Pass localAuthEnabled flag to UI Mar 9, 2020
alex-kovoy pushed a commit that referenced this pull request Mar 12, 2020
* Added LocalAuthEnabled prop to WebConfigAuthSetting struct in webconfig.go
* Added LocalAuthEnabled state as part of webCfg in  apiserver.go
alex-kovoy pushed a commit that referenced this pull request Apr 14, 2020
* Added LocalAuthEnabled prop to WebConfigAuthSetting struct in webconfig.go
* Added LocalAuthEnabled state as part of webCfg in  apiserver.go
alex-kovoy pushed a commit that referenced this pull request Apr 15, 2020
* Added LocalAuthEnabled prop to WebConfigAuthSetting struct in webconfig.go
* Added LocalAuthEnabled state as part of webCfg in  apiserver.go
alex-kovoy added a commit that referenced this pull request Apr 15, 2020
* Add monorepo

* Add reset/passwd capability for local users (#3287)

* Add UserTokens to allow password resets

* Pass context down through ChangePasswordWithToken

* Rename UserToken to ResetPasswordToken

* Add auto formatting for proto files

* Add common Marshaller interfaces to reset password token

* Allow enterprise "tctl" reuse OSS user methods (#3344)

* Pass localAuthEnabled flag to UI (#3412)

* Added LocalAuthEnabled prop to WebConfigAuthSetting struct in webconfig.go
* Added LocalAuthEnabled state as part of webCfg in  apiserver.go

* update e-refs

* Fix a regression bug after merge

* Update tctl CLI output msgs (#3442)

* Use local user client when resolving user roles

* Update webapps ref

* Add and retrieve fields from Cluster struct (#3476)

* Set Teleport versions for node, auth, proxy init heartbeat
* Add and retrieve fields NodeCount, PublicURL, AuthVersion from Clusters
* Remove debug logging to avoid log pollution when getting public_addr of proxy
* Create helper func GuessProxyHost to get the public_addr of a proxy host
* Refactor newResetPasswordToken to use GuessProxyHost and remove publicUrl func

* Remove webapps submodule

* Add webassets submodule

* Replace webapps sub-module reference with webassets

* Update webassets path in Makefile

* Update webassets

1b11b26 Simplify and clean up Makefile (#62) gravitational/webapps@1b11b26

* Retrieve cluster details for user context (#3515)

* Let GuessProxyHost also return proxy's version
* Unit test GuessProxyHostAndVersion & GetClusterDetails

* Update webassets

4dfef4e Fix build pipeline (#66) gravitational/webapps@4dfef4e

* Update e-ref

* Update webassets

0647568 Fix OSS redirects gravitational/webapps@0647568

* update e-ref

* Update webassets

e0f4189 Address security audit warnings Updates  "minimist" package which is used by 7y old "optimist". gravitational/webapps@e0f4189

* Add new attr to Session struct (#3574)

* Add fields ServerHostname and ServerAddr
* Set these fields on newSession

* Ensure webassets submodule during build

* Update e-ref

* Ensure webassets before running unit-tests

* Update E-ref

Co-authored-by: Lisa Kim <[email protected]>
Co-authored-by: Pierre Beaucamp <[email protected]>
Co-authored-by: Jenkins <[email protected]>
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.

3 participants