IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Oauth2 Updates (#6226)

Browse Source 
* break out go and js build commands

* support oauth providers that return errors via redirect

* remove extra call to get grafana.net org membership

* removed GitHub specifics from generic OAuth

* readded ability to name generic source

* revert to a backward-compatible state, refactor and clean up

* streamline oauth user creation, make generic oauth support more generic
This commit is contained in:
Dan Cech
2016-10-11 02:51:44 -04:00
committed by Torkel Ödegaard
parent d4fd1c82e3
commit 6b16fcea52
9 changed files with 139 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
public/app/core/controllers/login_ctrl.js
View File

@@ -11,6 +11,7 @@ function (angular, _, coreModule, config) {
"1000": "Required team membership not fulfilled",
"1001": "Required organization membership not fulfilled",
"1002": "Required email domain not fulfilled",
"1003": "Login provider denied login request",
};
coreModule.default.controller('LoginCtrl', function($scope, backendSrv, contextSrv, $location) {