merging base

Author: tamassoltesz

.circleci/Dockerfile-ubuntu22

@@ -0,0 +1,79 @@
+FROM ubuntu:22.04
+
+RUN apt-get update && apt-get upgrade -y
+
+RUN apt-get install build-essential -y
+
+RUN apt-get install -y git-core
+
+RUN apt-get install -y wget
+
+# Install OpenJDK 12
+RUN wget https://download.java.net/java/GA/jdk12.0.2/e482c34c86bd4bf8b56c0b35558996b9/10/GPL/openjdk-12.0.2_linux-x64_bin.tar.gz
+
+RUN mkdir /usr/java
+
+RUN mv openjdk-12.0.2_linux-x64_bin.tar.gz /usr/java
+
+RUN cd /usr/java && tar -xzvf openjdk-12.0.2_linux-x64_bin.tar.gz
+
+RUN echo 'JAVA_HOME=/usr/java/jdk-12.0.2' >> /etc/profile
+RUN echo 'PATH=$PATH:$HOME/bin:$JAVA_HOME/bin' >> /etc/profile
+
+RUN apt-get install jq -y
+
+RUN apt-get install curl -y
+
+RUN apt-get install unzip -y
+
+ADD ./runPostgreSQL.sh /runPostgreSQL.sh
+
+RUN chmod +x /runPostgreSQL.sh
+
+# Install OpenJDK 15.0.1
+RUN wget https://download.java.net/java/GA/jdk15.0.1/51f4f36ad4ef43e39d0dfdbaf6549e32/9/GPL/openjdk-15.0.1_linux-x64_bin.tar.gz
+
+RUN mv openjdk-15.0.1_linux-x64_bin.tar.gz /usr/java
+
+RUN cd /usr/java && tar -xzvf openjdk-15.0.1_linux-x64_bin.tar.gz
+
+RUN echo 'JAVA_HOME=/usr/java/jdk-15.0.1' >> /etc/profile
+RUN echo 'PATH=$PATH:$HOME/bin:$JAVA_HOME/bin' >> /etc/profile
+RUN echo 'export JAVA_HOME' >> /etc/profile
+RUN echo 'export JRE_HOME' >> /etc/profile
+RUN echo 'export PATH' >> /etc/profile
+
+RUN update-alternatives --install "/usr/bin/java" "java" "/usr/java/jdk-12.0.2/bin/java" 1
+RUN update-alternatives --install "/usr/bin/javac" "javac" "/usr/java/jdk-12.0.2/bin/javac" 1
+
+#install postgres 13
+# Import Repository Signing Key
+RUN wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
+RUN DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get -y install tzdata
+RUN apt install curl gpg gnupg2 software-properties-common apt-transport-https lsb-release ca-certificates sudo -y
+# Add PostgreSQL repository
+RUN echo "deb http://apt.postgresql.org/pub/repos/apt/ `lsb_release -cs`-pgdg main" | tee  /etc/apt/sources.list.d/pgdg.list
+# Update again
+RUN apt update
+# Install PostgreSQL 13
+RUN apt install -y postgresql-13
+#  Verify PostgreSQL 13 Installation on Ubuntu 22.04|20.04|18.04
+RUN psql --version
+
+USER postgres
+
+RUN service postgresql start && psql --command "CREATE USER root WITH SUPERUSER PASSWORD 'root';" \
+    && createdb -O root root \
+    && createdb -O root supertokens
+
+USER root
+
+RUN echo "host all  all    0.0.0.0/0  md5" >> /etc/postgresql/13/main/pg_hba.conf
+
+
+RUN echo "listen_addresses='*'" >> /etc/postgresql/13/main/postgresql.conf
+
+
+RUN mkdir -p /var/run/postgresql && chown -R postgres /var/run/postgresql
+
+VOLUME  ["/etc/postgresql", "/var/log/postgresql", "/var/lib/postgresql"]

.circleci/config.yml

@@ -4,7 +4,7 @@ orbs:
 jobs:
   test:
     docker:
-      - image: rishabhpoddar/supertokens_postgresql_plugin_test
+      - image: tamassupertokens/supertokens_postgresql_plugin_test
       - image: rishabhpoddar/oauth-server-cicd
     resource_class: large
     steps:
@@ -15,7 +15,7 @@ jobs:
       - run:
           name: update postgresql max_connections
           command: |
-            sed -i 's/^#*\s*max_connections\s*=.*/max_connections = 10000/' /etc/postgresql/9.5/main/postgresql.conf
+            sed -i 's/^#*\s*max_connections\s*=.*/max_connections = 10000/' /etc/postgresql/13/main/postgresql.conf
       - run:
           name: starting postgresql
           command: |
@@ -80,7 +80,7 @@ jobs:
       - slack/status
   test-onemillionusers:
     docker:
-      - image: rishabhpoddar/supertokens_postgresql_plugin_test
+      - image: tamassupertokens/supertokens_postgresql_plugin_test
     resource_class: large
     steps:
       - add_ssh_keys:
@@ -90,7 +90,7 @@ jobs:
       - run:
           name: update postgresql max_connections
           command: |
