Skip to content

Commit 2f390d6

Browse files
anestosanestos
authored
Merge pull request #18 from curityio/feat/add-sdk-plugin-icon
Feat/add sdk plugin icon
2 parents 2316293 + 30ef16c commit 2f390d6

File tree

4 files changed

+133
-15
lines changed

4 files changed

+133
-15
lines changed

‎.github/workflows/publish.yml‎

Lines changed: 120 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
1+
name: Make a release and push to nexus
2+
on:
3+
workflow_dispatch:
4+
inputs:
5+
release:
6+
type: boolean
7+
description: Make a GitHub release
8+
default: true
9+
publish:
10+
type: boolean
11+
description: Publish to Nexus
12+
default: false
13+
14+
jobs:
15+
package:
16+
name: Build Package
17+
runs-on: ubuntu-latest
18+
19+
steps:
20+
- name: Checkout code
21+
uses: actions/checkout@v4
22+
23+
- name: Set up JDK 21
24+
uses: actions/setup-java@v4
25+
with:
26+
java-version: '21'
27+
distribution: 'temurin'
28+
cache: 'maven'
29+
30+
- name: Package the plugin
31+
run: mvn package
32+
33+
- name: Build plugin artifacts zip
34+
run: |
35+
zip --junk-paths plugin-artifacts target/*.jar
36+
37+
- name: Upload plugin artifacts
38+
uses: actions/upload-artifact@v4
39+
with:
40+
name: plugin-artifacts.zip
41+
path: plugin-artifacts.zip
42+
43+
make_release:
44+
runs-on: ubuntu-latest
45+
needs: package
46+
permissions: write-all
47+
if: ${{ github.event.inputs.release == 'true'}}
48+
steps:
49+
- name: Download code
50+
uses: actions/checkout@v3
51+
52+
- name: Conventional changelog action
53+
id: changelog
54+
uses: TriPSs/conventional-changelog-action@v5
55+
with:
56+
github-token: ${{ secrets.GITHUB_TOKEN }}
57+
skip-version-file: "true"
58+
skip-on-empty: "false"
59+
skip-tag: "true"
60+
skip-commit: "true"
61+
62+
- name: Fetch release version from build gradle file
63+
run: |
64+
echo "RELEASE_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_ENV
65+
66+
- name: Download plugin artifacts
67+
uses: actions/download-artifact@v4
68+
with:
69+
name: plugin-artifacts.zip
70+
71+
- name: Create release
72+
id: create_release
73+
uses: actions/create-release@v1
74+
if: ${{ steps.changelog.outputs.skipped == 'false' }}
75+
env:
76+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
77+
with:
78+
tag_name: ${{ env.RELEASE_VERSION }}
79+
release_name: ${{ env.RELEASE_VERSION }}
80+
body: ${{ steps.changelog.outputs.clean_changelog }}
81+
draft: false
82+
prerelease: false
83+
84+
- name: Upload release asset
85+
id: upload-release-asset
86+
uses: actions/upload-release-asset@v1
87+
env:
88+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
89+
with:
90+
upload_url: ${{ steps.create_release.outputs.upload_url }}
91+
asset_path: ./plugin-artifacts.zip
92+
asset_name: plugin-artifacts.zip
93+
asset_content_type: application/zip
94+
95+
96+
publish:
97+
name: Publish to Nexus
98+
needs: package
99+
runs-on: ubuntu-latest
100+
if: ${{ github.event.inputs.publish == 'true'}}
101+
steps:
102+
- name: Checkout code
103+
uses: actions/checkout@v4
104+
105+
- name: Set up JDK 21
106+
uses: actions/setup-java@v4
107+
with:
108+
java-version: '21'
109+
distribution: 'temurin'
110+
cache: 'maven'
111+
112+
# Setup Maven with OAuth token
113+
- name: Setup Maven with OAuth
114+
id: setup-maven-oauth
115+
uses: curityio/curity-maven-gh-action@v1
116+
with:
117+
client-secret: ${{ secrets.CURITY_CLI_CLIENT_SECRET }}
118+
119+
- name: Publish package
120+
run: mvn deploy ${{ steps.setup-maven-oauth.outputs.maven-deploy-args }}

‎pom.xml‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,18 @@
2121
<modelVersion>4.0.0</modelVersion>
2222
<groupId>io.curity.identityserver.plugin</groupId>
2323
<artifactId>identityserver.plugins.authenticators.usernamepassword</artifactId>
24-
<version>4.2.0</version>
24+
<version>4.2.1</version>
2525
<packaging>jar</packaging>
2626
<name>Username Password Authenticator</name>
2727

2828
<properties>
2929
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3030
<project.curityVersion>9.2.0</project.curityVersion>
31-
<project.slf4jVersion>2.0.3</project.slf4jVersion>
31+
<project.slf4jVersion>2.0.12</project.slf4jVersion>
3232
<project.hibernateValidatorVersion>7.0.3.Final</project.hibernateValidatorVersion>
33-
<project.guavaVersion>33.0.0-jre</project.guavaVersion>
34-
<project.gsonVersion>2.10.1</project.gsonVersion>
35-
<project.apacheCommonsVersion>3.14.0</project.apacheCommonsVersion>
33+
<project.guavaVersion>33.5.0-jre</project.guavaVersion>
34+
<project.gsonVersion>2.13.2</project.gsonVersion>
35+
<project.apacheCommonsVersion>3.20.0</project.apacheCommonsVersion>
3636
</properties>
3737

3838
<build>
@@ -108,4 +108,11 @@
108108
<version>${project.apacheCommonsVersion}</version>
109109
</dependency>
110110
</dependencies>
111+
<distributionManagement>
112+
<repository>
113+
<id>customer-release-repo</id>
114+
<name>Customer Release Repository</name>
115+
<url>https://hub.curityio.net/repository/curity-release-repo/</url>
116+
</repository>
117+
</distributionManagement>
111118
</project>

‎src/main/java/io/curity/identityserver/plugin/usernamepassword/templates/ForgotPasswordPostRepresentation.java‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,24 +16,14 @@
1616

1717
package io.curity.identityserver.plugin.usernamepassword.templates;
1818

19-
import org.apache.commons.lang3.RandomStringUtils;
20-
import org.apache.commons.lang3.StringUtils;
2119
import se.curity.identityserver.sdk.haapi.HaapiContract;
2220
import se.curity.identityserver.sdk.haapi.Message;
2321
import se.curity.identityserver.sdk.haapi.RepresentationFactory;
2422
import se.curity.identityserver.sdk.haapi.RepresentationFunction;
2523
import se.curity.identityserver.sdk.haapi.RepresentationModel;
2624
import se.curity.identityserver.sdk.web.Representation;
2725

28-
import javax.annotation.Nullable;
2926
import java.net.URI;
30-
import java.util.ArrayList;
31-
import java.util.Arrays;
32-
import java.util.HashSet;
33-
import java.util.List;
34-
import java.util.Set;
35-
import java.util.regex.Matcher;
36-
import java.util.regex.Pattern;
3727

3828
import static io.curity.identityserver.plugin.usernamepassword.utils.ViewModelReservedKeys.RECIPIENT_OF_COMMUNICATION;
3929

‎src/main/resources/icons/username-password-authenticator.svg‎

Lines changed: 1 addition & 0 deletions
Loading

0 commit comments

Comments
 (0)