feat: add backwards compatibility

supertokens · Sep 5, 2023 · 4ca4e14 · 4ca4e14
1 parent 1c388be
commit 4ca4e14
Show file tree

Hide file tree

Showing 34 changed files with 243 additions and 66 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,13 +11,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Breaking changes
 
--   Only supporting FDI 1.18
+-   Added support for FDI 1.18
 -   User type has changed across recipes and functions: recipe specific user types have been removed and replaced by a generic one that contains more information
 -   `createdNewUser` has been renamed to `createdNewRecipeUser`
 -   `createCode`, `consumeCode`, `createPasswordlessCode` and `consumePasswordlessCode` can now return status: `SIGN_IN_UP_NOT_ALLOWED`
 -   `signInAndUp` and `thirdPartySignInAndUp` can now return new statuses: `EMAIL_ALREADY_USED_IN_ANOTHER_ACCOUNT`, `SIGN_IN_UP_NOT_ALLOWED`
 -   `sendPasswordResetEmail` can now return `status: "PASSWORD_RESET_NOT_ALLOWED"`
--   `submitNewPassword` includes `user` and `email` in the `status: "OK"` response
 
 ## [0.7.3] - 2023-08-21
 

diff --git a/bundle/emailpassword.js b/bundle/emailpassword.js
diff --git a/bundle/emailverification.js b/bundle/emailverification.js
diff --git a/bundle/multitenancy.js b/bundle/multitenancy.js
diff --git a/bundle/passwordless.js b/bundle/passwordless.js
diff --git a/bundle/session.js b/bundle/session.js
diff --git a/bundle/supertokens.js b/bundle/supertokens.js
diff --git a/bundle/thirdparty.js b/bundle/thirdparty.js
diff --git a/bundle/thirdpartyemailpassword.js b/bundle/thirdpartyemailpassword.js
diff --git a/bundle/thirdpartypasswordless.js b/bundle/thirdpartypasswordless.js
diff --git a/bundle/userroles.js b/bundle/userroles.js
diff --git a/frontendDriverInterfaceSupported.json b/frontendDriverInterfaceSupported.json
@@ -1,4 +1,4 @@
 {
     "_comment": "contains a list of frontend-backend interface versions that this package supports",
-    "versions": ["1.18"]
+    "versions": ["1.17", "1.18"]
 }
diff --git a/lib/build/recipe/emailpassword/index.d.ts b/lib/build/recipe/emailpassword/index.d.ts
diff --git a/lib/build/recipe/emailpassword/recipeImplementation.js b/lib/build/recipe/emailpassword/recipeImplementation.js
diff --git a/lib/build/recipe/emailpassword/types.d.ts b/lib/build/recipe/emailpassword/types.d.ts
diff --git a/lib/build/recipe/passwordless/recipeImplementation.js b/lib/build/recipe/passwordless/recipeImplementation.js
diff --git a/lib/build/recipe/thirdparty/recipeImplementation.js b/lib/build/recipe/thirdparty/recipeImplementation.js
diff --git a/lib/build/recipe/thirdpartyemailpassword/index.d.ts b/lib/build/recipe/thirdpartyemailpassword/index.d.ts
diff --git a/lib/build/recipe/thirdpartyemailpassword/types.d.ts b/lib/build/recipe/thirdpartyemailpassword/types.d.ts
diff --git a/lib/build/types.d.ts b/lib/build/types.d.ts
diff --git a/lib/build/utils.d.ts b/lib/build/utils.d.ts
diff --git a/lib/build/utils.js b/lib/build/utils.js
diff --git a/lib/build/version.js b/lib/build/version.js
diff --git a/lib/ts/recipe/emailpassword/index.ts b/lib/ts/recipe/emailpassword/index.ts
@@ -56,8 +56,6 @@ export default class RecipeWrapper {
     }): Promise<
         | {
               status: "OK";
-              user: User;
-              email: string;
               fetchResponse: Response;
           }
         | {

diff --git a/lib/ts/recipe/emailpassword/recipeImplementation.ts b/lib/ts/recipe/emailpassword/recipeImplementation.ts
@@ -15,7 +15,7 @@
 import Querier from "../../querier";
 import Multitenancy from "../multitenancy/recipe";
 import { PreAndPostAPIHookAction, RecipeInterface } from "./types";
-import { getQueryParams } from "../../utils";
+import { getQueryParams, normaliseUser } from "../../utils";
 import { RecipeFunctionOptions, RecipeImplementationInput } from "../recipeModule/types";
 import { User } from "../../types";
 
@@ -39,8 +39,6 @@ export default function getRecipeImplementation(
         }): Promise<
             | {
                   status: "OK";
-                  user: User;
-                  email: string;
                   fetchResponse: Response;
               }
             | {
@@ -64,8 +62,6 @@ export default function getRecipeImplementation(
             const { jsonBody, fetchResponse } = await querier.post<
                 | {
                       status: "OK";
-                      user: User;
-                      email: string;
                   }
                 | {
                       status: "RESET_PASSWORD_INVALID_TOKEN_ERROR";
@@ -109,9 +105,7 @@ export default function getRecipeImplementation(
                 };
             }
             return {
-                status: jsonBody.status,
-                user: jsonBody.user,
-                email: jsonBody.email,
+                ...jsonBody,
                 fetchResponse,
             };
         },
@@ -265,7 +259,7 @@ export default function getRecipeImplementation(
 
             return {
                 status: jsonBody.status,
-                user: jsonBody.user,
+                user: normaliseUser("emailpassword", jsonBody.user),
                 fetchResponse,
             };
         },
@@ -349,7 +343,7 @@ export default function getRecipeImplementation(
 
             return {
                 status: "OK",
-                user: jsonBody.user,
+                user: normaliseUser("emailpassword", jsonBody.user),
                 fetchResponse,
             };
         },

diff --git a/lib/ts/recipe/emailpassword/types.ts b/lib/ts/recipe/emailpassword/types.ts
@@ -87,8 +87,6 @@ export type RecipeInterface = {
     }) => Promise<
         | {
               status: "OK";
-              user: User;
-              email: string;
               fetchResponse: Response;
           }
         | {

diff --git a/lib/ts/recipe/passwordless/recipeImplementation.ts b/lib/ts/recipe/passwordless/recipeImplementation.ts
@@ -15,7 +15,7 @@
 
 import { WindowHandlerReference } from "../../windowHandler";
 import Querier from "../../querier";
-import { getHashFromLocation, getQueryParams } from "../../utils";
+import { getHashFromLocation, getQueryParams, normaliseUserResponse } from "../../utils";
 import Multitenancy from "../multitenancy/recipe";
 import { RecipeFunctionOptions, RecipeImplementationInput } from "../recipeModule/types";
 import { PASSWORDLESS_LOGIN_ATTEMPT_INFO_STORAGE_KEY } from "./constants";
@@ -206,8 +206,16 @@ export default function getRecipeImplementation(
                 })
             );
 
+            if (jsonBody.status !== "OK") {
+                return {
+                    ...jsonBody,
+                    fetchResponse,
+                };
+            }
+
             return {
-                ...jsonBody,
+                status: "OK",
+                ...normaliseUserResponse("passwordless", jsonBody),
                 fetchResponse,
             };
         },