Skip to content
This repository was archived by the owner on Apr 17, 2024. It is now read-only.

Commit 8a89ade

Browse files
BeryJuBeryJu
committed
update generator version, fix incorrect version
1 parent 869bc94 commit 8a89ade

File tree

599 files changed

+4193
-5071
lines changed

Some content is hidden

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

599 files changed

+4193
-5071
lines changed

‎.gitignore

+30-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# Created by https://www.toptal.com/developers/gitignore/api/kotlin
2-
# Edit at https://www.toptal.com/developers/gitignore?templates=kotlin
1+
# Created by https://www.toptal.com/developers/gitignore/api/kotlin,gradle
2+
# Edit at https://www.toptal.com/developers/gitignore?templates=kotlin,gradle
33

44
### Kotlin ###
55
# Compiled class file
@@ -27,4 +27,31 @@
2727
hs_err_pid*
2828
replay_pid*
2929

30-
# End of https://www.toptal.com/developers/gitignore/api/kotlin
30+
### Gradle ###
31+
.gradle
32+
**/build/
33+
!src/**/build/
34+
35+
# Ignore Gradle GUI config
36+
gradle-app.setting
37+
38+
# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
39+
!gradle-wrapper.jar
40+
41+
# Avoid ignore Gradle wrappper properties
42+
!gradle-wrapper.properties
43+
44+
# Cache of project
45+
.gradletasknamecache
46+
47+
# Eclipse Gradle plugin generated files
48+
# Eclipse Core
49+
.project
50+
# JDT-specific (Eclipse Java Development Tools)
51+
.classpath
52+
53+
### Gradle Patch ###
54+
# Java heap dump
55+
*.hprof
56+
57+
# End of https://www.toptal.com/developers/gitignore/api/kotlin,gradle

‎.openapi-generator/VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6.2.0
1+
7.1.0

‎Makefile

+4-2
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,20 @@ clean:
1010
rm -rf docs/
1111
rm -rf src/
1212

13+
.PHONY: build
1314
build:
1415
docker run \
1516
--rm -v ${PWD}:/local \
1617
--user ${UID}:${GID} \
17-
docker.io/openapitools/openapi-generator-cli:v6.2.0 generate \
18-
--additional-properties=npmVersion=${NPM_VERSION} \
18+
docker.io/openapitools/openapi-generator-cli:v7.1.0 generate \
19+
--additional-properties=artifactVersion=${VERSION} \
1920
-i /local/schema.yml \
2021
-g kotlin \
2122
-o /local \
2223
-c /local/config.yaml
2324
rm -rf ./test
2425
rm -f .travis.yml git_push.sh
26+
chmod +x ./gradlew
2527

2628
diff:
2729
docker run \

‎build.gradle

+31-6
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,62 @@
1-
group 'org.openapitools'
2-
version '1.0.0'
1+
group 'io.goauthentik'
2+
version '3.2023103.3'
33

44
wrapper {
55
gradleVersion = '7.5'
66
distributionUrl = "https://services.gradle.org/distributions/gradle-$gradleVersion-all.zip"
77
}
88

99
buildscript {
10-
ext.kotlin_version = '1.6.10'
10+
ext.kotlin_version = '1.8.10'
11+
ext.spotless_version = "6.13.0"
1112

1213
repositories {
1314
maven { url "https://repo1.maven.org/maven2" }
1415
}
1516
dependencies {
1617
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
18+
classpath "com.diffplug.spotless:spotless-plugin-gradle:$spotless_version"
1719
}
1820
}
1921

2022
apply plugin: 'kotlin'
23+
apply plugin: 'maven-publish'
24+
apply plugin: 'com.diffplug.spotless'
2125

2226
repositories {
2327
maven { url "https://repo1.maven.org/maven2" }
2428
}
2529

