You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by mj...@apache.org on 2020/06/22 21:37:07 UTC
[guacamole-client] branch master updated (bfde956 -> 5175dd3)
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 bfde956 Merge 1.2.0 changes back to master.
add 5762cdd GUACAMOLE-103: Implement common redirect form field.
add a0ee047 GUACAMOLE-103: Move to using Translatable for redirect message; clean up comments.
add 9dcd074 GUACAMOLE-103: Merge extension API support for redirection during authentication/authorization process.
new 5175dd3 Merge 1.2.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:
extensions/guacamole-auth-cas/pom.xml | 79 --------------------
.../auth/cas/AuthenticationProviderService.java | 4 +-
.../guacamole/auth/cas/form/CASTicketField.java | 43 ++++-------
.../src/main/resources/casModule.js | 28 -------
.../src/main/resources/config/casConfig.js | 33 ---------
.../main/resources/templates/casTicketField.html | 5 --
extensions/guacamole-auth-openid/pom.xml | 33 ---------
.../auth/openid/AuthenticationProviderService.java | 4 +-
.../guacamole/auth/openid/form/TokenField.java | 36 +++------
.../src/main/resources/config/openidConfig.js | 33 ---------
.../main/resources/controllers/openidController.js | 30 --------
.../src/main/resources/guac-manifest.json | 10 +--
.../src/main/resources/openidModule.js | 28 -------
.../src/main/resources/styles/openid.css | 35 ---------
.../main/resources/templates/openidTokenField.html | 5 --
.../src/main/resources/transformToken.js | 1 +
.../src/main/resources/translations/de.json | 7 +-
.../src/main/resources/translations/en.json | 2 +-
.../src/main/resources/translations/ja.json | 2 +-
.../main/java/org/apache/guacamole/form/Field.java | 34 +++++----
.../org/apache/guacamole/form/RedirectField.java | 86 ++++++++++++++++++++++
.../form/controllers/redirectFieldController.js | 14 ++--
.../main/webapp/app/form/services/formService.js | 13 ++++
.../main/webapp/app/form/styles/redirect-field.css | 4 +-
.../webapp/app/form/templates/redirectField.html | 8 ++
25 files changed, 175 insertions(+), 402 deletions(-)
delete mode 100644 extensions/guacamole-auth-cas/src/main/resources/casModule.js
delete mode 100644 extensions/guacamole-auth-cas/src/main/resources/config/casConfig.js
delete mode 100644 extensions/guacamole-auth-cas/src/main/resources/templates/casTicketField.html
delete mode 100644 extensions/guacamole-auth-openid/src/main/resources/config/openidConfig.js
delete mode 100644 extensions/guacamole-auth-openid/src/main/resources/controllers/openidController.js
delete mode 100644 extensions/guacamole-auth-openid/src/main/resources/openidModule.js
delete mode 100644 extensions/guacamole-auth-openid/src/main/resources/styles/openid.css
delete mode 100644 extensions/guacamole-auth-openid/src/main/resources/templates/openidTokenField.html
create mode 100644 guacamole-ext/src/main/java/org/apache/guacamole/form/RedirectField.java
rename extensions/guacamole-auth-cas/src/main/resources/controllers/casController.js => guacamole/src/main/webapp/app/form/controllers/redirectFieldController.js (70%)
rename extensions/guacamole-auth-cas/src/main/resources/styles/cas.css => guacamole/src/main/webapp/app/form/styles/redirect-field.css (95%)
create mode 100644 guacamole/src/main/webapp/app/form/templates/redirectField.html
[guacamole-client] 01/01: Merge 1.2.0 changes back to master.
Posted by mj...@apache.org.
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 5175dd3d2964bea3df0bfc6360737d5e4e6077d7
Merge: bfde956 9dcd074
Author: Michael Jumper <mj...@apache.org>
AuthorDate: Mon Jun 22 14:36:42 2020 -0700
Merge 1.2.0 changes back to master.
extensions/guacamole-auth-cas/pom.xml | 79 --------------------
.../auth/cas/AuthenticationProviderService.java | 4 +-
.../guacamole/auth/cas/form/CASTicketField.java | 43 ++++-------
.../src/main/resources/casModule.js | 28 -------
.../src/main/resources/config/casConfig.js | 33 ---------
.../main/resources/controllers/casController.js | 30 --------
.../main/resources/templates/casTicketField.html | 5 --
extensions/guacamole-auth-openid/pom.xml | 33 ---------
.../auth/openid/AuthenticationProviderService.java | 4 +-
.../guacamole/auth/openid/form/TokenField.java | 36 +++------
.../src/main/resources/config/openidConfig.js | 33 ---------
.../src/main/resources/guac-manifest.json | 10 +--
.../src/main/resources/openidModule.js | 28 -------
.../src/main/resources/styles/openid.css | 35 ---------
.../main/resources/templates/openidTokenField.html | 5 --
.../src/main/resources/transformToken.js | 1 +
.../src/main/resources/translations/de.json | 7 +-
.../src/main/resources/translations/en.json | 2 +-
.../src/main/resources/translations/ja.json | 2 +-
.../main/java/org/apache/guacamole/form/Field.java | 34 +++++----
.../org/apache/guacamole/form/RedirectField.java | 86 ++++++++++++++++++++++
.../form/controllers/redirectFieldController.js | 14 ++--
.../main/webapp/app/form/services/formService.js | 13 ++++
.../main/webapp/app/form/styles/redirect-field.css | 4 +-
.../webapp/app/form/templates/redirectField.html | 8 ++
25 files changed, 175 insertions(+), 402 deletions(-)