Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: supertokens/supertokens-core
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v10.1.0
Choose a base ref
...
head repository: supertokens/supertokens-core
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref

Commits on Mar 13, 2025

  1. Copy the full SHA
    16b17be View commit details
  2. Copy the full SHA
    f2be9be View commit details

Commits on Mar 14, 2025

  1. Copy the full SHA
    85118ac View commit details

Commits on Mar 18, 2025

  1. Copy the full SHA
    edaaf19 View commit details
  2. chore: changelog

    tamassoltesz committed Mar 18, 2025
    Copy the full SHA
    3755ed1 View commit details

Commits on Mar 19, 2025

  1. Copy the full SHA
    5bfa992 View commit details

Commits on Mar 20, 2025

  1. Copy the full SHA
    89f38fd View commit details
  2. Copy the full SHA
    9561424 View commit details
  3. Copy the full SHA
    122b574 View commit details
  4. Copy the full SHA
    1efe87f View commit details
  5. Copy the full SHA
    1f7e58d View commit details
  6. Copy the full SHA
    a949c86 View commit details
  7. Copy the full SHA
    25fccc6 View commit details
  8. Copy the full SHA
    0c03d9f View commit details
  9. Merge pull request #1127 from supertokens/fix/bulk_migration_account_…

    …linking
    
    fix: bulk migration account linking
    porcellus authored Mar 20, 2025
    Copy the full SHA
    611b5bc View commit details
  10. Merge pull request #1125 from supertokens/feat/bulk_migration_return_…

    …userids
    
    feat: bulk migration return userids
    porcellus authored Mar 20, 2025
    Copy the full SHA
    aeef6e3 View commit details
  11. Copy the full SHA
    0171fcd View commit details
  12. Merge pull request #1124 from supertokens/fix/bulk_migration_debug_logs

    fix: bulk migration debug logs
    porcellus authored Mar 20, 2025
    Copy the full SHA
    10768f7 View commit details
  13. Copy the full SHA
    7e93048 View commit details

Commits on Mar 21, 2025

  1. Copy the full SHA
    ab7375a View commit details
  2. Merge pull request #1129 from supertokens/fix/bulk_migration_webauthn…

    …_user_tests
    
    fix: bulk migration webauthn user tests
    porcellus authored Mar 21, 2025
    Copy the full SHA
    5abba30 View commit details
  3. Copy the full SHA
    2607c84 View commit details

Commits on Mar 26, 2025

  1. Copy the full SHA
    06c176d View commit details
  2. adding dev-v10.1.2 tag to this commit to ensure building

    Sattvik authored and Sattvik committed Mar 26, 2025
    Copy the full SHA
    f0c7e5f View commit details
  3. Copy the full SHA
    37de0a8 View commit details
  4. adding dev-v10.1.2 tag to this commit to ensure building

    Sattvik authored and Sattvik committed Mar 26, 2025
    Copy the full SHA
    abf8a2b View commit details

Commits on Mar 27, 2025

  1. Copy the full SHA
    482b0db View commit details
  2. Merge pull request #1133 from supertokens/fix/dependency_versions

    fix: dependency versions
    porcellus authored Mar 27, 2025
    Copy the full SHA
    205fe3d View commit details
  3. Copy the full SHA
    1ef697f View commit details

