Code

feat: Introduce MFA recipe#651

Code

Merged

rishabhpoddar merged 245 commits into9.0supertokens/supertokens-core:9.0from feat/mfasupertokens/supertokens-core:feat/mfaCopy head branch name to clipboardMar 13, 2024

+7,804-1,003

Commits

Commits on Jan 13, 2023

• adds connection uri and tenant id based resource distributor

  rishabhpoddar

  committed
  ed729ef

• removes unnecessary file

  rishabhpoddar

  committed
  10afc48

• adds a bunch of todos

  rishabhpoddar

  committed
  65012d9

Commits on Jan 16, 2023

• adds storage layer function and also laod all configs function

  rishabhpoddar

  committed
  737563e

• implements core config merging across tenants

  rishabhpoddar

  committed
  19aade1

Commits on Jan 19, 2023

• restructures code related to config checking in core

  rishabhpoddar

  committed
  7ed1b8c

• changes storage layer to take json instead of config file path

  rishabhpoddar

  committed
  5723ba1

• small refactor

  rishabhpoddar

  committed
  3ef6397

• adds ability to create new storage instances on the fly

  rishabhpoddar

  committed
  650cffe

• in mem db function impl for user pool ID and config conflict checking

  rishabhpoddar

  committed
  1af722e

• small change

  rishabhpoddar

  committed
  b552ff8

Commits on Jan 20, 2023

• adds checks for conflicting core configs

  rishabhpoddar

  committed
  67382e5

Commits on Jan 21, 2023

• adds a few tests for multi tenant config

  rishabhpoddar

  committed
  76d7492

Commits on Jan 23, 2023

• adds more tests

  rishabhpoddar

  committed
  2ac6616

• more tests

  rishabhpoddar

  committed
  1b0d182

• adds function to get connection pool ID

  rishabhpoddar

  committed
  ba2923b

• adds skeleton for loading storage layers for tenants

  rishabhpoddar

  committed
  40ad561

• fixes compile error

  rishabhpoddar

  committed
  cb6e6d8

• adds code to load multiple storage layers as well

  rishabhpoddar

  committed
  579056b

Commits on Jan 24, 2023

• deletes info across all tenants during testing

  rishabhpoddar

  committed
  7c37142

• adds one test for storage layer

  rishabhpoddar

  committed
  392a8b0

• fixes a test

  rishabhpoddar

  committed
  1f35011

• fixes bug in setting resource in resource distributor

  rishabhpoddar

  committed
  079ed01

• fixes bugs

  rishabhpoddar

  committed
  c69ca66

Commits on Jan 27, 2023

• loads signing keys for all tenants

  rishabhpoddar

  committed
  5c2000d

Commits on Jan 28, 2023

• fixes bug

  rishabhpoddar

  committed
  0fcaf35

• adds new test and modifies the testing kill process to clear databases across mulitple user pools

  rishabhpoddar

  committed
  980f6c3

Commits on Jan 29, 2023

• implements more test

  rishabhpoddar

  committed
  2280002

• small change to formatting

  rishabhpoddar

  committed
  3cc9229

• small change to formatting

  rishabhpoddar

  committed
  a0ffc14

Commits on Jan 30, 2023

• modifies cron jobs to run per unique user pool ID

  rishabhpoddar

  committed
  f486e87

• fixes a few bugs

  rishabhpoddar

  committed
  04da733

• disallows different argon2 pool size across tenants

  rishabhpoddar

  committed
  e25e77b

• changes server api key check to be based on connection uri as well

  rishabhpoddar

  committed
  880efa6

• adds function for getTenantId

  rishabhpoddar

  committed
  c5fd6af

• modfies delete user API as well

  rishabhpoddar

  committed
  3473ca1

• makes tests compile

  rishabhpoddar

  committed
  a21a797

Commits on Jan 31, 2023

• marked getStorageLayer older version as testonly

  rishabhpoddar

  committed
  60183b1

• fixes a few tests

  rishabhpoddar

  committed
  7cc2b2a

• removes unused storage layer when loading them for all tenants

  rishabhpoddar

  committed
  cca497b

• makes storagelayer.getAuthRecipeStorage testonly

  rishabhpoddar

  committed
  22e0558

• makes storagelayer.getSession testonly

  rishabhpoddar

  committed
  4b22901

• makes storagelayer.getEmailPasswordStorage testonly

  rishabhpoddar

  committed
  8c2b129

