Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: multitenant user association with account linking #149

Merged
merged 5 commits into from
Aug 31, 2023

Conversation

sattvikc
Copy link
Collaborator

Summary of change

(A few sentences about this PR)

Related issues

  • Link to issue1 here
  • Link to issue1 here

Test Plan

(Write your test plan here. If you changed any code, please provide us with clear instructions on how you verified your changes work. Bonus points for screenshots and videos!)

Documentation changes

(If relevant, please create a PR in our docs repo, or create a checklist here highlighting the necessary changes)

Checklist for important updates

  • Changelog has been updated
  • pluginInterfaceSupported.json file has been updated (if needed)
  • Changes to the version if needed
    • In build.gradle
  • Had installed and ran the pre-commit hook
  • If there are new dependencies that have been added in build.gradle, please make sure to add them in implementationDependencies.json.
  • Issue this PR against the latest non released version branch.
    • To know which one it is, run find the latest released tag (git tag) in the format vX.Y.Z, and then find the latest branch (git branch --all) whose X.Y is greater than the latest released tag.
    • If no such branch exists, then create one from the latest released branch.

Remaining TODOs for this PR

  • Item1
  • Item2

@sattvikc sattvikc self-assigned this Aug 30, 2023
@@ -777,22 +779,41 @@ public static String lockEmailAndTenant_Transaction(Start start, Connection con,
});
}

public static String lockPhoneAndTenant_Transaction(Start start, Connection con,
TenantIdentifier tenantIdentifier,
public static List<String> lockEmailAndTenant_Transaction(Start start, Connection con, AppIdentifier appIdentifier,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

bad name. Remove tenant

});
}

public static List<String> lockPhoneAndTenant_Transaction(Start start, Connection con,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

bad name. Remove tenant

@@ -777,22 +779,41 @@ public static String lockEmailAndTenant_Transaction(Start start, Connection con,
});
}

public static String lockPhoneAndTenant_Transaction(Start start, Connection con,
TenantIdentifier tenantIdentifier,
public static List<String> lockEmailAndTenant_Transaction(Start start, Connection con, AppIdentifier appIdentifier,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

there is still a function called lockEmailAndTenant_Transaction that takes tenant Identifier

public static boolean addUserIdToTenant_Transaction(Start start, Connection sqlCon,
TenantIdentifier tenantIdentifier, String userId)
throws StorageQueryException, SQLException {
throws StorageQueryException, SQLException, DuplicateEmailException, DuplicatePhoneNumberException {
UserInfoPartial userInfo = PasswordlessQueries.getUserById(start, sqlCon,
tenantIdentifier.toAppIdentifier(), userId);

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this logic goes in the core.

@sattvikc sattvikc merged commit 01fb095 into feat/account-linking Aug 31, 2023
1 of 3 checks passed
@sattvikc sattvikc deleted the al-user-tenant-association branch August 31, 2023 06:31
rishabhpoddar added a commit that referenced this pull request Sep 20, 2023
* up to speed iwth in mem db

* bug fix

* adds link account function

* removes unneeded index

* Account linking function changes (#136)

* fixes bugs

* more tests

* Link accounts (#137)

* fixes bugs

* more tests

* updates to function (#138)

* Account linking unlink accounts (#139)

* updates to function

* adds unlink account function

* fixes and adds test (#140)

* changes for password reset flow (#141)

* Account linking update email (#142)

* changes for password reset flow

* removes unneeded function

* removes unneeded function

* adds recipe user id in session (#143)

* fixes query (#144)

* fix: user pagination (#145)

* fix: query update

* fix: primary_or_recipe_user_time_joined added to all_auth_users table

* fix: primary_or_recipe_user_time_joined added to all_auth_users table

* fix: user pagination queries

* fix: user pagination queries

* fix: plugin interface fix (#146)

* fix: plugin interface fix

* fix: pr comments

* fix: pr comments

* fix: External userid (#147)

* fix: plugin interface fix

* fix: pr comments

* fix: pr comments

* fix: external userid

* fix: remove UserInfo class (#148)

* fix: multitenant user association with account linking (#149)

* fix: tenant association query fixes

* fix: multitenancy related changes

* fix: pr comments

* fix: pr comments

* fix: pr comments

* fix: remove con reuse (#150)

* fix: remove con reuse

* fix: pr comments

* fix: pr comments

* fix: pr comments

* fix: pr comments

* fix: index updates (#152)

* fix: updated indexes

* fix: pr comments

* fix: pr comments

* fix: fkey constraint for primary_or_recipe_user_id (#153)

* fix: account linking stats (#154)

* fix: account linking stats

* fix: query

* fix: pr comment

* fix: fixing tenant association

* fix: allow user disassociation from all tenant (#156)

* fix: allow user disassociation from all tenant

* fix: query

* fix: useridmapping functions (#157)

* fix: version and changelog

* fix: version and changelog

* fix: time joined fix

---------

Co-authored-by: rishabhpoddar <rishabh.poddar@gmail.com>
Co-authored-by: Mihály Lengyel <mihaly@lengyel.tech>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants