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.

Sign up for GitHub

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 expired reauthorizations #979

Merged
merged 4 commits into from
Oct 4, 2024
Merged

Fix expired reauthorizations #979

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a35279a
add migrate method to AccountRecordsDaoInterface
Funkatronics Oct 4, 2024
56b8949
implement migrate method in AccountRecordsDao
Funkatronics Oct 4, 2024
116a6f3
call migrate when reissuing an authtoken
Funkatronics Oct 4, 2024
d60f738
change method name
Funkatronics Oct 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions ...c/main/java/com/solana/mobilewalletadapter/walletlib/authorization/AccountRecordsDao.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;

import java.util.ArrayList;
import java.util.List;

public class AccountRecordsDao extends DbContentProvider<AccountRecord>
implements AccountRecordsDaoInterface, AccountRecordsSchema {

Expand Down Expand Up @@ -43,6 +40,18 @@ public long insert(@NonNull long parentId,
return super.insert(TABLE_ACCOUNTS, accountContentValues);
}

@Override
public long migrateAccountsParent(long oldParentId, long newParentId) {
final ContentValues accountContentValues = new ContentValues(1);
accountContentValues.put(COLUMN_ACCOUNTS_PARENT_ID, newParentId);
return super.update(
TABLE_ACCOUNTS,
accountContentValues,
COLUMN_ACCOUNTS_PARENT_ID + "=?",
new String[] { String.valueOf(oldParentId) }
);
}

@Nullable
@Override
public AccountRecord query(@NonNull byte[] publicKey) {
Expand Down
3 changes: 3 additions & 0 deletions ...va/com/solana/mobilewalletadapter/walletlib/authorization/AccountRecordsDaoInterface.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ long insert(@NonNull long parentId, @NonNull byte[] publicKey,
@Nullable String accountLabel, @Nullable Uri accountIcon,
@Nullable String[] chains, @Nullable String[] features);

@IntRange(from = 0)
long migrateAccountsParent(long oldParentId, long newParentId);

// @Nullable
// List<AccountRecord> query(int parentId);

Expand Down
1 change: 1 addition & 0 deletions .../main/java/com/solana/mobilewalletadapter/walletlib/authorization/AuthRepositoryImpl.java
View file
Open in desktop
Copy link

Choose a reason for hiding this comment

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

Really just a naming nit in the context of Room, because "migration" is used on the DB when schemas is updated. But I understand the parentId has to be retained on reauthorization.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

happy to rename it if you have a suggestion!

Copy link
Contributor Author

Choose a reason for hiding this comment

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

renamed to updateParentId

Original file line number Diff line number Diff line change
Expand Up @@ -444,6 +444,7 @@ public synchronized AuthRecord reissue(@NonNull AuthRecord authRecord) {
} else {
final int id = (int) mAuthorizationsDao.insert(authRecord.identity.getId(), now,
authRecord.chain, authRecord.walletUriBaseId, authRecord.scope);
mAccountsDao.migrateAccountsParent(authRecord.id, id);
reissued = new AuthRecord(id, authRecord.identity, authRecord.accounts,
authRecord.chain, authRecord.scope, authRecord.walletUriBase,
authRecord.walletUriBaseId, now,
Expand Down
Loading