• makes storagelayer.getEmailVerificationStorage testonly

  rishabhpoddar

  committed
  0d09a2f

Commits on Feb 1, 2023

• makes storagelayer.getThirdPartyStorage testonly

  rishabhpoddar

  committed
  a9e64cd

• makes storagelayer.getPasswordlessStorage testonly

  rishabhpoddar

  committed
  cad8f0e

• more updates to storage layer functions and reciope

  rishabhpoddar

  committed
  b3b985f

• completes all storage layer function changes

  rishabhpoddar

  committed
  d0254c3

• makes Config.getConfig testonly

  rishabhpoddar

  committed
  a13bc0f

Commits on Feb 2, 2023

• implements custom routing class for api requests

  rishabhpoddar

  committed
  be3c07d

• fixes a few bugs

  rishabhpoddar

  committed
  5f9386c

• adds test cases

  rishabhpoddar

  committed
  00b6623

• adds tenant not found logic

  rishabhpoddar

  committed
  5a3af02

• adds new exception

  rishabhpoddar

  committed
  d59f2ce

Commits on Feb 3, 2023

• fixes all tests

  rishabhpoddar

  committed
  f5ef883

• removes unnecessary exception catching

  rishabhpoddar

  committed
  3ed429e

• fixes bug

  rishabhpoddar

  committed
  72d0c6a

• adds test for path router

  rishabhpoddar

  committed
  d6ce9c9

• adds more tests

  rishabhpoddar

  committed
  37d3545

Commits on Feb 4, 2023

• adds more tests

  rishabhpoddar

  committed
  07a6872

• adds more tests

  rishabhpoddar

  committed
  b6a9a5f

Commits on Feb 5, 2023

• changes defaulttenantid to public

  rishabhpoddar

  committed
  2f84fa7

• adds appId as a identifier for a unique tenant

  rishabhpoddar

  committed
  10e8bf3

Commits on Feb 6, 2023

• adds extracting appId from request path

  rishabhpoddar

  committed
  fcb6f46

• small change

  rishabhpoddar

  committed
  5dd7758

• fixes bug with extarcting tenantid with appid

  rishabhpoddar

  committed
  bece81e

• fixes bug

  rishabhpoddar

  committed
  0478a11

• adds more tests

  rishabhpoddar

  committed
  3998dc5

• starts working on multitenancy class and utils functions

  rishabhpoddar

  committed
  008bb05

• more changes to multitenancy file

  rishabhpoddar

  committed
  9aa00ea

• fixes a bug

  rishabhpoddar

  committed
  5e7fb35

• small change

  rishabhpoddar

  committed
  6c694d8

Commits on Feb 7, 2023

• ads crud functions for multi tenancy

  rishabhpoddar

  committed
  d0de2ab

• changes to use of quiteprogramexception from in mem db

  rishabhpoddar

  committed
  65d281f

• adds skeleton for multitenancy functions in in mem db

  rishabhpoddar

  committed
  7a0a463

• adds a few todos

  rishabhpoddar

  committed
  5b42380

• small change

  rishabhpoddar

  committed
  d649a35

Commits on Feb 8, 2023

• small change

  rishabhpoddar

  committed
  16cde70

• adds more functions to multi tenancy impl

  rishabhpoddar

  committed
  393eb73

Commits on Feb 9, 2023

• adds multi tenancy functions to delete and get info

  rishabhpoddar

  committed
  39c6f9a

• fixes tests

  rishabhpoddar

  committed
  24409dc

• adds a few exception cases

  rishabhpoddar

  committed
  2e4e778

• updates exception import

  rishabhpoddar

  committed
  420bc89

• small change to make debugging easier

  rishabhpoddar

  committed
  fc8e0bd

• fixes logging related issue in test

  rishabhpoddar

  committed
  de0857f

Commits on Feb 10, 2023

• checks for permission when creating a new app

  rishabhpoddar

  committed
  2cbf3d3

• simplifies delete of app and connectionuridomain

  rishabhpoddar

  committed
  e6971e8

• adds sync to respirce distributor

  rishabhpoddar

  committed
  8b7c1d9

• small change

  rishabhpoddar

  committed
  6d44933

Commits on Feb 11, 2023

• small changes

  rishabhpoddar

  committed
  5e71bcc

• checks if multi tenancy is enabled in license key during tenant creation

  rishabhpoddar

  committed
  4e68a65

