Skip to content

Commit 152e0b6

Browse files
committed
register and login
1 parent 077393a commit 152e0b6

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/components/AuthContext/AuthContext.tsx

+5-5
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ export const AuthProvider: React.FC<IAuthProviderProps> = ({children}) => {
3737
});
3838

3939
if (response.status === 200 && response.data.success) {
40-
localStorage.setItem('token', response.data.token);
41-
localStorage.setItem('refresh_token', response.data.refresh_token);
40+
localStorage.setItem('token', response.data.tokens.access_token);
41+
localStorage.setItem('refresh_token', response.data.tokens.refresh_token);
4242
setIsAuthenticated(true);
4343
setCurrentUser(response.data.user_data);
4444
} else {
@@ -62,8 +62,8 @@ export const AuthProvider: React.FC<IAuthProviderProps> = ({children}) => {
6262
});
6363

6464
if (response.status === 201) {
65-
localStorage.setItem('token', response.data.token);
66-
localStorage.setItem('refresh_token', response.data.refresh_token);
65+
localStorage.setItem('token', response.data.tokens.access_token);
66+
localStorage.setItem('refresh_token', response.data.tokens.refresh_token);
6767
setIsAuthenticated(true);
6868
setCurrentUser(response.data.user_data);
6969
} else {
@@ -94,7 +94,7 @@ export const AuthProvider: React.FC<IAuthProviderProps> = ({children}) => {
9494
'Authorization': `Bearer ${refreshToken}`
9595
}
9696
});
97-
const newAccessToken = response.data.access_token;
97+
const newAccessToken = response.data.tokens.access_token;
9898
localStorage.setItem('token', newAccessToken);
9999
return newAccessToken;
100100
} catch (error) {

src/utils/utils.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ export const validateSettings = {
3030
password: {
3131
min: 8,
3232
max: 20,
33-
passwordPattern: /^(?=.*[A-Z])(?=.*\d)(?=.*[!@#$%^&*])[A-Za-z\d!@#$%^&*]{8,20}$/,
33+
passwordPattern: /(?=.*[A-Z])(?=.*\d)(?=.*[!@#$%^&*])[A-Za-z\d!@#$%^&*]{8,20}/,
3434
},
3535
email: {
3636
min: 3,

0 commit comments

Comments
 (0)