Skip to content

Commit 6a24e22

Browse files
author
Koman Rudden
committed
Merge branch 'main' into bugfix/snyk-validation-fixes
# Conflicts: # kinde-core/pom.xml
2 parents ede0c72 + 378eb5d commit 6a24e22

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+828
-289
lines changed

‎kinde-core/pom.xml

Lines changed: 138 additions & 109 deletions
Original file line numberDiff line numberDiff line change
@@ -1,120 +1,149 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3-
<modelVersion>4.0.0</modelVersion>
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
44

5-
<parent>
6-
<groupId>com.kinde</groupId>
7-
<artifactId>kinde-parent-pom</artifactId>
8-
<version>2.0.1</version>
9-
</parent>
5+
<parent>
6+
<groupId>com.kinde</groupId>
7+
<artifactId>kinde-parent-pom</artifactId>
8+
<version>2.0.1</version>
9+
</parent>
1010

11-
<groupId>com.kinde</groupId>
12-
<artifactId>kinde-core</artifactId>
13-
<packaging>jar</packaging>
14-
<version>2.0.1</version>
15-
<name>kinde-core</name>
16-
<url>http://maven.apache.org</url>
11+
<artifactId>kinde-core</artifactId>
12+
<packaging>jar</packaging>
13+
<version>2.0.1</version>
14+
<name>kinde-core</name>
15+
<url>http://maven.apache.org</url>
1716

18-
<dependencies>
19-
<!-- https://mvnrepository.com/artifact/com.nimbusds/oauth2-oidc-sdk -->
20-
<dependency>
21-
<groupId>com.nimbusds</groupId>
22-
<artifactId>oauth2-oidc-sdk</artifactId>
23-
</dependency>
24-
<dependency>
25-
<groupId>com.nimbusds</groupId>
26-
<artifactId>nimbus-jose-jwt</artifactId>
27-
</dependency>
28-
<dependency>
29-
<groupId>org.checkerframework</groupId>
30-
<artifactId>checker-qual</artifactId>
31-
<version>3.33.0</version>
32-
</dependency>
33-
<dependency>
34-
<groupId>junit</groupId>
35-
<artifactId>junit</artifactId>
36-
<scope>test</scope>
37-
</dependency>
38-
<!-- JUnit 5 API and Engine -->
39-
<dependency>
40-
<groupId>org.junit.jupiter</groupId>
41-
<artifactId>junit-jupiter-api</artifactId>
42-
<scope>test</scope>
43-
</dependency>
44-
<dependency>
45-
<groupId>org.junit.jupiter</groupId>
46-
<artifactId>junit-jupiter-engine</artifactId>
47-
<scope>test</scope>
48-
</dependency>
17+
<dependencies>
18+
<!-- https://mvnrepository.com/artifact/com.nimbusds/oauth2-oidc-sdk -->
19+
<dependency>
20+
<groupId>com.nimbusds</groupId>
21+
<artifactId>oauth2-oidc-sdk</artifactId>
22+
</dependency>
23+
<dependency>
24+
<groupId>com.fasterxml.jackson.core</groupId>
25+
<artifactId>jackson-databind</artifactId>
26+
<version>2.15.2</version>
27+
</dependency>
28+
<dependency>
29+
<groupId>com.nimbusds</groupId>
30+
<artifactId>nimbus-jose-jwt</artifactId>
31+
</dependency>
32+
<dependency>
33+
<groupId>junit</groupId>
34+
<artifactId>junit</artifactId>
35+
<scope>test</scope>
36+
</dependency>
37+
<!-- JUnit 5 API and Engine -->
38+
<dependency>
39+
<groupId>org.junit.jupiter</groupId>
40+
<artifactId>junit-jupiter-api</artifactId>
41+
<scope>test</scope>
42+
</dependency>
43+
<dependency>
44+
<groupId>org.junit.jupiter</groupId>
45+
<artifactId>junit-jupiter-engine</artifactId>
46+
<scope>test</scope>
47+
</dependency>
48+
<!-- https://mvnrepository.com/artifact/com.nimbusds/oauth2-oidc-sdk -->
49+
<dependency>
50+
<groupId>com.nimbusds</groupId>
51+
<artifactId>oauth2-oidc-sdk</artifactId>
52+
</dependency>
53+
<dependency>
54+
<groupId>com.nimbusds</groupId>
55+
<artifactId>nimbus-jose-jwt</artifactId>
56+
</dependency>
57+
<dependency>
58+
<groupId>org.checkerframework</groupId>
59+
<artifactId>checker-qual</artifactId>
60+
<version>3.33.0</version>
61+
</dependency>
62+
<dependency>
63+
<groupId>junit</groupId>
64+
<artifactId>junit</artifactId>
65+
<scope>test</scope>
66+
</dependency>
67+
<!-- JUnit 5 API and Engine -->
68+
<dependency>
69+
<groupId>org.junit.jupiter</groupId>
70+
<artifactId>junit-jupiter-api</artifactId>
71+
<scope>test</scope>
72+
</dependency>
73+
<dependency>
74+
<groupId>org.junit.jupiter</groupId>
75+
<artifactId>junit-jupiter-engine</artifactId>
76+
<scope>test</scope>
77+
</dependency>
4978

