From 5781a8dba55c3edfd1229c23cb8ca25b6071a817 Mon Sep 17 00:00:00 2001
From: Michael Jumper <mjumper@apache.org>
Date: Mon, 26 Jun 2017 09:50:24 -0700
Subject: [PATCH] GUACAMOLE-332: Correct appearance of CAS redirect
 notification.

---
 extensions/guacamole-auth-cas/.gitignore      |  2 +-
 extensions/guacamole-auth-cas/pom.xml         | 80 +++++++++++++++++++
 .../main/resources/{ => config}/casConfig.js  |  2 +-
 .../{ => controllers}/casController.js        |  0
 .../src/main/resources/guac-manifest.json     | 14 +++-
 .../src/main/resources/license.txt            | 18 +++++
 .../src/main/resources/styles/cas.css         | 35 ++++++++
 .../resources/templates/casTicketField.html   |  5 ++
 .../src/main/resources/translations/en.json   |  2 +-
 9 files changed, 151 insertions(+), 7 deletions(-)
 rename extensions/guacamole-auth-cas/src/main/resources/{ => config}/casConfig.js (94%)
 rename extensions/guacamole-auth-cas/src/main/resources/{ => controllers}/casController.js (100%)
 create mode 100644 extensions/guacamole-auth-cas/src/main/resources/license.txt
 create mode 100644 extensions/guacamole-auth-cas/src/main/resources/styles/cas.css
 create mode 100644 extensions/guacamole-auth-cas/src/main/resources/templates/casTicketField.html

diff --git a/extensions/guacamole-auth-cas/.gitignore b/extensions/guacamole-auth-cas/.gitignore
index c3a023fc1..30eb48707 100644
--- a/extensions/guacamole-auth-cas/.gitignore
+++ b/extensions/guacamole-auth-cas/.gitignore
@@ -1,3 +1,3 @@
 *~
 target/
-META-INF/
+src/main/resources/generated/
diff --git a/extensions/guacamole-auth-cas/pom.xml b/extensions/guacamole-auth-cas/pom.xml
index af129f21c..e76c50b88 100644
--- a/extensions/guacamole-auth-cas/pom.xml
+++ b/extensions/guacamole-auth-cas/pom.xml
@@ -53,6 +53,85 @@
                 </configuration>
             </plugin>
 
+            <!-- Pre-cache Angular templates with maven-angular-plugin -->
+            <plugin>
+                <groupId>com.keithbranton.mojo</groupId>
+                <artifactId>angular-maven-plugin</artifactId>
+                <version>0.3.2</version>
+                <executions>
+                    <execution>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>html2js</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <sourceDir>${basedir}/src/main/resources</sourceDir>
+                    <include>**/*.html</include>
+                    <target>${basedir}/src/main/resources/generated/templates-main/templates.js</target>
+                    <prefix>app/ext/guac-cas</prefix>
+                </configuration>
+            </plugin>
+
+            <!-- JS/CSS Minification Plugin -->
+            <plugin>
+                <groupId>com.samaxes.maven</groupId>
+                <artifactId>minify-maven-plugin</artifactId>
+                <version>1.7.5</version>
+                <executions>
+                    <execution>
+                        <id>default-cli</id>
+                        <configuration>
+                            <charset>UTF-8</charset>
+
+                            <webappSourceDir>${basedir}/src/main/resources</webappSourceDir>
+                            <webappTargetDir>${project.build.directory}/classes</webappTargetDir>
+
+                            <cssSourceDir>/</cssSourceDir>
+                            <cssTargetDir>/</cssTargetDir>
+                            <cssFinalFile>cas.css</cssFinalFile>
+
+                            <cssSourceFiles>
+                                <cssSourceFile>license.txt</cssSourceFile>
+                            </cssSourceFiles>
+
+                            <cssSourceIncludes>
+                                <cssSourceInclude>**/*.css</cssSourceInclude>
+                            </cssSourceIncludes>
+
+                            <jsSourceDir>/</jsSourceDir>
+                            <jsTargetDir>/</jsTargetDir>
+                            <jsFinalFile>cas.js</jsFinalFile>
+
+                            <jsSourceFiles>
+                                <jsSourceFile>license.txt</jsSourceFile>
+                            </jsSourceFiles>
+
+                            <jsSourceIncludes>
+                                <jsSourceInclude>**/*.js</jsSourceInclude>
+                            </jsSourceIncludes>
+
+                            <!-- Do not minify and include tests -->
+                            <jsSourceExcludes>
+                                <jsSourceExclude>**/*.test.js</jsSourceExclude>
+                            </jsSourceExcludes>
+                            <jsEngine>CLOSURE</jsEngine>
+
+                            <!-- Disable warnings for JSDoc annotations -->
+                            <closureWarningLevels>
+                                <misplacedTypeAnnotation>OFF</misplacedTypeAnnotation>
+                                <nonStandardJsDocs>OFF</nonStandardJsDocs>
+                            </closureWarningLevels>
+
+                        </configuration>
+                        <goals>
+                            <goal>minify</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
             <!-- Copy dependencies prior to packaging -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -105,6 +184,7 @@
                     <excludes>
                         <exclude>**/*.json</exclude>
                         <exclude>src/licenses/**/*</exclude>