Commits on Apr 2, 2025

  1. adding dev-v10.1.2 tag to this commit to ensure building

    Sattvik authored and Sattvik committed Apr 2, 2025
    Copy the full SHA
    bd5a279 View commit details
  2. fix: version bump (#1135)

    Co-authored-by: Sattvik <sattvik@Sattviks-MacBook-Pro.local>
    sattvikc and Sattvik authored Apr 2, 2025
    Copy the full SHA
    f45952d View commit details
  3. adding dev-v10.1.3 tag to this commit to ensure building

    Sattvik authored and Sattvik committed Apr 2, 2025
    Copy the full SHA
    96def24 View commit details
Showing with 1,167 additions and 371 deletions.
  1. +31 −0 CHANGELOG.md
  2. +12 −8 build.gradle
  3. BIN cli/jar/cli.jar
  4. BIN downloader/jar/downloader.jar
  5. BIN ee/jar/ee.jar
  6. +26 −21 implementationDependencies.json
  7. BIN jar/{core-10.1.0.jar → core-10.1.3.jar}
  8. +200 −194 src/main/java/io/supertokens/authRecipe/AuthRecipe.java
  9. +27 −0 ...ns/authRecipe/exception/BulkImportRecipeUserIdAlreadyLinkedWithAnotherPrimaryUserIdException.java
  10. +30 −75 src/main/java/io/supertokens/bulkimport/BulkImport.java
  11. +87 −7 src/main/java/io/supertokens/bulkimport/BulkImportUserUtils.java
  12. +25 −5 src/main/java/io/supertokens/cronjobs/bulkimport/ProcessBulkImportUsers.java
  13. +14 −4 src/main/java/io/supertokens/cronjobs/bulkimport/ProcessBulkUsersImportWorker.java
  14. +1 −0 src/main/java/io/supertokens/inmemorydb/queries/GeneralQueries.java
  15. +5 −0 src/main/java/io/supertokens/inmemorydb/queries/UserRolesQueries.java
  16. +6 −1 src/main/java/io/supertokens/webserver/api/bulkimport/BulkImportAPI.java
  17. +1 −3 src/main/java/io/supertokens/webserver/api/bulkimport/ImportUserAPI.java
  18. +121 −7 src/test/java/io/supertokens/test/bulkimport/BulkImportFlowTest.java
  19. +434 −20 src/test/java/io/supertokens/test/bulkimport/BulkImportTest.java
  20. +77 −9 src/test/java/io/supertokens/test/bulkimport/BulkImportTestUtils.java
  21. +35 −15 src/test/java/io/supertokens/test/bulkimport/ProcessBulkImportUsersCronJobTest.java
  22. +2 −0 src/test/java/io/supertokens/test/bulkimport/apis/AddBulkImportUsersTest.java
  23. +33 −2 src/test/java/io/supertokens/test/bulkimport/apis/ImportUserTest.java
31 changes: 31 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -7,6 +7,37 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]

## [10.1.3]

- Version bumped for re-release

## [10.1.2]

- Adds user_id index to the user roles table
- Adds more debug logging to bulk migration
- Adds more tests to bulk migration

### Migration

If using PostgreSQL, run the following SQL script:

```sql
CREATE INDEX IF NOT EXISTS user_roles_app_id_user_id_index ON user_roles (app_id, user_id);
```

If using MySQL, run the following SQL script:
```sql
CREATE INDEX user_roles_app_id_user_id_index ON user_roles (app_id, user_id);
```


## [10.1.1]

- Adds debug logging for the bulk migration process
- Bulk migration users upload now returns the ids of the users.
- Bulk Migration now requires Account Linking to be enabled only if the input data justifies it
- Speed up Bulk Migration's account linking and primary user making

## [10.1.0]

- Adds Webauthn (Passkeys) support to core
20 changes: 12 additions & 8 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -19,23 +19,27 @@ compileTestJava { options.encoding = "UTF-8" }
// }
//}

version = "10.1.0"
version = "10.1.3"

repositories {
mavenCentral()
}