50-
<!-- Optional: For parameterized tests -->
51-
<dependency>
52-
<groupId>org.junit.jupiter</groupId>
53-
<artifactId>junit-jupiter-params</artifactId>
54-
<scope>test</scope>
55-
</dependency>
79+
<!-- Optional: For parameterized tests -->
80+
<dependency>
81+
<groupId>org.junit.jupiter</groupId>
82+
<artifactId>junit-jupiter-params</artifactId>
83+
<scope>test</scope>
84+
</dependency>
5685

57-
<!-- Mockito (if you are using it for mocking) -->
58-
<dependency>
59-
<groupId>org.mockito</groupId>
60-
<artifactId>mockito-core</artifactId>
61-
<scope>test</scope>
62-
</dependency>
86+
<!-- Mockito (if you are using it for mocking) -->
87+
<dependency>
88+
<groupId>org.mockito</groupId>
89+
<artifactId>mockito-core</artifactId>
90+
<scope>test</scope>
91+
</dependency>
6392

6493

65-
<dependency>
66-
<groupId>com.google.inject</groupId>
67-
<artifactId>guice</artifactId>
68-
<!-- {version} can be 6.0.0, 7.0.0, etc. -->
69-
<exclusions>
70-
<exclusion>
71-
<groupId>com.google.guava</groupId>
72-
<artifactId>guava</artifactId>
73-
</exclusion>
74-
</exclusions>
75-
</dependency>
76-
<!-- https://mvnrepository.com/artifact/com.google.guava/guava -->
77-
<dependency>
78-
<groupId>com.google.guava</groupId>
79-
<artifactId>guava</artifactId>
80-
</dependency>
94+
<dependency>
95+
<groupId>com.google.inject</groupId>
96+
<artifactId>guice</artifactId>
97+
<!-- {version} can be 6.0.0, 7.0.0, etc. -->
98+
<exclusions>
99+
<exclusion>
100+
<groupId>com.google.guava</groupId>
101+
<artifactId>guava</artifactId>
102+
</exclusion>
103+
</exclusions>
104+
</dependency>
105+
<!-- https://mvnrepository.com/artifact/com.google.guava/guava -->
106+
<dependency>
107+
<groupId>com.google.guava</groupId>
108+
<artifactId>guava</artifactId>
109+
</dependency>
81110

82111