+                        <exclude>src/main/resources/templates/*.html</exclude>
                     </excludes>
                 </configuration>
 
diff --git a/extensions/guacamole-auth-cas/src/main/resources/casConfig.js b/extensions/guacamole-auth-cas/src/main/resources/config/casConfig.js
similarity index 94%
rename from extensions/guacamole-auth-cas/src/main/resources/casConfig.js
rename to extensions/guacamole-auth-cas/src/main/resources/config/casConfig.js
index 76ee755fe..95356f773 100644
--- a/extensions/guacamole-auth-cas/src/main/resources/casConfig.js
+++ b/extensions/guacamole-auth-cas/src/main/resources/config/casConfig.js
@@ -25,7 +25,7 @@ angular.module('guacCAS').config(['formServiceProvider',
 
     // Define field for ticket from CAS service
     formServiceProvider.registerFieldType("GUAC_CAS_TICKET", {
-        templateUrl   : '',
+        templateUrl   : 'app/ext/guac-cas/templates/casTicketField.html',
         controller    : 'guacCASController',
         module        : 'guacCAS'
     });
diff --git a/extensions/guacamole-auth-cas/src/main/resources/casController.js b/extensions/guacamole-auth-cas/src/main/resources/controllers/casController.js
similarity index 100%
rename from extensions/guacamole-auth-cas/src/main/resources/casController.js
rename to extensions/guacamole-auth-cas/src/main/resources/controllers/casController.js
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 fd963a217..d241e38a2 100644
--- a/extensions/guacamole-auth-cas/src/main/resources/guac-manifest.json
+++ b/extensions/guacamole-auth-cas/src/main/resources/guac-manifest.json
@@ -14,9 +14,15 @@
     ],
 
     "js" : [
-        "casModule.js",
-        "casController.js",
-        "casConfig.js"
-    ]
+        "cas.min.js"
+    ],
+
+    "css" : [
+        "cas.min.css"
+    ],
+
+    "resources" : {
+        "templates/casTicketField.html" : "text/html"
+    }
 
 }
diff --git a/extensions/guacamole-auth-cas/src/main/resources/license.txt b/extensions/guacamole-auth-cas/src/main/resources/license.txt
new file mode 100644
index 000000000..042f3ce1f
--- /dev/null
+++ b/extensions/guacamole-auth-cas/src/main/resources/license.txt
@@ -0,0 +1,18 @@
+/*
+ * 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.
+ */
diff --git a/extensions/guacamole-auth-cas/src/main/resources/styles/cas.css b/extensions/guacamole-auth-cas/src/main/resources/styles/cas.css
new file mode 100644
index 000000000..6c775d232
--- /dev/null
+++ b/extensions/guacamole-auth-cas/src/main/resources/styles/cas.css
@@ -0,0 +1,35 @@
+/*
+ * 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.
+ */
+
+.cas-ticket-field-container {
+    height: 100%;
+    width: 100%;
+    position: fixed;
+    left: 0;
+    top: 0;
+    display: table;
+    background: white;
+}
+
+.cas-ticket-field {
+    width: 100%;
+    display: table-cell;
+    vertical-align: middle;
+    text-align: center;
+}
diff --git a/extensions/guacamole-auth-cas/src/main/resources/templates/casTicketField.html b/extensions/guacamole-auth-cas/src/main/resources/templates/casTicketField.html
new file mode 100644
index 000000000..55ca4bb4a
--- /dev/null
+++ b/extensions/guacamole-auth-cas/src/main/resources/templates/casTicketField.html
@@ -0,0 +1,5 @@
+<div class="cas-ticket-field-container">
+    <div class="cas-ticket-field">
+        <p>{{ 'LOGIN.INFO_CAS_REDIRECT_PENDING' | translate }}</p>
+    </div>
+</div>
diff --git a/extensions/guacamole-auth-cas/src/main/resources/translations/en.json b/extensions/guacamole-auth-cas/src/main/resources/translations/en.json
index dfda606c5..29d1363f9 100644
--- a/extensions/guacamole-auth-cas/src/main/resources/translations/en.json
+++ b/extensions/guacamole-auth-cas/src/main/resources/translations/en.json
@@ -6,7 +6,7 @@
 
     "LOGIN" : {
         "FIELD_HEADER_TICKET"        : "",
-        "INFO_CAS_REDIRECT_PENDING"  : "Please wait, redirecting to CAS authentication."
+        "INFO_CAS_REDIRECT_PENDING"  : "Please wait, redirecting to CAS authentication..."
     }
 
 }