diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2016-03-01 15:27:20 +0100 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2016-03-01 15:27:20 +0100 |
| commit | ad25761f481988ef6e52fbecc28606e0897ecb9c (patch) | |
| tree | b1c349f3ab4a73b9df5fb80126327b0128ade8df /id/server/auth | |
| parent | 8e2dd0373e5569da0838865ad09eacf2cd5ff948 (diff) | |
| parent | e9d885d2dbcfa2234bfa3b1db701c3956278624d (diff) | |
| download | moa-id-spss-ad25761f481988ef6e52fbecc28606e0897ecb9c.tar.gz moa-id-spss-ad25761f481988ef6e52fbecc28606e0897ecb9c.tar.bz2 moa-id-spss-ad25761f481988ef6e52fbecc28606e0897ecb9c.zip | |
Merge commit 'e9d885d2dbcfa2234bfa3b1db701c3956278624d' into moa-id-3.2_(OPB)
Conflicts:
id/server/modules/pom.xml
Diffstat (limited to 'id/server/auth')
| -rw-r--r-- | id/server/auth/pom.xml | 5 | ||||
| -rw-r--r-- | id/server/auth/src/main/webapp/index.html | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/id/server/auth/pom.xml b/id/server/auth/pom.xml index 2faee730e..e3e9ee4f0 100644 --- a/id/server/auth/pom.xml +++ b/id/server/auth/pom.xml @@ -172,6 +172,11 @@ <artifactId>moa-id-modules-federated_authentication</artifactId> </dependency> + <dependency> + <groupId>MOA.id.server.modules</groupId> + <artifactId>moa-id-module-ssoTransfer</artifactId> + <version>${moa-id-version}</version> + </dependency> <!-- transitive dependencies we don't want to include into the war --> <dependency> <groupId>iaik.prod</groupId> diff --git a/id/server/auth/src/main/webapp/index.html b/id/server/auth/src/main/webapp/index.html index 0c051571b..d2e7d1e1b 100644 --- a/id/server/auth/src/main/webapp/index.html +++ b/id/server/auth/src/main/webapp/index.html @@ -77,6 +77,7 @@ <li><a href=#>Demo Clients</a></li> <!--Link zum Konfigtool--> <li><a href="https://localhost:8443/moa-id-configuration">Konfiguration GUI</a></li> + <li><a href="./TransferSSOSession">Transfer Single Sign-On Session to Smartphone App</a></li> </ul> </nav> |