dependencies {

// https://mvnrepository.com/artifact/com.google.code.gson/gson
// if this changes, remember to also change in the ee folder's build.gradle
implementation group: 'com.google.code.gson', name: 'gson', version: '2.3.1'

// https://mvnrepository.com/artifact/com.fasterxml.jackson.dataformat/jackson-dataformat-yaml
implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: '2.16.1'
implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: '2.18.2'

// https://mvnrepository.com/artifact/com.fasterxml.jackson.dataformat/jackson-dataformat-cbor
implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-cbor', version: '2.18.2'

// https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core
implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.16.1'
implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.18.2'

// https://mvnrepository.com/artifact/ch.qos.logback/logback-classic
implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.4.14'
@@ -76,13 +80,11 @@ dependencies {
// https://mvnrepository.com/artifact/com.webauthn4j/webauthn4j-core
implementation group: 'com.webauthn4j', name: 'webauthn4j-core', version: '0.28.6.RELEASE'

// https://mvnrepository.com/artifact/com.webauthn4j/webauthn4j-test
implementation group: 'com.webauthn4j', name: 'webauthn4j-test', version: '0.28.6.RELEASE'

compileOnly project(":supertokens-plugin-interface")
testImplementation project(":supertokens-plugin-interface")

// this is so that we can find plugin-interface jar while testing
testImplementation project(":supertokens-plugin-interface")

testImplementation 'junit:junit:4.12'

// https://mvnrepository.com/artifact/org.mockito/mockito-core
@@ -92,8 +94,10 @@ dependencies {
testImplementation group: 'org.reflections', name: 'reflections', version: '0.9.10'

testImplementation 'com.tngtech.archunit:archunit-junit4:0.22.0'
}

// https://mvnrepository.com/artifact/com.webauthn4j/webauthn4j-test
testImplementation group: 'com.webauthn4j', name: 'webauthn4j-test', version: '0.28.6.RELEASE'
}
application {
mainClass.set("io.supertokens.Main")
}
Binary file modified cli/jar/cli.jar
Binary file not shown.
Binary file modified downloader/jar/downloader.jar
Binary file not shown.
Binary file modified ee/jar/ee.jar
Binary file not shown.
47 changes: 26 additions & 21 deletions implementationDependencies.json
Original file line number Diff line number Diff line change
@@ -7,29 +7,34 @@
"src": "https://repo1.maven.org/maven2/com/google/code/gson/gson/2.3.1/gson-2.3.1-sources.jar"
},
{
"jar": "https://repo1.maven.org/maven2/com/fasterxml/jackson/dataformat/jackson-dataformat-yaml/2.16.1/jackson-dataformat-yaml-2.16.1.jar",
"name": "Jackson Dataformat 2.16.1",
"src": "https://repo1.maven.org/maven2/com/fasterxml/jackson/dataformat/jackson-dataformat-yaml/2.16.1/jackson-dataformat-yaml-2.16.1-sources.jar"
"jar": "https://repo1.maven.org/maven2/com/fasterxml/jackson/dataformat/jackson-dataformat-yaml/2.18.2/jackson-dataformat-yaml-2.18.2.jar",
"name": "Jackson Dataformat 2.18.2",
"src": "https://repo1.maven.org/maven2/com/fasterxml/jackson/dataformat/jackson-dataformat-yaml/2.18.2/jackson-dataformat-yaml-2.18.2-sources.jar"
},
{
"jar": "https://repo1.maven.org/maven2/org/yaml/snakeyaml/2.2/snakeyaml-2.2.jar",
"name": "SnakeYAML 2.2",
"src": "https://repo1.maven.org/maven2/org/yaml/snakeyaml/2.2/snakeyaml-2.2-sources.jar"
"jar": "https://repo1.maven.org/maven2/com/fasterxml/jackson/dataformat/jackson-dataformat-cbor/2.18.2/jackson-dataformat-cbor-2.18.2.jar",
"name": "Jackson Dataformat CBOR 2.18.2",
"src": "https://repo1.maven.org/maven2/com/fasterxml/jackson/dataformat/jackson-dataformat-cbor/2.18.2/jackson-dataformat-cbor-2.18.2-sources.jar"
},
{
"jar": "https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-core/2.16.1/jackson-core-2.16.1.jar",
"name": "Jackson core 2.16.1",
"src": "https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-core/2.16.1/jackson-core-2.16.1-sources.jar"
"jar": "https://repo1.maven.org/maven2/org/yaml/snakeyaml/2.3/snakeyaml-2.3.jar",
"name": "SnakeYAML 2.3",
"src": "https://repo1.maven.org/maven2/org/yaml/snakeyaml/2.3/snakeyaml-2.3-sources.jar"
},
{
"jar": "https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-databind/2.16.1/jackson-databind-2.16.1.jar",
"name": "Jackson databind 2.16.1",
"src": "https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-databind/2.16.1/jackson-databind-2.16.1-sources.jar"
"jar": "https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-core/2.18.2/jackson-core-2.18.2.jar",
"name": "Jackson core 2.18.2",
"src": "https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-core/2.18.2/jackson-core-2.18.2-sources.jar"
},
{
"jar": "https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-annotations/2.16.1/jackson-annotations-2.16.1.jar",
"name": "Jackson annotation 2.16.1",
"src": "https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-annotations/2.16.1/jackson-annotations-2.16.1-sources.jar"
"jar": "https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-databind/2.18.2/jackson-databind-2.18.2.jar",
"name": "Jackson databind 2.18.2",
"src": "https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-databind/2.18.2/jackson-databind-2.18.2-sources.jar"
},
{
"jar": "https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-annotations/2.18.2/jackson-annotations-2.18.2.jar",
"name": "Jackson annotation 2.18.2",
"src": "https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-annotations/2.18.2/jackson-annotations-2.18.2-sources.jar"
},
{
"jar": "https://repo1.maven.org/maven2/ch/qos/logback/logback-classic/1.4.14/logback-classic-1.4.14.jar",
@@ -42,9 +47,9 @@
"src": "https://repo1.maven.org/maven2/ch/qos/logback/logback-core/1.4.14/logback-core-1.4.14-sources.jar"
},
{
"jar": "https://repo1.maven.org/maven2/org/slf4j/slf4j-api/2.0.7/slf4j-api-2.0.7.jar",
"name": "SLF4j API 2.0.7",
"src": "https://repo1.maven.org/maven2/org/slf4j/slf4j-api/2.0.7/slf4j-api-2.0.7-sources.jar"
"jar": "https://repo1.maven.org/maven2/org/slf4j/slf4j-api/2.0.16/slf4j-api-2.0.16.jar",
"name": "SLF4j API 2.0.16",
"src": "https://repo1.maven.org/maven2/org/slf4j/slf4j-api/2.0.16/slf4j-api-2.0.16-sources.jar"
},
{
"jar": "https://repo1.maven.org/maven2/org/apache/tomcat/tomcat-annotations-api/10.1.18/tomcat-annotations-api-10.1.18.jar",
@@ -122,9 +127,9 @@
"src": "https://repo1.maven.org/maven2/com/webauthn4j/webauthn4j-core/0.28.6.RELEASE/webauthn4j-core-0.28.6.RELEASE-sources.jar"
},
{
"jar": "https://repo1.maven.org/maven2/com/webauthn4j/webauthn4j-test/0.28.6.RELEASE/webauthn4j-test-0.28.6.RELEASE.jar",
"name": "webauthn4j-test 0.28.6.RELEASE",
"src": "https://repo1.maven.org/maven2/com/webauthn4j/webauthn4j-test/0.28.6.RELEASE/webauthn4j-test-0.28.6.RELEASE-sources.jar"
"jar": "https://repo1.maven.org/maven2/com/webauthn4j/webauthn4j-util/0.28.6.RELEASE/webauthn4j-util-0.28.6.RELEASE.jar",
"name": "webauthn4j-util 0.28.6.RELEASE",
"src": "https://repo1.maven.org/maven2/com/webauthn4j/webauthn4j-util/0.28.6.RELEASE/webauthn4j-util-0.28.6.RELEASE-sources.jar"
}
]
}
Binary file renamed jar/core-10.1.0.jar → jar/core-10.1.3.jar
Binary file not shown.
Loading