Skip to content

Commit f959e8a

Browse files
mrtsmrts
committed
release: Web eID release v2.1.0
Signed-off-by: Mart Somermaa <[email protected]>
1 parent fe72146 commit f959e8a

File tree

4 files changed

+50
-33
lines changed

4 files changed

+50
-33
lines changed

‎example/pom.xml‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.springframework.boot</groupId>
77
<artifactId>spring-boot-starter-parent</artifactId>
8-
<version>2.6.5</version>
8+
<version>2.7.2</version>
99
<relativePath/> <!-- lookup parent from repository -->
1010
</parent>
1111
<groupId>org.webeid.example</groupId>
@@ -20,7 +20,10 @@
2020
<java.version>1.8</java.version>
2121
<maven-surefire-plugin.version>2.22.1</maven-surefire-plugin.version>
2222
<caffeine.version>2.8.5</caffeine.version>
23-
<webeid.version>2.0.0</webeid.version>
23+
<webeid.version>2.0.1</webeid.version>
24+
<digidoc4j.version>5.0.0</digidoc4j.version>
25+
<guava.version>31.1-jre</guava.version>
26+
<okhttp.version>4.10.0</okhttp.version>
2427
<jmockit.version>1.44</jmockit.version>
2528
</properties>
2629

@@ -49,18 +52,18 @@
4952
<dependency>
5053
<groupId>com.google.guava</groupId>
5154
<artifactId>guava</artifactId>
52-
<version>31.1-jre</version>
55+
<version>${guava.version}</version>
5356
</dependency>
5457
<dependency>
5558
<groupId>com.squareup.okhttp3</groupId>
5659
<artifactId>okhttp</artifactId>
57-
<version>4.9.3</version>
60+
<version>${okhttp.version}</version>
5861
</dependency>
5962

6063
<dependency>
6164
<groupId>org.digidoc4j</groupId>
6265
<artifactId>digidoc4j</artifactId>
63-
<version>4.3.0</version>
66+
<version>${digidoc4j.version}</version>
6467
</dependency>
6568
<dependency>
6669
<groupId>org.webeid.security</groupId>

‎example/scripts/deployment/fab.sh‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22

33
set -eu
44

5-
SERVER_ADDRESS=server
6-
SERVER_USER=user
5+
SERVER_ADDRESS=web-eid.eu
6+
SERVER_USER=baron
77
SERVER_PORT=22
88

9-
export WEBEID_DIR='/path/'
9+
export WEBEID_DIR='web-eid/web-eid-springboot-example'
10+
export WEBEID_DIR='web-eid/test-web-eid-springboot-example'
1011

1112
fab -e -H ${SERVER_USER}@${SERVER_ADDRESS}:${SERVER_PORT} "$@"

‎example/src/main/resources/static/scripts/download-install-web-eid.sh‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,17 @@ make_install() {
3434
echo "Installing Web eID packages for Ubuntu $1"
3535
TMPDIR=`mktemp -d`
3636
cd $TMPDIR
37-
BUILD=`[[ $1 == *0 ]] && echo 555 || echo 552`
38-
VERSION=${1//./}
39-
wget "https://installer.id.ee/media/web-eid/Ubuntu/web-eid_2.0.0.${BUILD}-${VERSION}_all.deb"
40-
wget "https://installer.id.ee/media/web-eid/Ubuntu/web-eid-chrome_2.0.0.${BUILD}-${VERSION}_all.deb"
41-
wget "https://installer.id.ee/media/web-eid/Ubuntu/web-eid-firefox_2.0.0.${BUILD}-${VERSION}_all.deb"
42-
wget "https://installer.id.ee/media/web-eid/Ubuntu/web-eid-native_2.0.0.${BUILD}-${VERSION}_amd64.deb"
43-
sudo apt install -y ./web-eid*.deb
44-
cd /tmp
45-
rm -r $TMPDIR
37+
VERSION='2.0.2'
38+
# BUILD=`[[ $1 == *0 ]] && echo 555 || echo 552`
39+
BUILD='565'
40+
UBUNTU_VERSION=${1//./}
41+
wget "https://installer.id.ee/media/web-eid/Ubuntu/web-eid_${VERSION}.${BUILD}-${UBUNTU_VERSION}_all.deb"
42+
wget "https://installer.id.ee/media/web-eid/Ubuntu/web-eid-chrome_${VERSION}.${BUILD}-${UBUNTU_VERSION}_all.deb"
43+
wget "https://installer.id.ee/media/web-eid/Ubuntu/web-eid-firefox_${VERSION}.${BUILD}-${UBUNTU_VERSION}_all.deb"
44+
wget "https://installer.id.ee/media/web-eid/Ubuntu/web-eid-native_${VERSION}.${BUILD}-${UBUNTU_VERSION}_amd64.deb"
45+
# sudo apt install -y ./web-eid*.deb
46+
# cd /tmp
47+
# rm -r $TMPDIR
4648
}
4749

4850
### main
@@ -60,8 +62,9 @@ test_sudo
6062
# 18.04 bionic LTS 2023-04
6163
# 20.04 focal LTS 2025-04
6264
# 21.10 impish - 2022-07
63-
LATEST_SUPPORTED_UBUNTU_CODENAME='impish'
64-
LATEST_SUPPORTED_UBUNTU_VERSION='21.10'
65+
# 22.04 jammy LTS 2027-04
66+
LATEST_SUPPORTED_UBUNTU_CODENAME='jammy'
67+
LATEST_SUPPORTED_UBUNTU_VERSION='22.04'
6568

6669
# Check the distro and release.
6770
distro=$(lsb_release -is | tr '[:upper:]' '[:lower:]')
@@ -91,7 +94,7 @@ case $distro in
9194
utopic|vivid|wily|trusty|artful|cosmic|disco|xenial|eoan|groovy|hirsute)
9295
make_fail "Ubuntu $codename is not officially supported"
9396
;;
94-
bionic|focal|impish)
97+
bionic|focal|impish|jammy)
9598
make_install $release
9699
;;
97100
*)