30+
// Use spotless plugin to automatically format code, remove unused import, etc
31+
// To apply changes directly to the file, run `gradlew spotlessApply`
32+
// Ref: https://github.com/diffplug/spotless/tree/main/plugin-gradle
33+
spotless {
34+
// comment out below to run spotless as part of the `check` task
35+
enforceCheck false
36+
37+
format 'misc', {
38+
// define the files (e.g. '*.gradle', '*.md') to apply `misc` to
39+
target '.gitignore'
40+
41+
// define the steps to apply to those files
42+
trimTrailingWhitespace()
43+
indentWithSpaces() // Takes an integer argument if you don't like 4
44+
endWithNewline()
45+
}
46+
kotlin {
47+
ktfmt()
48+
}
49+
}
50+
2651
test {
2752
useJUnitPlatform()
2853
}
2954

3055
dependencies {
3156
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
3257
implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
33-
implementation "com.squareup.moshi:moshi-kotlin:1.13.0"
34-
implementation "com.squareup.moshi:moshi-adapters:1.13.0"
35-
implementation "com.squareup.okhttp3:okhttp:4.10.0"
58+
implementation "com.squareup.moshi:moshi-kotlin:1.14.0"
59+
implementation "com.squareup.moshi:moshi-adapters:1.14.0"
60+
implementation "com.squareup.okhttp3:okhttp:4.11.0"
3661
testImplementation "io.kotlintest:kotlintest-runner-junit5:3.4.2"
3762
}

‎config.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@ templateDir: /local/templates/
22
additionalProperties:
33
disallowAdditionalPropertiesIfNotPresent: false
44
enumUnknownDefaultCase: true
5-
packageName: io.goauthentik.api
65
artifactId: authentik-api
6+
groupId: io.goauthentik
7+
packageName: io.goauthentik.api
78
files:
89
README.mustache:
910
templateType: SupportingFiles

‎diff.test

Whitespace-only changes.

‎docs/AdminApi.md