-            sed -i 's/^#*\s*max_connections\s*=.*/max_connections = 10000/' /etc/postgresql/9.5/main/postgresql.conf
+            sed -i 's/^#*\s*max_connections\s*=.*/max_connections = 10000/' /etc/postgresql/13/main/postgresql.conf
       - run:
           name: starting postgresql
           command: |
@@ -155,7 +155,7 @@ jobs:
       - slack/status
   mark-passed:
     docker:
-      - image: rishabhpoddar/supertokens_postgresql_plugin_test
+      - image: tamassupertokens/supertokens_postgresql_plugin_test
     steps:
       - checkout
       - run: (cd .circleci && ./markPassed.sh)
@@ -172,15 +172,15 @@ workflows:
             tags:
               only: /dev-v[0-9]+(\.[0-9]+)*/
             branches:
-              ignore: /.*/
+              only: /test-cicd\/.*/
       - test-onemillionusers:
           context:
             - slack-notification
           filters:
             tags:
               only: /dev-v[0-9]+(\.[0-9]+)*/
             branches:
-              ignore: /.*/
+              only: /test-cicd\/.*/
       - mark-passed:
           context:
             - slack-notification

.circleci/doTests.sh

@@ -102,6 +102,10 @@ do
     pluginY=$(cut -d'.' -f2 <<<"$pluginVersion")
     echo -e "core,$coreVersionX2\nplugin-interface,$piVersion\npostgresql-plugin,$pluginX.$pluginY" > modules.txt
     ./loadModules
+
+    #gradle properties overrides
+    export _JAVA_OPTIONS="-Xms1g -Xmx4g"
+
     cd supertokens-core
     git checkout $coreVersionTag
     cd ../supertokens-plugin-interface

CHANGELOG.md

@@ -7,6 +7,60 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+## [8.0.2]
+
+- Fixes `NullPointerException` in user search API
+
+## [8.0.1]
+
+- Fixes slow queries for account linking
+
+### Migration
+
+```sql
+CREATE INDEX IF NOT EXISTS emailpassword_users_email_index ON emailpassword_users (app_id, email);
+CREATE INDEX IF NOT EXISTS emailpassword_user_to_tenant_email_index ON emailpassword_user_to_tenant (app_id, tenant_id, email);
+
+CREATE INDEX IF NOT EXISTS passwordless_users_email_index ON passwordless_users (app_id, email);
+CREATE INDEX IF NOT EXISTS passwordless_users_phone_number_index ON passwordless_users (app_id, phone_number);
+CREATE INDEX IF NOT EXISTS passwordless_user_to_tenant_email_index ON passwordless_user_to_tenant (app_id, tenant_id, email);
+CREATE INDEX IF NOT EXISTS passwordless_user_to_tenant_phone_number_index ON passwordless_user_to_tenant (app_id, tenant_id, phone_number);
+
+CREATE INDEX IF NOT EXISTS thirdparty_user_to_tenant_third_party_user_id_index ON thirdparty_user_to_tenant (app_id, tenant_id, third_party_id, third_party_user_id);
+```
+
+## [8.0.0]
+
+- Adds tables and queries for Bulk Import
+- Optimize getUserIdMappingWithEitherSuperTokensUserIdOrExternalUserId query
+- Adds indexing for `session_info` table on `user_id, app_id` columns
+
+### Migration
+
+```sql
+"CREATE TABLE IF NOT EXISTS bulk_import_users (
+                id CHAR(36),
+                app_id VARCHAR(64) NOT NULL DEFAULT 'public',
+                primary_user_id VARCHAR(36),
+                raw_data TEXT NOT NULL,
+                status VARCHAR(128) DEFAULT 'NEW',
+                error_msg TEXT,
+                created_at BIGINT NOT NULL, 
+                updated_at BIGINT NOT NULL, 
+                CONSTRAINT bulk_import_users_pkey PRIMARY KEY(app_id, id),
+                CONSTRAINT bulk_import_users__app_id_fkey FOREIGN KEY(app_id) REFERENCES apps(app_id) ON DELETE CASCADE
+);
+
+CREATE INDEX IF NOT EXISTS bulk_import_users_status_updated_at_index ON bulk_import_users (app_id, status, updated_at);
+
+CREATE INDEX IF NOT EXISTS bulk_import_users_pagination_index1 ON bulk_import_users (app_id, status, created_at DESC,
+ id DESC);
+ 
+CREATE INDEX IF NOT EXISTS bulk_import_users_pagination_index2 ON bulk_import_users (app_id, created_at DESC, id DESC);
+
+CREATE INDEX IF NOT EXISTS session_info_user_id_app_id_index ON session_info (user_id, app_id);
+```
+
 ## [7.2.0] - 2024-10-03
 
 - Compatible with plugin interface version 6.3

build.gradle

@@ -2,7 +2,7 @@ plugins {
     id 'java-library'
 }
 
-version = "7.2.0"
+version = "8.0.2"
 
 repositories {
     mavenCentral()

jar/postgresql-plugin-7.2.0.jar

@@ -1,6 +1,6 @@
 {
   "_comment": "contains a list of plugin interfaces branch names that this core supports",
   "versions": [
-    "6.3"
+    "7.0"
   ]
-}
+}