83-
<!-- https://mvnrepository.com/artifact/org.projectlombok/lombok -->
84-
<dependency>
85-
<groupId>org.projectlombok</groupId>
86-
<artifactId>lombok</artifactId>
87-
<scope>provided</scope>
88-
</dependency>
89-
<!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-api -->
90-
<dependency>
91-
<groupId>org.slf4j</groupId>
92-
<artifactId>slf4j-api</artifactId>
93-
</dependency>
94-
<dependency>
95-
<groupId>io.github.cdimascio</groupId>
96-
<artifactId>dotenv-java</artifactId>
97-
</dependency>
98-
<dependency>
99-
<groupId>org.wiremock</groupId>
100-
<artifactId>wiremock</artifactId>
101-
<scope>test</scope>
102-
</dependency>
103-
</dependencies>
104-
<build>
105-
<plugins>
106-
<plugin>
107-
<groupId>org.apache.maven.plugins</groupId>
108-
<artifactId>maven-surefire-plugin</artifactId>
109-
<version>3.5.2</version>
110-
<configuration>
111-
<parallel>none</parallel>
112-
</configuration>
113-
</plugin>
114-
<plugin>
115-
<groupId>org.sonatype.plugins</groupId>
116-
<artifactId>nexus-staging-maven-plugin</artifactId>
117-
</plugin>
118-
</plugins>
119-
</build>
112+
<!-- https://mvnrepository.com/artifact/org.projectlombok/lombok -->
113+
<dependency>
114+
<groupId>org.projectlombok</groupId>
115+
<artifactId>lombok</artifactId>
116+
<scope>provided</scope>
117+
</dependency>
118+
<!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-api -->
119+
<dependency>
120+
<groupId>org.slf4j</groupId>
121+
<artifactId>slf4j-api</artifactId>
122+
</dependency>
123+
<dependency>
124+
<groupId>io.github.cdimascio</groupId>
125+
<artifactId>dotenv-java</artifactId>
126+
</dependency>
127+
<dependency>
128+
<groupId>org.wiremock</groupId>
129+
<artifactId>wiremock</artifactId>
130+
<scope>test</scope>
131+
</dependency>
132+
</dependencies>
133+
<build>
134+
<plugins>
135+
<plugin>
136+
<groupId>org.apache.maven.plugins</groupId>
137+
<artifactId>maven-surefire-plugin</artifactId>
138+
<version>3.5.2</version>
139+
<configuration>
140+
<parallel>none</parallel>
141+
</configuration>
142+
</plugin>
143+
<plugin>
144+
<groupId>org.sonatype.plugins</groupId>
145+
<artifactId>nexus-staging-maven-plugin</artifactId>
146+
</plugin>
147+
</plugins>
148+
</build>
120149
</project>

‎kinde-core/src/main/java/com/kinde/KindeClientSession.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
package com.kinde;
22

3-
43
import com.kinde.authorization.AuthorizationUrl;
5-
import com.kinde.token.KindeToken;
64
import com.kinde.token.KindeTokens;
75
import com.kinde.user.UserInfo;
86

9-
import java.util.List;
107
import java.util.Map;
118

129
public interface KindeClientSession {
@@ -25,5 +22,7 @@ public interface KindeClientSession {
2522

2623
AuthorizationUrl logout() throws Exception;
2724

25+
AuthorizationUrl generatePortalUrl(String domain, String returnUrl, String subNav);
26+
2827
UserInfo retrieveUserInfo();
2928
}

‎kinde-core/src/main/java/com/kinde/authorization/AuthorizationUrl.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import com.nimbusds.oauth2.sdk.pkce.CodeVerifier;
44
import lombok.AllArgsConstructor;
5-
import lombok.Data;
65
import lombok.Getter;
76

87
import java.net.URL;

‎kinde-core/src/main/java/com/kinde/exceptions/KindeClientSessionException.java

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package com.kinde.exceptions;
2+
3+
public class KindeClientSessionException extends Exception {
4+
public KindeClientSessionException(String message) {
5+
super(message);
6+
}
7+
8+
public KindeClientSessionException(String message, Throwable cause) {
9+
super(message, cause);
10+
}
11+
12+
public KindeClientSessionException(Throwable cause) {
13+
super(cause);
14+
}
15+
}

0 commit comments

Comments
 (0)