• adds FeatureNotEnabledException exception

  rishabhpoddar

  committed
  17b673d

Commits on Feb 12, 2023

• small refactor

  rishabhpoddar

  committed
  075c3ea

• fixes deadlock condition

  rishabhpoddar

  committed
  ca9e05d

• fixes in memory db issue

  rishabhpoddar

  committed
  2d9c45c

• does deep equals in tenant refresh function

  rishabhpoddar

  committed
  51d8935

• small change

  rishabhpoddar

  committed
  db79ae4

Commits on Feb 13, 2023

• adds more checks when adding or updating a tenant

  rishabhpoddar

  committed
  a3506d6

• adds tenantIdentifier for emailpassword and useridmapping recipes

  rishabhpoddar

  committed
  70f813b

• enforces unique user pool id per connectionuridomain

  rishabhpoddar

  committed
  dc8ce7b

• small bug fix for refreshing cronjobs

  rishabhpoddar

  committed
  2fa639a

• makes cronjob run per user pool, but pass list of tenants within that pool to the doTask function

  rishabhpoddar

  committed
  0f0a056

Commits on Feb 14, 2023

• changes to incorporate tenantIndetifier for key value storage

  rishabhpoddar

  committed
  6b7c101

• changes to session receipe to add tenantIdentifier

  rishabhpoddar

  committed
  40aa1cd

Commits on Feb 15, 2023

• adds a todo

  rishabhpoddar

  committed
  9c8df63

• introduces the concept of appIdentifier vs tenantIdentifier

  rishabhpoddar

  committed
  4e67acd

• fixes test compilation issues

  rishabhpoddar

  committed
  9884599

• fixes bugs from existing tests

  rishabhpoddar

  committed
  75b8368

• adds appidentifier to user metadata functions

  rishabhpoddar

  committed
  9647521

• modifes user roles functions to add tenantidentifier and appidentifiers

  rishabhpoddar

  committed
  b2ceb7b

• small refactor

  rishabhpoddar

  committed
  2fa1545

Commits on Feb 16, 2023

• modifies session recipe to add tenantId as part of the access token and refresh token

  rishabhpoddar

  committed
  dd28dd2

• small change

  rishabhpoddar

  committed
  809bbec

• fixes a bug

  rishabhpoddar

  committed
  5da2469

• modifies emailpassword functions

  rishabhpoddar

  committed
  99cfe56

Commits on Feb 17, 2023

• changes to a few functions

  rishabhpoddar

  committed
  408a23b

• adds appidentifier to email verfication

  rishabhpoddar

  committed
  fb49caf

• adds tenant identifier to third party

  rishabhpoddar

  committed
  50a7588

• adds tenantidentifier to passwordless

  rishabhpoddar

  committed
  d30c7a7

Commits on Feb 18, 2023

• changes how tenant configs are checked

  rishabhpoddar

  committed
  0a25a6f

• fixes tests

  rishabhpoddar

  committed
  15878a2

Commits on Feb 19, 2023

• Merge branch '4.3' into multi-tenant-config

  rishabhpoddar

  authored
  2f9bf4c

Commits on Feb 20, 2023

• small bug fixes

  rishabhpoddar

  committed
  06af9d1

Commits on Feb 24, 2023