+10-10
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Method | HTTP request | Description
1616
[**adminWorkersRetrieve**](AdminApi.md#adminWorkersRetrieve) | **GET** /admin/workers/ |
1717

1818

19-
<a name="adminAppsList"></a>
19+
<a id="adminAppsList"></a>
2020
# **adminAppsList**
2121
> kotlin.collections.List&lt;App&gt; adminAppsList()
2222
@@ -62,7 +62,7 @@ Configure authentik:
6262
- **Content-Type**: Not defined
6363
- **Accept**: application/json
6464

65-
<a name="adminMetricsRetrieve"></a>
65+
<a id="adminMetricsRetrieve"></a>
6666
# **adminMetricsRetrieve**
6767
> LoginMetrics adminMetricsRetrieve()
6868
@@ -108,7 +108,7 @@ Configure authentik:
108108
- **Content-Type**: Not defined
109109
- **Accept**: application/json
110110

111-
<a name="adminModelsList"></a>
111+
<a id="adminModelsList"></a>
112112
# **adminModelsList**
113113
> kotlin.collections.List&lt;App&gt; adminModelsList()
114114
@@ -154,7 +154,7 @@ Configure authentik:
154154
- **Content-Type**: Not defined
155155
- **Accept**: application/json
156156

157-
<a name="adminSystemCreate"></a>
157+
<a id="adminSystemCreate"></a>
158158
# **adminSystemCreate**
159159
> System adminSystemCreate()
160160
@@ -200,7 +200,7 @@ Configure authentik:
200200
- **Content-Type**: Not defined
201201
- **Accept**: application/json
202202

203-
<a name="adminSystemRetrieve"></a>
203+
<a id="adminSystemRetrieve"></a>
204204
# **adminSystemRetrieve**
205205
> System adminSystemRetrieve()
206206
@@ -246,7 +246,7 @@ Configure authentik:
246246
- **Content-Type**: Not defined
247247
- **Accept**: application/json
248248

249-
<a name="adminSystemTasksList"></a>
249+
<a id="adminSystemTasksList"></a>
250250
# **adminSystemTasksList**
251251
> kotlin.collections.List&lt;Task&gt; adminSystemTasksList()
252252
@@ -292,7 +292,7 @@ Configure authentik:
292292
- **Content-Type**: Not defined
293293
- **Accept**: application/json
294294

295-
<a name="adminSystemTasksRetrieve"></a>
295+
<a id="adminSystemTasksRetrieve"></a>
296296
# **adminSystemTasksRetrieve**
297297
> Task adminSystemTasksRetrieve(id)
298298
@@ -342,7 +342,7 @@ Configure authentik:
342342
- **Content-Type**: Not defined
343343
- **Accept**: application/json
344344

345-
<a name="adminSystemTasksRetryCreate"></a>
345+
<a id="adminSystemTasksRetryCreate"></a>
346346
# **adminSystemTasksRetryCreate**
347347
> adminSystemTasksRetryCreate(id)
348348
@@ -391,7 +391,7 @@ Configure authentik:
391391
- **Content-Type**: Not defined
392392
- **Accept**: application/json
393393

394-
<a name="adminVersionRetrieve"></a>
394+
<a id="adminVersionRetrieve"></a>
395395
# **adminVersionRetrieve**
396396
> Version adminVersionRetrieve()
397397
@@ -437,7 +437,7 @@ Configure authentik:
437437
- **Content-Type**: Not defined
438438
- **Accept**: application/json
439439

440-
<a name="adminWorkersRetrieve"></a>
440+
<a id="adminWorkersRetrieve"></a>
441441
# **adminWorkersRetrieve**
442442
> Workers adminWorkersRetrieve()
443443

‎docs/AuthenticatorValidateStage.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Name | Type | Description | Notes
1515
**deviceClasses** | [**kotlin.collections.List&lt;DeviceClassesEnum&gt;**](DeviceClassesEnum.md) | Device classes which can be used to authenticate | [optional]
1616
**configurationStages** | [**kotlin.collections.List&lt;java.util.UUID&gt;**](java.util.UUID.md) | Stages used to configure Authenticator when user doesn&#39;t have any compatible devices. After this configuration Stage passes, the user is not prompted again. | [optional]
1717
**lastAuthThreshold** | **kotlin.String** | If any of the user&#39;s device has been used within this threshold, this stage will be skipped | [optional]
18-
**webauthnUserVerification** | [**UserVerificationEnum**](UserVerificationEnum.md) | Enforce user verification for WebAuthn devices. * &#x60;required&#x60; - Required * &#x60;preferred&#x60; - Preferred * &#x60;discouraged&#x60; - Discouraged | [optional]
18+
**webauthnUserVerification** | [**UserVerificationEnum**](UserVerificationEnum.md) | | [optional]
1919

2020

2121

‎docs/AuthenticatorValidateStageRequest.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Name | Type | Description | Notes
1010
**deviceClasses** | [**kotlin.collections.List&lt;DeviceClassesEnum&gt;**](DeviceClassesEnum.md) | Device classes which can be used to authenticate | [optional]
1111
**configurationStages** | [**kotlin.collections.List&lt;java.util.UUID&gt;**](java.util.UUID.md) | Stages used to configure Authenticator when user doesn&#39;t have any compatible devices. After this configuration Stage passes, the user is not prompted again. | [optional]
1212
**lastAuthThreshold** | **kotlin.String** | If any of the user&#39;s device has been used within this threshold, this stage will be skipped | [optional]
13-
**webauthnUserVerification** | [**UserVerificationEnum**](UserVerificationEnum.md) | Enforce user verification for WebAuthn devices. * &#x60;required&#x60; - Required * &#x60;preferred&#x60; - Preferred * &#x60;discouraged&#x60; - Discouraged | [optional]
13+
**webauthnUserVerification** | [**UserVerificationEnum**](UserVerificationEnum.md) | | [optional]
1414

1515

1616

0 commit comments

Comments
 (0)