diff options
author | Willem van Dreumel <willemvd@users.noreply.github.com> | 2017-02-22 08:14:37 +0100 |
---|---|---|
committer | Kim "BKC" Carlbäcker <kim.carlbacker@gmail.com> | 2017-02-22 08:14:37 +0100 |
commit | 01d957677f160e4b5e43ce043b05e246493b34ea (patch) | |
tree | e06e3849d874ce37f02b29666ada6069b78decd9 /public | |
parent | fd941db246e66244ec81f43d74b8358c06173fd6 (diff) | |
download | gitea-01d957677f160e4b5e43ce043b05e246493b34ea.tar.gz gitea-01d957677f160e4b5e43ce043b05e246493b34ea.zip |
Oauth2 consumer (#679)
* initial stuff for oauth2 login, fails on:
* login button on the signIn page to start the OAuth2 flow and a callback for each provider
Only GitHub is implemented for now
* show login button only when the OAuth2 consumer is configured (and activated)
* create macaron group for oauth2 urls
* prevent net/http in modules (other then oauth2)
* use a new data sessions oauth2 folder for storing the oauth2 session data
* add missing 2FA when this is enabled on the user
* add password option for OAuth2 user , for use with git over http and login to the GUI
* add tip for registering a GitHub OAuth application
* at startup of Gitea register all configured providers and also on adding/deleting of new providers
* custom handling of errors in oauth2 request init + show better tip
* add ExternalLoginUser model and migration script to add it to database
* link a external account to an existing account (still need to handle wrong login and signup) and remove if user is removed
* remove the linked external account from the user his settings
* if user is unknown we allow him to register a new account or link it to some existing account
* sign up with button on signin page (als change OAuth2Provider structure so we can store basic stuff about providers)
* from gorilla/sessions docs:
"Important Note: If you aren't using gorilla/mux, you need to wrap your handlers with context.ClearHandler as or else you will leak memory!"
(we're using gorilla/sessions for storing oauth2 sessions)
* use updated goth lib that now supports getting the OAuth2 user if the AccessToken is still valid instead of re-authenticating (prevent flooding the OAuth2 provider)
Diffstat (limited to 'public')
-rw-r--r-- | public/css/index.css | 21 | ||||
-rw-r--r-- | public/img/github.png | bin | 0 -> 1151 bytes | |||
-rw-r--r-- | public/js/index.js | 8 |
3 files changed, 27 insertions, 2 deletions
diff --git a/public/css/index.css b/public/css/index.css index 34764b6894..a35351e177 100644 --- a/public/css/index.css +++ b/public/css/index.css @@ -2983,3 +2983,24 @@ footer .ui.language .menu { .ui.user.list .item .description a:hover { text-decoration: underline; } +.user.link-account:not(.icon) { + padding-top: 15px; + padding-bottom: 5px; +} +.signin .oauth2 div { + display: inline-block; +} +.signin .oauth2 div p { + margin: 10px 5px 0 0; + float: left; +} +.signin .oauth2 a { + margin-right: 5px; +} +.signin .oauth2 a:last-child { + margin-right: 0px; +} +.signin .oauth2 img { + width: 32px; + height: 32px; +}
\ No newline at end of file diff --git a/public/img/github.png b/public/img/github.png Binary files differnew file mode 100644 index 0000000000..1fa19c55d2 --- /dev/null +++ b/public/img/github.png diff --git a/public/js/index.js b/public/js/index.js index fb35eadf8a..1470a44b97 100644 --- a/public/js/index.js +++ b/public/js/index.js @@ -1019,9 +1019,9 @@ function initAdmin() { // New authentication if ($('.admin.new.authentication').length > 0) { $('#auth_type').change(function () { - $('.ldap, .dldap, .smtp, .pam, .has-tls').hide(); + $('.ldap, .dldap, .smtp, .pam, .oauth2, .has-tls').hide(); - $('.ldap input[required], .dldap input[required], .smtp input[required], .pam input[required], .has-tls input[required]').removeAttr('required'); + $('.ldap input[required], .dldap input[required], .smtp input[required], .pam input[required], .oauth2 input[required] .has-tls input[required]').removeAttr('required'); var authType = $(this).val(); switch (authType) { @@ -1042,6 +1042,10 @@ function initAdmin() { $('.dldap').show(); $('.dldap div.required:not(.ldap) input').attr('required', 'required'); break; + case '6': // OAuth2 + $('.oauth2').show(); + $('.oauth2 input').attr('required', 'required'); + break; } if (authType == '2' || authType == '5') { |