GUACAMOLE-526: Merge changes correcting regression in CAS due to AngularJS
update.
Including `ngRoute` as a dependency of a module which defines a custom
field type will always result in the following error:
Unknown provider: $rootElementProvider <- $rootElement <- $location <-
$route <- $location
This seems to be due to the manner in which the injector is created for
field types. `$rootElementProvider` is not available for injection in
the context of the injector of a custom field. This is generally OK, but
`ngRoute` transitively depends on `$rootElementProvider`. Since
`$rootElementProvider` cannot be injected within the context of a field
type, no field type can depend on ngRoute without causing this error.
Note that extensions can still leverage `ngRoute` (this is already done
by the OpenID support). It just cannot be declared as a dependency of a
module containing a custom field type.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/801a5df9
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/801a5df9
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/801a5df9
Branch: refs/heads/master
Commit: 801a5df9f1d7095c52e594dda1a5276fe8cf6524
Parents: a967ffa 29982e3
Author: Michael Jumper <mjum...@apache.org>
Authored: Wed Dec 5 14:32:37 2018 -0800
Committer: Michael Jumper <mjum...@apache.org>
Committed: Wed Dec 5 14:32:37 2018 -0800
----------------------------------------------------------------------
.../auth/cas/AuthenticationProviderService.java | 12 ++----------
.../guacamole/auth/cas/conf/ConfigurationService.java | 1 -
.../auth/cas/conf/PrivateKeyGuacamoleProperty.java | 5 -----
.../apache/guacamole/auth/cas/form/CASTicketField.java | 2 --
.../guacamole-auth-cas/src/main/resources/casModule.js | 3 +--
5 files changed, 3 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
