diff --git a/extensions/guacamole-auth-cas/src/main/resources/cas.css b/extensions/guacamole-auth-cas/src/main/resources/cas.css deleted file mode 100644 index dc8357755..000000000 --- a/extensions/guacamole-auth-cas/src/main/resources/cas.css +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -/* Hide login dialog */ -.login-ui div.login-dialog { - display: none; -} diff --git a/extensions/guacamole-auth-cas/src/main/resources/casConfig.js b/extensions/guacamole-auth-cas/src/main/resources/casConfig.js index 77b0cbb10..630a9d2db 100644 --- a/extensions/guacamole-auth-cas/src/main/resources/casConfig.js +++ b/extensions/guacamole-auth-cas/src/main/resources/casConfig.js @@ -36,16 +36,17 @@ angular.module('guacCAS').config(['formServiceProvider', * Config block which augments the existing routing, providing special handling * for the "ticket=" fragments provided by OpenID Connect. */ -angular.module('index').config(['$routeProvider', - function indexRouteConfig($routeProvider) { +angular.module('index').config(['$routeProvider','$windowProvider', + function indexRouteConfig($routeProvider,$windowProvider) { - var curPath = window.location.href; + var $window = $windowProvider.$get(); + var curPath = $window.location.href; var ticketPos = curPath.indexOf("?ticket=") + 8; var hashPos = curPath.indexOf("#/"); if (ticketPos > 0 && ticketPos < hashPos) { var ticket = curPath.substring(ticketPos, hashPos); var newPath = curPath.substring(0,ticketPos - 8) + '#/?ticket=' + ticket; - window.location = newPath; + $window.location.href = newPath; } }]); diff --git a/extensions/guacamole-auth-cas/src/main/resources/guac-manifest.json b/extensions/guacamole-auth-cas/src/main/resources/guac-manifest.json index 5bfb5f70b..2561a3262 100644 --- a/extensions/guacamole-auth-cas/src/main/resources/guac-manifest.json +++ b/extensions/guacamole-auth-cas/src/main/resources/guac-manifest.json @@ -13,10 +13,6 @@ "casModule.js", "casController.js", "casConfig.js" - ], - - "css" : [ - "cas.css" ] }