Skip to content

Commit 37cd222

Browse files
adguernieradguernier
committed
fix login process
1 parent 0a5fcaf commit 37cd222

File tree

9 files changed

+82
-98
lines changed

9 files changed

+82
-98
lines changed

‎package.json

+3
Original file line numberDiff line numberDiff line change
@@ -61,5 +61,8 @@
6161
],
6262
"jest": {
6363
"testEnvironment": "jsdom"
64+
},
65+
"dependencies": {
66+
"ra-core": "^4.16.17"
6467
}
6568
}

‎packages/demo/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
"faker": "~5.4.0",
1515
"lodash": "~4.17.5",
1616
"prop-types": "^15.7.2",
17-
"ra-data-fakerest": "^4.12.0",
17+
"ra-data-fakerest": "^4.16.19",
1818
"ra-supabase": "^2.1.0",
1919
"react": "^18.2.0",
20-
"react-admin": "^4.12.0",
20+
"react-admin": "^4.16.19",
2121
"react-beautiful-dnd": "^13.0.0",
2222
"react-dom": "^18.2.0",
2323
"react-error-boundary": "^3.1.4",

‎packages/demo/src/App.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ const App = () => (
3838
i18nProvider={i18nProvider}
3939
layout={Layout}
4040
dashboard={Dashboard}
41-
loginPage={LoginPage}
41+
loginPage={<LoginPage />}
4242
queryClient={queryClient}
4343
theme={{
4444
...defaultTheme,

‎packages/demo/src/authProvider.ts

+14-23
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,19 @@ import { supabaseAuthProvider } from 'ra-supabase';
22
import { supabase } from './supabase';
33

44
export const authProvider = supabaseAuthProvider(supabase, {
5-
// getIdentity: async user => {
6-
// const { data, error } = await supabase
7-
// .from('sales')
8-
// .select('id, first_name, last_name')
9-
// .ilike('email', user.email as string)
10-
// .single();
5+
getIdentity: async user => {
6+
const { data, error } = await supabase
7+
.from('sales')
8+
.select('id, first_name, last_name')
9+
.ilike('email', user.email as string)
10+
.single();
1111

12-
// if (!data || error) {
13-
// throw new Error();
14-
// }
15-
// return {
16-
// id: data.id,
17-
// fullName: `${data.first_name} ${data.last_name}`,
18-
// };
19-
// },
20-
getIdentity: async () => Promise.resolve(),
21-
checkAuth: async () => Promise.resolve(),
22-
getPermissions: async () => Promise.resolve(),
23-
handleCallback: async () => Promise.resolve(),
24-
checkError: async () => Promise.resolve(),
25-
logout: async () => Promise.resolve(),
26-
resetPassword: async () => Promise.resolve(),
27-
setPassword: async () => Promise.resolve(),
28-
login: async () => Promise.resolve(),
12+
if (!data || error) {
13+
throw new Error();
14+
}
15+
return {
16+
id: data.id,
17+
fullName: `${data.first_name} ${data.last_name}`,
18+
};
19+
},
2920
});

‎packages/ra-supabase-core/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"@testing-library/jest-dom": "^5.16.5",
2626
"@testing-library/react": "^13.4.0",
2727
"@testing-library/user-event": "^14.4.3",
28-
"ra-core": "^4.7.0",
28+
"ra-core": "^4.16.19",
2929
"react": "^18.2.0",
3030
"react-dom": "^18.2.0",
3131
"react-router": "^6.7.0",

‎packages/ra-supabase-core/src/authProvider.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ export const supabaseAuthProvider = (
139139
return Promise.resolve();
140140
},
141141
async getPermissions() {
142-
const { data, error } = await client.auth.getUser();
142+
const { data, error } = await client.auth.getUser();
143143
if (error) {
144144
throw error;
145145
}

‎packages/ra-supabase-ui-materialui/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
"@mui/icons-material": "^5.11.0",
2222
"@mui/material": "^5.11.6",
2323
"@supabase/supabase-js": "^2.4.1",
24-
"ra-core": "^4.7.0",
25-
"ra-ui-materialui": "^4.7.1",
24+
"ra-core": "^4.16.19",
25+
"ra-ui-materialui": "^4.16.19",
2626
"react": "^18.2.0",
2727
"react-dom": "^18.2.0",
2828
"react-router": "^6.7.0"

‎packages/ra-supabase-ui-materialui/src/LoginPage.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ import {
7272
* );
7373
*/
7474
export const LoginPage = (props: LoginPageProps) => {
75-
useRedirectIfAuthenticated();
7675
const {
7776
children,
7877
disableEmailPassword = false,

‎yarn.lock

+58-67
Original file line numberDiff line numberDiff line change
@@ -9662,10 +9662,10 @@ quick-lru@^4.0.1:
96629662
resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-4.0.1.tgz#5b8878f113a58217848c6482026c73e1ba57727f"
96639663
integrity sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==
96649664

9665-
ra-core@^4.16.17:
9666-
version "4.16.17"
9667-
resolved "https://registry.yarnpkg.com/ra-core/-/ra-core-4.16.17.tgz#35a5fe689e42ade1bf430bbe96f0100175ae03cf"
9668-
integrity sha512-85dpwo6D5nv/UTJJxBqYFWP8H4O4bc+prL8ar8Trb4om2X75zK6FsW/4ZXKlhrRPM+fP+s/v3xYrFjTo/zT4hQ==
9665+
ra-core@^4.16.17, ra-core@^4.16.19:
9666+
version "4.16.19"
9667+
resolved "https://registry.yarnpkg.com/ra-core/-/ra-core-4.16.19.tgz#d402cde87368ddfbd30a540b7e9f8e1c6ff0fec6"
9668+
integrity sha512-1qNuLGaGSHYv5esqJcu7n/PeMKTBXA3JXzjQPAPDK9dBsuWC1IXx9MilivANwh8doYbpFfqsX8VJyW1aqIG1Pg==
96699669
dependencies:
96709670
clsx "^1.1.1"
96719671
date-fns "^2.19.0"
@@ -9678,48 +9678,32 @@ ra-core@^4.16.17:
96789678
react-is "^17.0.2"
96799679
react-query "^3.32.1"
96809680

9681-
ra-core@^4.7.0:
9682-
version "4.7.2"
9683-
resolved "https://registry.yarnpkg.com/ra-core/-/ra-core-4.7.2.tgz#fdfe127da3aa04ff5b53d265ca3a00d6590b77ad"
9684-
integrity sha512-05PPxlcHvAgDFRlos3WwR52FA9jFyn1IXQYetvFksyah/1mulSVptXrzG3LdWBE/XazsgHi5JT7G8BdqxJyGzw==
9685-
dependencies:
9686-
clsx "^1.1.1"
9687-
date-fns "^2.19.0"
9688-
eventemitter3 "^4.0.7"
9689-
inflection "~1.12.0"
9690-
jsonexport "^3.2.0"
9691-
lodash "~4.17.5"
9692-
prop-types "^15.6.1"
9693-
query-string "^7.1.1"
9694-
react-is "^17.0.2"
9695-
react-query "^3.32.1"
9696-
9697-
ra-data-fakerest@^4.12.0:
9698-
version "4.16.17"
9699-
resolved "https://registry.yarnpkg.com/ra-data-fakerest/-/ra-data-fakerest-4.16.17.tgz#fb944874e3f50472f50d651ac5023a85bd909c83"
9700-
integrity sha512-iRRcf9lgW8vyt000blLCAKGLg04I4mROnWeKdK34sZu+gHfo0NTsPp89hqTllvcMN1ONLykzSHsWrUQPN0tNpA==
9681+
ra-data-fakerest@^4.16.19:
9682+
version "4.16.19"
9683+
resolved "https://registry.yarnpkg.com/ra-data-fakerest/-/ra-data-fakerest-4.16.19.tgz#201bd801e03314d5e44366ed3e7c2f92be6f69ac"
9684+
integrity sha512-bJ1sZJWGr2fcHVpLckU1nLIE0Pm4Cu9f1TPAuO80WuK9jgtpE1YlvmFmL3Nxj+lXIWJstgmDit2BhqWzMRjO7A==
97019685
dependencies:
97029686
fakerest "^3.0.0"
97039687

9704-
ra-i18n-polyglot@^4.16.17:
9705-
version "4.16.17"
9706-
resolved "https://registry.yarnpkg.com/ra-i18n-polyglot/-/ra-i18n-polyglot-4.16.17.tgz#a829b368eee7e8165769b8e96a89d5bdb9bfda08"
9707-
integrity sha512-ZsXqWg+F06rdavgKF/ZzI+3N5xtgZAOnpnFOdKaEOUMTHE+p7E512St/EkqS52FfCqQNpLkZ/zsZRJkIutmNZg==
9688+
ra-i18n-polyglot@^4.16.19:
9689+
version "4.16.19"
9690+
resolved "https://registry.yarnpkg.com/ra-i18n-polyglot/-/ra-i18n-polyglot-4.16.19.tgz#884100ea7f20ddf044e72c5d78c1c5c19fc0dd12"
9691+
integrity sha512-gRnY0fUn61cVtR36Qf5mgULXnQALRrjZ8Hnp7w+U9YvtrzapNTuIyZem3Tp0QL+/jRgxeqlQW7dqPYdV0bC7vg==
97089692
dependencies:
97099693
node-polyglot "^2.2.2"
9710-
ra-core "^4.16.17"
9694+
ra-core "^4.16.19"
97119695

9712-
ra-language-english@^4.16.17:
9713-
version "4.16.17"
9714-
resolved "https://registry.yarnpkg.com/ra-language-english/-/ra-language-english-4.16.17.tgz#fa16517458057133f9aaa6023288998b08411f71"
9715-
integrity sha512-ypvlZ+2jXVvLaeTp/Ri470TdAOjiQXecEITBs2r9fQdWU4NFTzU25nwq6LhWbFLFHSiJkw86OLR3T1Hd/veBlg==
9696+
ra-language-english@^4.16.19:
9697+
version "4.16.19"
9698+
resolved "https://registry.yarnpkg.com/ra-language-english/-/ra-language-english-4.16.19.tgz#5e99bbfbab0b99a1ed31d9df9e01e51e08c78a85"
9699+
integrity sha512-k8ykj7bJ5UEAebB+SsOAcpyb6gUlsNkJ8N0+lDAezpilBaHahDQaYtNKA+GkoZnU8rIKYMYLttcl3VdCllkG2g==
97169700
dependencies:
9717-
ra-core "^4.16.17"
9701+
ra-core "^4.16.19"
97189702

9719-
ra-ui-materialui@^4.16.18:
9720-
version "4.16.18"
9721-
resolved "https://registry.yarnpkg.com/ra-ui-materialui/-/ra-ui-materialui-4.16.18.tgz#4aec4d17cfe21c1a828565c28bffe1ea134f59a1"
9722-
integrity sha512-vVLGVW3CZuTIptQylhwmMgkD26wppTd3AFoa8h1S0wdO0IUs3DiyD/RiWNbshVdhXOug4CocSYwfaY+eR+mqMw==
9703+
ra-ui-materialui@^4.16.19:
9704+
version "4.16.19"
9705+
resolved "https://registry.yarnpkg.com/ra-ui-materialui/-/ra-ui-materialui-4.16.19.tgz#67a7a03a8786e8db3ad6aeebb34535984df6e9c8"
9706+
integrity sha512-EyalFIUq9oUQ8N/vAeQFlrBaRTU/pMPAHvmfPHUxL5ajcQaSii6XKhRgT9S+YOec/XAU0DDaTjH9oJm0H3UgNA==
97239707
dependencies:
97249708
autosuggest-highlight "^3.1.1"
97259709
clsx "^1.1.1"
@@ -9736,24 +9720,6 @@ ra-ui-materialui@^4.16.18:
97369720
react-query "^3.32.1"
97379721
react-transition-group "^4.4.1"
97389722

9739-
ra-ui-materialui@^4.7.1:
9740-
version "4.7.3"
9741-
resolved "https://registry.yarnpkg.com/ra-ui-materialui/-/ra-ui-materialui-4.7.3.tgz#3e97d0f39ed1f4fbb35cc8594bea77390f3d1fe8"
9742-
integrity sha512-tiuEXtmFX0lLWYe0ceAjZ1OZQgmBhiJrPGtG6qN2zHMqK9soBvqcyEDCxw2fVtCnOMnaocSF3XXGocqfwzyeZg==
9743-
dependencies:
9744-
autosuggest-highlight "^3.1.1"
9745-
clsx "^1.1.1"
9746-
css-mediaquery "^0.1.2"
9747-
inflection "~1.12.0"
9748-
jsonexport "^3.2.0"
9749-
lodash "~4.17.5"
9750-
prop-types "^15.7.0"
9751-
query-string "^7.1.1"
9752-
react-dropzone "^12.0.4"
9753-
react-error-boundary "^3.1.4"
9754-
react-query "^3.32.1"
9755-
react-transition-group "^4.4.1"
9756-
97579723
raf-schd@^4.0.2, raf-schd@^4.0.3:
97589724
version "4.0.3"
97599725
resolved "https://registry.yarnpkg.com/raf-schd/-/raf-schd-4.0.3.tgz#5d6c34ef46f8b2a0e880a8fcdb743efc5bfdbc1a"
@@ -9766,20 +9732,20 @@ raf@^3.4.1:
97669732
dependencies:
97679733
performance-now "^2.1.0"
97689734

9769-
react-admin@^4.12.0:
9770-
version "4.16.18"
9771-
resolved "https://registry.yarnpkg.com/react-admin/-/react-admin-4.16.18.tgz#8c4feb0f3128334acfeacb3ba26224326d872875"
9772-
integrity sha512-KOBKFFMkPmTaAChH7EOuNV4AeNN8iVMVIeDkXU1wbguafLCwV8goeguWgZHzafVhtdOjsxdYKezfBGBIKnEbBA==
9735+
react-admin@^4.16.19:
9736+
version "4.16.19"
9737+
resolved "https://registry.yarnpkg.com/react-admin/-/react-admin-4.16.19.tgz#c8f047bbc954da218fb0845d7ef139fb93ac56ef"
9738+
integrity sha512-aFUPEbHFaDbfT3158moam2bchiQHE5C1f4yljSV7/0FukFkKa0ihS2hosPchqzilPEOS41ve0krYNEnHCPlHxw==
97739739
dependencies:
97749740
"@emotion/react" "^11.4.1"
97759741
"@emotion/styled" "^11.3.0"
97769742
"@mui/icons-material" "^5.0.1"
97779743
"@mui/material" "^5.0.2"
97789744
history "^5.1.0"
9779-
ra-core "^4.16.17"
9780-
ra-i18n-polyglot "^4.16.17"
9781-
ra-language-english "^4.16.17"
9782-
ra-ui-materialui "^4.16.18"
9745+
ra-core "^4.16.19"
9746+
ra-i18n-polyglot "^4.16.19"
9747+
ra-language-english "^4.16.19"
9748+
ra-ui-materialui "^4.16.19"
97839749
react-hook-form "^7.43.9"
97849750
react-router "^6.1.0"
97859751
react-router-dom "^6.1.0"
@@ -10679,7 +10645,16 @@ string-natural-compare@^3.0.1:
1067910645
resolved "https://registry.yarnpkg.com/string-natural-compare/-/string-natural-compare-3.0.1.tgz#7a42d58474454963759e8e8b7ae63d71c1e7fdf4"
1068010646
integrity sha512-n3sPwynL1nwKi3WJ6AIsClwBMa0zTi54fn2oLU6ndfTSIO05xaznjSf15PcBZU6FNWbmN5Q6cxT4V5hGvB4taw==
1068110647

10682-
"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
10648+
"string-width-cjs@npm:string-width@^4.2.0":
10649+
version "4.2.3"
10650+
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
10651+
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
10652+
dependencies:
10653+
emoji-regex "^8.0.0"
10654+
is-fullwidth-code-point "^3.0.0"
10655+
strip-ansi "^6.0.1"
10656+
10657+
"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
1068310658
version "4.2.3"
1068410659
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
1068510660
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -10779,7 +10754,14 @@ string_decoder@~1.1.1:
1077910754
dependencies:
1078010755
safe-buffer "~5.1.0"
1078110756

10782-
"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
10757+
"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
10758+
version "6.0.1"
10759+
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
10760+
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
10761+
dependencies:
10762+
ansi-regex "^5.0.1"
10763+
10764+
strip-ansi@^6.0.0, strip-ansi@^6.0.1:
1078310765
version "6.0.1"
1078410766
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
1078510767
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -11672,7 +11654,7 @@ wordwrap@^1.0.0:
1167211654
resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
1167311655
integrity sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==
1167411656

11675-
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
11657+
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
1167611658
version "7.0.0"
1167711659
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
1167811660
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
@@ -11690,6 +11672,15 @@ wrap-ansi@^6.2.0:
1169011672
string-width "^4.1.0"
1169111673
strip-ansi "^6.0.0"
1169211674

11675+
wrap-ansi@^7.0.0:
11676+
version "7.0.0"
11677+
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
11678+
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
11679+
dependencies:
11680+
ansi-styles "^4.0.0"
11681+
string-width "^4.1.0"
11682+
strip-ansi "^6.0.0"
11683+
1169311684
wrap-ansi@^8.1.0:
1169411685
version "8.1.0"
1169511686
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"

0 commit comments

Comments
 (0)