[guacamole-client] branch master updated (0bf1a7d -> 3ac3c1d)
This is an automated email from the ASF dual-hosted git repository. mjumper pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/guacamole-client.git. from 0bf1a7d GUACAMOLE-678: Merge correction to value of "client_id" query parameter for OpenID. add 380b88c GUACAMOLE-146: Pre-clean the webapp context before deploying it. add 3c9302f GUACAMOLE-146: Merge automatic removal of exploded webapp context prior to deployment. new 3ac3c1d Merge 1.1.0 changes back to master. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: guacamole-docker/bin/start.sh | 1 + 1 file changed, 1 insertion(+)
[guacamole-client] 01/01: Merge 1.1.0 changes back to master.
This is an automated email from the ASF dual-hosted git repository. mjumper pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/guacamole-client.git commit 3ac3c1dc4f4a134c4c4afbaf7ecc2a1c35391c22 Merge: 0bf1a7d 3c9302f Author: Michael Jumper AuthorDate: Sat Apr 20 10:50:53 2019 -0700 Merge 1.1.0 changes back to master. guacamole-docker/bin/start.sh | 1 + 1 file changed, 1 insertion(+)
[guacamole-client] branch staging/1.1.0 updated: GUACAMOLE-146: Pre-clean the webapp context before deploying it.
This is an automated email from the ASF dual-hosted git repository.
mjumper pushed a commit to branch staging/1.1.0
in repository https://gitbox.apache.org/repos/asf/guacamole-client.git
The following commit(s) were added to refs/heads/staging/1.1.0 by this push:
new 380b88c GUACAMOLE-146: Pre-clean the webapp context before deploying
it.
new 3c9302f GUACAMOLE-146: Merge automatic removal of exploded webapp
context prior to deployment.
380b88c is described below
commit 380b88c0956f6f8963f103cbc63d9c68205b759a
Author: Virtually Nick
AuthorDate: Fri Apr 19 15:01:52 2019 -0400
GUACAMOLE-146: Pre-clean the webapp context before deploying it.
---
guacamole-docker/bin/start.sh | 1 +
1 file changed, 1 insertion(+)
diff --git a/guacamole-docker/bin/start.sh b/guacamole-docker/bin/start.sh
index 6d5af95..be97901 100755
--- a/guacamole-docker/bin/start.sh
+++ b/guacamole-docker/bin/start.sh
@@ -575,6 +575,7 @@ END
start_guacamole() {
# Install webapp
+rm -Rf /usr/local/tomcat/webapps/${WEBAPP_CONTEXT:-guacamole}
ln -sf /opt/guacamole/guacamole.war
/usr/local/tomcat/webapps/${WEBAPP_CONTEXT:-guacamole}.war
# Start tomcat
[guacamole-client] branch master updated: GUACAMOLE-678: Assign clientID variable instead of string literal.
This is an automated email from the ASF dual-hosted git repository.
mjumper pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/guacamole-client.git
The following commit(s) were added to refs/heads/master by this push:
new 26cc9bc GUACAMOLE-678: Assign clientID variable instead of string
literal.
new 0bf1a7d GUACAMOLE-678: Merge correction to value of "client_id" query
parameter for OpenID.
26cc9bc is described below
commit 26cc9bc65bc3ea390ba7e81969ee89d1ddac7bcf
Author: Virtually Nick
AuthorDate: Thu Apr 18 08:59:01 2019 -0400
GUACAMOLE-678: Assign clientID variable instead of string literal.
---
.../src/main/java/org/apache/guacamole/auth/openid/form/TokenField.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/extensions/guacamole-auth-openid/src/main/java/org/apache/guacamole/auth/openid/form/TokenField.java
b/extensions/guacamole-auth-openid/src/main/java/org/apache/guacamole/auth/openid/form/TokenField.java
index 4a3bc9d..b6ca18b 100644
---
a/extensions/guacamole-auth-openid/src/main/java/org/apache/guacamole/auth/openid/form/TokenField.java
+++
b/extensions/guacamole-auth-openid/src/main/java/org/apache/guacamole/auth/openid/form/TokenField.java
@@ -78,7 +78,7 @@ public class TokenField extends Field {
this.authorizationURI = UriBuilder.fromUri(authorizationEndpoint)
.queryParam("scope", scope)
.queryParam("response_type", "id_token")
-.queryParam("client_id","clientID")
+.queryParam("client_id", clientID)
.queryParam("redirect_uri", redirectURI)
.queryParam("nonce", nonce)
.build();
