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: demos that expected userID in fetchCredentials #446

Merged
merged 3 commits into from
Dec 17, 2024
Merged

fix: demos that expected userID in fetchCredentials #446

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3abde29
fix: user id no longer in fetchCredentials
DominicGBauer Dec 17, 2024
c541bc8
fix: user id no longer in fetchCredentials
DominicGBauer Dec 17, 2024
f66727b
chore: remove unused import
DominicGBauer Dec 17, 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
2 changes: 1 addition & 1 deletion demos/django-react-native-todolist/app/views/todos/lists.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ const App = () => {
return;
}

const { userID } = await system.djangoConnector.fetchCredentials();
const userID = await system.djangoConnector.userId();

await system.powersync.execute(
`INSERT INTO ${LIST_TABLE} (id, created_at, name, owner_id) VALUES (uuid(), datetime(), ?, ?)`,
Expand Down
4 changes: 4 additions & 0 deletions demos/django-react-native-todolist/library/django/DjangoConnector.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@ export class DjangoConnector implements PowerSyncBackendConnector {
return this.apiClient.register(username, password);
}

async userId() {
return Storage.getItem('id');
}

async fetchCredentials() {
// The demo does not invalidate or update a user token, you should implement this in your app
// The app stores the user id in local storage
Expand Down
4 changes: 2 additions & 2 deletions demos/react-native-supabase-todolist/app/views/todos/edit/[id].tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ const TodoView: React.FC = () => {
const toggleCompletion = async (record: TodoRecord, completed: boolean) => {
const updatedRecord = { ...record, completed: completed };
if (completed) {
const { userID } = await system.supabaseConnector.fetchCredentials();
const userID = await system.supabaseConnector.userId();
updatedRecord.completed_at = new Date().toISOString();
updatedRecord.completed_by = userID;
} else {
Expand All @@ -86,7 +86,7 @@ const TodoView: React.FC = () => {
};

const createNewTodo = async (description: string) => {
const { userID } = await system.supabaseConnector.fetchCredentials();
const userID = await system.supabaseConnector.userId();

await powerSync.execute(
`INSERT INTO
Expand Down
2 changes: 1 addition & 1 deletion demos/react-native-supabase-todolist/app/views/todos/lists.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const ListsViewWidget: React.FC = () => {
`);

const createNewList = async (name: string) => {
const { userID } = await system.supabaseConnector.fetchCredentials();
const userID = await system.supabaseConnector.userId();

const res = await system.powersync.execute(
`INSERT INTO ${LIST_TABLE} (id, created_at, name, owner_id) VALUES (uuid(), datetime(), ?, ?) RETURNING *`,
Expand Down
14 changes: 7 additions & 7 deletions demos/react-native-supabase-todolist/ios/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ PODS:
- hermes-engine (0.74.5):
- hermes-engine/Pre-built (= 0.74.5)
- hermes-engine/Pre-built (0.74.5)
- powersync-sqlite-core (0.3.0)
- powersync-sqlite-core (0.3.6)
- RCT-Folly (2024.01.01.00):
- boost
- DoubleConversion
Expand Down Expand Up @@ -1005,11 +1005,11 @@ PODS:
- React-debug
- react-native-encrypted-storage (4.0.3):
- React-Core
- react-native-quick-sqlite (2.0.0):
- react-native-quick-sqlite (2.2.0):
- DoubleConversion
- glog
- hermes-engine
- powersync-sqlite-core (~> 0.3.0)
- powersync-sqlite-core (~> 0.3.6)
- RCT-Folly (= 2024.01.01.00)
- RCTRequired
- RCTTypeSafety
Expand Down Expand Up @@ -1435,7 +1435,7 @@ DEPENDENCIES:
- ExpoKeepAwake (from `../../../node_modules/expo-keep-awake/ios`)
- ExpoModulesCore (from `../node_modules/expo-modules-core`)
- ExpoSecureStore (from `../../../node_modules/expo-secure-store/ios`)
- EXSplashScreen (from `../node_modules/expo-splash-screen/ios`)
- EXSplashScreen (from `../../../node_modules/expo-splash-screen/ios`)
- FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`)
- fmt (from `../node_modules/react-native/third-party-podspecs/fmt.podspec`)
- glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
Expand Down Expand Up @@ -1532,7 +1532,7 @@ EXTERNAL SOURCES:
ExpoSecureStore:
:path: "../../../node_modules/expo-secure-store/ios"
EXSplashScreen:
:path: "../node_modules/expo-splash-screen/ios"
:path: "../../../node_modules/expo-splash-screen/ios"
FBLazyVector:
:path: "../node_modules/react-native/Libraries/FBLazyVector"
fmt:
Expand Down Expand Up @@ -1672,7 +1672,7 @@ SPEC CHECKSUMS:
fmt: 4c2741a687cc09f0634a2e2c72a838b99f1ff120
glog: fdfdfe5479092de0c4bdbebedd9056951f092c4f
hermes-engine: 8c1577f3fdb849cbe7729c2e7b5abc4b845e88f8
powersync-sqlite-core: ad0e70e23bacd858fe2e79032dc4aabdf972d1bd
powersync-sqlite-core: e6217cc9e89e8803550f1b5bb7fd5b00becc903a
RCT-Folly: 02617c592a293bd6d418e0a88ff4ee1f88329b47
RCTDeprecation: 3afceddffa65aee666dafd6f0116f1d975db1584
RCTRequired: ec1239bc9d8bf63e10fb92bd8b26171a9258e0c1
Expand All @@ -1698,7 +1698,7 @@ SPEC CHECKSUMS:
React-logger: 257858bd55f3a4e1bc0cf07ddc8fb9faba6f8c7c
React-Mapbuffer: 6c1cacdbf40b531f549eba249e531a7d0bfd8e7f
react-native-encrypted-storage: db300a3f2f0aba1e818417c1c0a6be549038deb7
react-native-quick-sqlite: 32a5687a042a40f9c820605fe4dc06dfa3bd31e9
react-native-quick-sqlite: b4b34028dbe2d532beb2575f4b90ae58bec42260
react-native-safe-area-context: afa5d614d6b1b73b743c9261985876606560d128
React-nativeconfig: ba9a2e54e2f0882cf7882698825052793ed4c851
React-NativeModulesApple: 8d11ff8955181540585c944cf48e9e7236952697
Expand Down
8 changes: 8 additions & 0 deletions demos/react-native-supabase-todolist/library/supabase/SupabaseConnector.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,14 @@ export class SupabaseConnector implements PowerSyncBackendConnector {
}
}

async userId() {
const {
data: { session },
} = await this.client.auth.getSession();

return session?.user.id;
}

async fetchCredentials() {
const {
data: { session },
Expand Down
4 changes: 2 additions & 2 deletions demos/react-native-web-supabase-todolist/app/views/todos/edit/[id].tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ const TodoView: React.FC = () => {
const toggleCompletion = async (record: TodoRecord, completed: boolean) => {
const updatedRecord = { ...record, completed: completed };
if (completed) {
const { userID } = await system.supabaseConnector.fetchCredentials();
const userID = await system.supabaseConnector.userId();
updatedRecord.completed_at = new Date().toISOString();
updatedRecord.completed_by = userID;
} else {
Expand All @@ -84,7 +84,7 @@ const TodoView: React.FC = () => {
};

const createNewTodo = async (description: string) => {
const { userID } = await system.supabaseConnector.fetchCredentials();
const userID = await system.supabaseConnector.userId();

await powerSync.execute(
`INSERT INTO
Expand Down
2 changes: 1 addition & 1 deletion demos/react-native-web-supabase-todolist/app/views/todos/lists.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const ListsViewWidget: React.FC = () => {
`);

const createNewList = async (name: string) => {
const { userID } = await system.supabaseConnector.fetchCredentials();
const userID = await system.supabaseConnector.userId();

const res = await system.powersync.execute(
`INSERT INTO ${LIST_TABLE} (id, created_at, name, owner_id) VALUES (uuid(), datetime(), ?, ?) RETURNING *`,
Expand Down
8 changes: 8 additions & 0 deletions demos/react-native-web-supabase-todolist/library/supabase/SupabaseConnector.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,14 @@ export class SupabaseConnector implements PowerSyncBackendConnector {
}
}

async userId() {
const {
data: { session },
} = await this.client.auth.getSession();

return session?.user.id;
}

async fetchCredentials() {
const {
data: { session },
Expand Down
Loading