‎example/src/main/resources/templates/index.html‎

Lines changed: 23 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,14 @@ <h3><a id="usage"></a>Usage</h3>
5757
<code>wget -O - https://<span th:text="${#httpServletRequest.serverName}"/>/scripts/download-install-web-eid.sh | bash</code><br>
5858
</li>
5959
<li>on <b>macOS</b> 10.15 or later, for Firefox and Chrome from <a
60-
href="https://installer.id.ee/media/web-eid/web-eid_2.0.0.556.dmg">here</a>,
60+
href="https://installer.id.ee/media/web-eid/web-eid_2.0.2.565.dmg">here</a>,
6161
</li>
6262
<li>on <b>macOS</b> 10.15 or later, for Safari, install the extension from <a
6363
href="https://apps.apple.com/ee/app/web-eid/id1576665083?mt=12">App Store</a>,
6464
</li>
65-
<li>on <b>Windows</b> 10 (64-bit), for Firefox, Chrome and Edge from <a
66-
href="https://installer.id.ee/media/web-eid/web-eid_2.0.0.552.exe">here</a>.
65+
<li>on <b>Windows</b> 10, Windows 11, Windows Server 2016, Windows Server 2019, Windows Server 2022,
66+
for Firefox, Chrome and Edge from <a
67+
href="https://installer.id.ee/media/web-eid/web-eid_2.0.2.566.x64.exe">here</a>.
6768
</li>
6869
</ul>
6970
</li>
@@ -175,9 +176,7 @@ <h3><a id="documentation"></a>Documentation</h3>
175176
<hr/>
176177
<h3><a id="for-developers"></a>For developers</h3>
177178
<p>
178-
Currently the Web eID back-end libraries are available for Java web applications.
179-
The .NET/C# version is in the works, the development version is available
180-
<a href="https://github.com/web-eid/web-eid-authtoken-validation-dotnet/">here</a>.
179+
Currently the Web eID back-end libraries are available for Java and .NET web applications.
181180
</p>
182181
<p>
183182
To implement authentication and digital signing with Web eID in a Java web application,
@@ -187,20 +186,31 @@ <h3><a id="for-developers"></a>For developers</h3>
187186
according to the instructions
188187
<a href="https://github.com/web-eid/web-eid.js#quickstart">here</a>,
189188
</li>
190-
<li>for authentication, use the <i>web-eid-authtoken-validation-java</i> Java library in
191-
the back end of the web application according to the instructions
192-
<a href="https://github.com/web-eid/web-eid-authtoken-validation-java#quickstart">here</a>,
189+
<li>for authentication
190+
<ul>
191+
<li>in Java use the <i>web-eid-authtoken-validation-java</i> library in
192+
the back end of the web application according to the instructions
193+
<a href="https://github.com/web-eid/web-eid-authtoken-validation-java#quickstart">here</a>,</li>
194+
<li>in .NET/C# use the <i>web-eid-authtoken-validation-dotnet</i> library according to the instructions
195+
<a href="https://github.com/web-eid/web-eid-authtoken-validation-dotnet#quickstart">here</a></li>
196+
</ul>
193197
</li>
194-
<li>for digital signing, use the <i>digidoc4j</i> Java library in the back end of the web
195-
application according to the instructions
196-
<a href="https://github.com/open-eid/digidoc4j/wiki/Examples-of-using-it">here</a>.
198+
<li>for digital signing
199+
<ul>
200+
<li>in Java use the <i>digidoc4j</i> library in the back end of the web
201+
application according to the instructions
202+
<a href="https://github.com/web-eid/web-eid-spring-boot-example#integration-with-digidoc4j-components">here</a>,</li>
203+
<li>in .NET/C# use the <i>libdigidocpp</i> library in the back end of the web
204+
application according to the instructions
205+
<a href="https://github.com/web-eid/web-eid-asp-dotnet-example#3-setup-the-libdigidocpp-library-for-signing">here</a>.</li>
206+
</ul>
197207
</li>
198208
</ul>
199209
<p>
200210
The full source code of an example Spring Boot web application that uses Web eID for authentication
201211
and digital signing is available
202212
<a href="https://github.com/web-eid/web-eid-spring-boot-example">here</a>.
203-
The .NET/C# version of the example will eventually be available
213+
The .NET/C# version of the example is available
204214
<a href="https://github.com/web-eid/web-eid-asp-dotnet-example">here</a>.
205215
</p>
206216
</div>

0 commit comments

Comments
 (0)