• fix: config tests (#568)

  Show description for cd15057
  sattvikc

  authored
  cd15057

Commits on Mar 3, 2023

• fix: new exceptions and tests (#573)

  Show description for 998845b
  sattvikc

  authored
  998845b

Commits on Mar 5, 2023

• merges with latest

  rishabhpoddar

  committed
  0fce90f

Commits on Mar 9, 2023

• merges with latest

  rishabhpoddar

  committed
  191eec3

Commits on Mar 18, 2023

• Merge branch '4.4' into multi-tenant-config

  rishabhpoddar

  committed
  4b83b04

• makes telemetry and feature flag multi tenant as well - per app

  rishabhpoddar

  committed
  8ab4dbe

Commits on Mar 19, 2023

• refactors crontask to be better suited for multi tenancy

  rishabhpoddar

  committed
  e0e89cc

Commits on Mar 27, 2023

• fix: Email password and user id mapping multi tenancy changes (#580)

  Show description for ac90e8d
  sattvikc

  authored
  ac90e8d

• fixes test

  rishabhpoddar

  committed
  209075b

Commits on Mar 28, 2023

• fix: Multitenant userroles (#600)

  Show description for 9995ce0
  sattvikc

  authored
  9995ce0

Commits on Mar 29, 2023

• fix: Multitenant usermetadata (#605)

  Show description for 4f1018d
  sattvikc

  authored
  4f1018d

• fix: emailpassword storage (#607)

  sattvikc

  authored
  28d139b

• fix: uid mapping storage (#608)

  sattvikc

  authored
  477617c

• fix: multitenant ep tests (#609)

  sattvikc

  authored
  92ae0eb

Commits on Mar 30, 2023

• fix: Multitenant user id mapping tests (#611)

  Show description for 75e35bd
  sattvikc

  authored
  75e35bd

Commits on Mar 31, 2023

• fix: Multitenant API, storage and tests (#614)

  Show description for 2e936a7
  sattvikc

  authored
  2e936a7

Commits on Apr 3, 2023

• fix: Multitenant thirdparty API, storage and tests (#616)

  Show description for 0b200e8
  sattvikc

  authored
  0b200e8

• fix: Multitenant emailverification (#618)

  Show description for b435ae7
  sattvikc

  authored
  b435ae7

Commits on Apr 5, 2023

• fix: Multitenant session (#619)

  Show description for 05e052e
  sattvikc

  authored
  05e052e

• merges with latest (#622)

  Show description for faa751e
  

  rishabhpoddar

  and

  sattvikc

  authored
  faa751e

Commits on Apr 6, 2023

• several fixes

  rishabhpoddar

  committed
  6ae2c09

• fix: Multitenant jwt (#629)

  Show description for 7e9b5db
  sattvikc

  authored
  7e9b5db

Commits on Apr 10, 2023

• fix: Multitenant Auth Recipe (#633)

  Show description for 2351148
  sattvikc

  authored
  2351148

• fix: Multitenant dashboard (#636)

  Show description for 3c2f6aa
  sattvikc

  authored
  3c2f6aa

Commits on Apr 11, 2023

• fix: Multitenant totp (#637)

  Show description for 16938d4
  sattvikc

  authored
  16938d4

Commits on Apr 13, 2023

• merges (#638)

  rishabhpoddar

  authored
  e618b57

Commits on Apr 18, 2023

• adds new config (#639)

  rishabhpoddar

  authored
  2893edc

• makes test more reliable

  rishabhpoddar

  committed
  fb9d2e0

• removes unnecessary deprecated annotation (#640)

  rishabhpoddar

  authored
  6637bac

Commits on Apr 24, 2023

• fix: multitenancy changes (#641)

  Show description for 680f8bb
  sattvikc

  authored
  680f8bb

• fix: Misc changes (#645)

  Show description for 56654d0
  sattvikc

  authored
  56654d0

Commits on Apr 25, 2023

• fix: Tenantid logging (#646)

  Show description for 4b1b040
  sattvikc

  authored
  4b1b040

• fix: Rate limiting hello (#647)

  Show description for 04eaf12
  sattvikc

  authored
  04eaf12

Commits on Apr 26, 2023

• fix: multitenancy stats (#649)

  Show description for a9ef7cd
  sattvikc

  authored
  a9ef7cd

Commits on Apr 27, 2023

• fix: Tenantid in userobjects (#650)

  Show description for 8343f62
  sattvikc

  authored
  8343f62

• feat: Introduce MFA recipe

  KShivendu

  committed
  968f3d0

Commits on Apr 28, 2023

• fix: Ip filter per tenant (#652)

  Show description for 88fa059
  sattvikc

  authored
  88fa059

• fix: updated console log (#653)

  sattvikc

  authored
  d61b9d6

• fix: API key per app (#654)

  sattvikc

  authored
  3e51187

• feat: Add EE feature for MFA functions

  KShivendu

  committed
  87561c9

• fix: Fix didExist of factor disable API

  KShivendu

  committed
  af71e6e

• fix: Startup log (#655)

  Show description for 5dde394
  sattvikc

  authored
  5dde394

Commits on May 1, 2023

• fix: License tests (#656)

  Show description for f4aa012
  sattvikc

  authored
  f4aa012

• test: Config normalisation test (#658)

  Show description for 5892703
  sattvikc

  authored
  5892703

Commits on May 3, 2023

• feat: Suggested changes along with tests

  KShivendu

  committed
  805f78f

Commits on May 4, 2023

• fix: delete non auth user in deleteUserIdFromTenantId (#659)

  Show description for ff08fbb
  sattvikc

  authored
  ff08fbb

• fix: thirdparty related tests (#661)

  Show description for 857d8bb
  sattvikc

  authored
  857d8bb

• feat: Add MFA EE features and user id mapping related tests

  KShivendu

  committed
  ce1b6ad

• fix: Remove irrelevant multitenancy change

  KShivendu

  committed
  b27d3d7

• fix: Config validation (#662)

  Show description for 44f8cd2
  sattvikc

  authored
  44f8cd2

Commits on May 5, 2023

• fix: config per tenant, per app annotations and validation (#666)

  sattvikc

  authored
  8681f4b

• fix: pagination test (#667)

  sattvikc

  authored
  e603db2

Commits on May 8, 2023

• fix: added version check for multitenant apis (#669)

  Show description for 533a4e1
  sattvikc

  authored
  533a4e1

• fix: clean up init keys (#670)

  Show description for bd49eb0
  sattvikc

  authored
  bd49eb0

Commits on May 9, 2023

• fix: removed isTesting check in prod code (#671)

  sattvikc

  authored
  8ef3d69

• Merge branch 'multi-tenant-config' into feat/mfa

  KShivendu

  committed
  09ba912

• fix: Suggested changes

  KShivendu

  committed
  fe17f1c

Commits on May 10, 2023

• test: Improve MFA delete user test

  KShivendu

  committed
  8dc54da

• test: Fix all tests and inherit from MFaTestBase

  KShivendu

  committed
  73f5391

• feat: Add function to delete user from a tenant and test it

  KShivendu

  committed
  4daef01

Commits on May 12, 2023

• fix: resource reloading (#673)

  Show description for 21dafb1
  sattvikc

  authored
  21dafb1

Commits on May 15, 2023

• fix: fixed missing log (#678)

  Show description for 43e0847
  sattvikc

  authored
  43e0847

• Overload deleteMfaInfoForUser and set factor column size to 64

  KShivendu

  committed
  db50dd1

Commits on May 16, 2023

• Merge branch '5.0' into multi-tenant-config

  sattvikc

  committed
  5dbf1d2

• fix: merge issues (#680)

  sattvikc

  authored
  e22efee

Commits on May 22, 2023

• fix: session v4 (#683)

  Show description for a01f0f0
  sattvikc

  authored
  a01f0f0

Commits on May 23, 2023

• fix: Postgres migration (#685)

  Show description for 83ea154
  sattvikc

  authored
  83ea154

Commits on May 25, 2023

• fix: fixed tests for active user storage (#686)

  sattvikc

  authored
  dcf11c2

Commits on May 26, 2023

• Merge branch 'multi-tenant-config' into feat/mfa

  KShivendu

  authored
  0bfc5af

Commits on Jun 26, 2023

• Merge branch 'master' into feat/mfa

  KShivendu

  committed
  3092003

• refactor: Remove irrelevant changes from merge conflict

  KShivendu

  committed
  a55de25

• chores: Mention new MFA recipe in CHANGELOG

  KShivendu

  committed
  2a7afe7

• chores: Bring back ActiveUsers function implementation

  KShivendu

  committed
  9431aea

Commits on Sep 27, 2023

• Merge branch 'master' into feat/mfa

  KShivendu

  committed
  7f0b78d

Commits on Sep 28, 2023

• Merge branch '7.0' into merge-7.0

  sattvikc

  committed
  9cd4ef2

• Merge pull request #824 from supertokens/merge-7.0

  Show description for d54d88c
  sattvikc

  authored
  d54d88c

• fix: tests

  sattvikc

  committed
  49b6a51

• refactor: Replace TOTP_NOT_ENABLED_ERROR status and make deviceName optional (#729)

  Show description for 0387df7
  

  KShivendu

  and

  sattvikc

  authored
  0387df7

Commits on Sep 29, 2023

• fix: tests

  sattvikc

  committed
  bbd412b

• fix: mfa and totp queries

  sattvikc

  committed
  dd56d93

Commits on Oct 3, 2023

• fix: flaky tests

  sattvikc

  committed
  6edab81

• Merge pull request #826 from supertokens/misc-fixes

  Show description for 8b17c95
  sattvikc

  authored
  8b17c95

Commits on Oct 17, 2023

• fix: mfa cleanup (#837)

  Show description for 971e21d
  sattvikc

  authored
  971e21d

Commits on Oct 19, 2023

• Merge branch '7.0' into merge-latest

  sattvikc

  committed
  e057f48

• Merge pull request #862 from supertokens/merge-latest

  Show description for e7725f5
  sattvikc

  authored
  e7725f5

Commits on Oct 27, 2023

• Mfa multitenancy (#841)

  Show description for da5dfa2
  sattvikc

  authored
  da5dfa2

• Mfa accountlinking (#867)

  Show description for 440980b
  sattvikc

  authored
  440980b

• Mfa firstfactor in sign in or up (#868)

  Show description for 7ca13a6
  sattvikc

  authored
  7ca13a6

• fix: import totp device API (#869)

  Show description for 6726998
  sattvikc

  authored
  6726998

Commits on Oct 31, 2023

• fix: add createdat to totp device (#870)

  sattvikc

  authored
  148c72a

• fix: mfa stats

  sattvikc

  committed
  edb4c2e

Commits on Nov 1, 2023

• fix: active users data saved into public tenant storage

  sattvikc

  committed
  504c8e3

• fix: pr comments

  sattvikc

  committed
  6dcca66

• fix: pr comments

  sattvikc

  committed
  7850720

• fix: pr comment

  sattvikc

  committed
  3e8ae02

• Merge pull request #871 from supertokens/mfa-stats

  Show description for c10aff7
  sattvikc

  authored
  c10aff7

Commits on Nov 6, 2023

• Mfa inmemory (#874)

  Show description for 6cd3c59
  sattvikc

  authored
  6cd3c59

• Merge branch '7.0' into feat/mfa

  sattvikc

  authored
  51f1da7

• fix: test

  sattvikc

  committed
  a0c0581

Commits on Nov 15, 2023

• fix: totp APIs and flaky tests fix (#879)

  Show description for 71f09f1
  sattvikc

  authored
  71f09f1

• fix: response

  sattvikc

  committed
  fbf0243

Commits on Nov 28, 2023

• Merge branch '7.0' into feat/mfa

  sattvikc

  committed
  6190d9d

Commits on Nov 29, 2023

• fix: version update

  sattvikc

  committed
  cbd7de3

• fix: changelog

  sattvikc

  committed
  9a62680

Commits on Dec 11, 2023

• fix: remove MFA apis

  sattvikc

  committed
  530f869

Commits on Dec 12, 2023

• fix: remove isValidFirstFactor

  sattvikc

  committed
  755ac1d

Commits on Dec 13, 2023

• fix: revert account linking api

  sattvikc

  committed
  1c56021

Commits on Dec 20, 2023

• Mfa changes (#901)

  Show description for 350c973
  sattvikc

  authored
  350c973

Commits on Jan 27, 2024

• fix: createNewRecipeUser input in consume code API (#910)

  Show description for b09ea39
  sattvikc

  authored
  b09ea39

Commits on Jan 29, 2024

• feat: make refresh sync signing key setting (#909)

  Show description for 9ef8d5f
  porcellus

  authored
  9ef8d5f

• fix: totp import api (#915)

  Show description for f884b13
  sattvikc

  authored
  f884b13

Commits on Jan 30, 2024

• fix: Fake email verified for emailpassword sign up (#913)

  Show description for 7164a2b
  sattvikc

  authored
  7164a2b

Commits on Feb 27, 2024

• Merge 7.0 (#940)

  Show description for e1fcd0c
  

  3 peopleauthored
  e1fcd0c

Commits on Mar 7, 2024

• merge latest (#947)

  Show description for 4a3a63d
  

  3 peopleauthored
  4a3a63d

Commits on Mar 11, 2024

• fix: add check code API and update delete code API (#948)

  Show description for 3f46b5d
  sattvikc

  authored
  3f46b5d

Commits on Mar 13, 2024

• Merge branch '8.0' into merge-8

  sattvikc

  committed
  697eafc

• fix: revert formatting

  sattvikc

  committed
  b44fbe7

• fix: revert formatting

  sattvikc

  committed
  a6992c8

• Merge pull request #955 from supertokens/merge-8

  Show description for d44fdba
  sattvikc

  authored
  d44fdba

• feat: merge last active times when linking users (#954)

  Show description for c4ba0b1
  

  porcellus

  and

  sattvikc

  authored
  c4ba0b1

• Remaining changes (#956)

  Show description for 941bc67
  sattvikc

  authored
  941bc67

• fix: fixme

  sattvikc

  committed
  60e5b69