1- import Axios , { AxiosResponse } from "axios" ;
1+ import Axios , { AxiosResponse } from "axios" ;
22
3- import { hostname , userPath } from "./api" ;
3+ import { hostname , userPath } from "./api" ;
44
5- import { UserState } from "../redux/actions/userTypes" ;
5+ import { UserState } from "../redux/actions/userTypes" ;
66import store from "../redux/store" ;
7- import {
8- addAccessToken ,
9- addRefreshToken ,
10- checkedCookies ,
11- removeTokens
12- } from "../redux/actions/tokens" ;
13- import { AccessToken , CookieStatus } from "../redux/actions/tokenTypes" ;
14- import { deleteCookie , getCookie , setCookie } from "../methods/cookies" ;
7+ import { addAccessToken , addRefreshToken , checkedCookies , removeTokens } from "../redux/actions/tokens" ;
8+ import { AccessToken , CookieStatus } from "../redux/actions/tokenTypes" ;
9+ import { deleteCookie , getCookie , setCookie } from "../methods/cookies" ;
1510import { updateUser } from "../redux/actions/user" ;
1611import { hashPassword } from "../methods/passwords" ;
1712
@@ -20,109 +15,110 @@ import {hashPassword} from "../methods/passwords";
2015const cookieName : string = "refreshToken" ;
2116
2217export interface BackendLoginData {
23- tokenValue : string ;
24- user : UserState ;
18+ tokenValue : string ;
19+ user : UserState ;
2520}
2621
2722export interface BackendAuthData {
28- tokenValue : string ;
29- userId : number ;
30- validUntil : number ;
23+ tokenValue : string ;
24+ userId : number ;
25+ validUntil : number ;
3126}
3227
3328export const checkForCookie = ( ) => {
34- let refreshTokenCookieValue = getCookie ( cookieName ) ;
35- if ( refreshTokenCookieValue ) {
29+ let refreshTokenCookieValue = getCookie ( cookieName ) ;
30+ if ( ! refreshTokenCookieValue ) {
31+ return store . dispatch ( checkedCookies ( CookieStatus . FINISHED ) ) ;
32+ }
33+
3634 store . dispatch ( addRefreshToken ( refreshTokenCookieValue ) ) ;
3735 store . dispatch ( checkedCookies ( CookieStatus . LOADING ) ) ;
3836 getAccessTokenWithRefreshToken ( ) ;
39- } else {
40- store . dispatch ( checkedCookies ( CookieStatus . FINISHED ) ) ;
41- }
37+
4238} ;
4339
44- export const loginWithUsernameAndPassword = async (
45- userName : string ,
46- password : string ,
47- stayLoggedIn : boolean
40+ export const loginWithUsernameAndPassword = async (
41+ userName : string ,
42+ password : string ,
43+ stayLoggedIn : boolean
4844) : Promise < BackendLoginData > => {
49- console . log ( "[Auth] loginWithUsernameAndPassword" , userName ) ;
50- let hashed = await hashPassword ( password ) ;
51- return new Promise < BackendLoginData > ( ( resolve , reject ) => {
52- let config = {
53- headers : {
54- Authorization : `Basic ${ btoa ( userName + ":" + hashed ) }
55- }
56- } ;
57-
58- return Axios . get < BackendLoginData > ( hostname + userPath + "/login" , config )
59- . then ( ( data : AxiosResponse < BackendLoginData > ) => {
60- console . log ( data . data ) ;
61- store . dispatch ( addRefreshToken ( data . data . tokenValue ) ) ;
62- store . dispatch ( updateUser ( data . data . user as UserState ) ) ;
63-
64- if ( stayLoggedIn ) {
65- setCookie ( cookieName , data . data . tokenValue , 60 ) ;
66- }
67-
68- getAccessTokenWithRefreshToken ( ) ;
69- } )
70- . catch ( ( error ) => {
71- reject ( error ) ;
72- } ) ;
73- } ) ;
45+ console . log ( "[Auth] loginWithUsernameAndPassword" , userName ) ;
46+ let hashed = await hashPassword ( password ) ;
47+ return new Promise < BackendLoginData > ( ( resolve , reject ) => {
48+ let config = {
49+ headers : {
50+ Authorization : `Basic ${ btoa ( userName + ":" + hashed ) }
51+ }
52+ } ;
53+
54+ return Axios . get < BackendLoginData > ( hostname + userPath + "/login" , config )
55+ . then ( ( data : AxiosResponse < BackendLoginData > ) => {
56+ console . log ( data . data ) ;
57+ store . dispatch ( addRefreshToken ( data . data . tokenValue ) ) ;
58+ store . dispatch ( updateUser ( data . data . user as UserState ) ) ;
59+
60+ if ( stayLoggedIn ) {
61+ setCookie ( cookieName , data . data . tokenValue , 60 ) ;
62+ }
63+
64+ getAccessTokenWithRefreshToken ( ) ;
65+ } )
66+ . catch ( ( error ) => {
67+ reject ( error ) ;
68+ } ) ;
69+ } ) ;
7470} ;
7571
7672export const getAccessTokenWithRefreshToken = ( ) => {
77- console . log ( "getAccessTokenWithRefreshToken" ) ;
73+ console . log ( "getAccessTokenWithRefreshToken" ) ;
7874
79- let refreshToken : string | null = store . getState ( ) . tokens . refreshToken ;
75+ let refreshToken : string | null = store . getState ( ) . tokens . refreshToken ;
8076
81- let config = {
82- headers : {
83- Authorization : `Bearer ${ refreshToken }
84- }
85- } ;
86-
87- Axios . get < BackendAuthData > ( hostname + userPath + "/auth" , config )
88- . then ( ( data : AxiosResponse < BackendAuthData > ) => {
89- store . dispatch ( checkedCookies ( CookieStatus . FINISHED ) ) ;
90- setAuthHeaderToAxios ( data . data . tokenValue ) ;
91-
92- store . dispatch (
93- addAccessToken ( {
94- token : data . data . tokenValue ,
95- timestamp : data . data . validUntil
96- } as AccessToken )
97- ) ;
98- if ( ! store . getState ( ) . user . username ) {
99- getOwnUserData ( data . data . userId ) ;
100- }
101- } )
102- . catch ( ( error ) => {
103- store . dispatch ( removeTokens ( ) ) ;
104- store . dispatch ( checkedCookies ( CookieStatus . FINISHED ) ) ;
105-
106- console . log ( error ) ;
107- //you probably want to notify the user, maybe with a toast or similar
108- } ) ;
77+ let config = {
78+ headers : {
79+ Authorization : `Bearer ${ refreshToken }
80+ }
81+ } ;
82+
83+ Axios . get < BackendAuthData > ( hostname + userPath + "/auth" , config )
84+ . then ( ( data : AxiosResponse < BackendAuthData > ) => {
85+ store . dispatch ( checkedCookies ( CookieStatus . FINISHED ) ) ;
86+ setAuthHeaderToAxios ( data . data . tokenValue ) ;
87+
88+ store . dispatch (
89+ addAccessToken ( {
90+ token : data . data . tokenValue ,
91+ timestamp : data . data . validUntil
92+ } as AccessToken )
93+ ) ;
94+ if ( ! store . getState ( ) . user . username ) {
95+ getOwnUserData ( data . data . userId ) ;
96+ }
97+ } )
98+ . catch ( ( error ) => {
99+ store . dispatch ( removeTokens ( ) ) ;
100+ store . dispatch ( checkedCookies ( CookieStatus . FINISHED ) ) ;
101+
102+ console . log ( error ) ;
103+ //you probably want to notify the user, maybe with a toast or similar
104+ } ) ;
109105} ;
110106
111107const getOwnUserData = ( userId : number ) => {
112- Axios . get < UserState > ( `${ hostname } ${ userPath } ${ userId } )
113- . then ( ( response : AxiosResponse < UserState > ) => {
114- store . dispatch ( updateUser ( response . data ) ) ;
115- } )
116- . catch ( ( error ) => {
117- console . log ( error ) ;
118- } ) ;
108+ Axios . get < UserState > ( `${ hostname } ${ userPath } ${ userId } )
109+ . then ( ( response : AxiosResponse < UserState > ) => {
110+ store . dispatch ( updateUser ( response . data ) ) ;
111+ } )
112+ . catch ( ( error ) => {
113+ console . log ( error ) ;
114+ } ) ;
119115} ;
120116
121117export const logout = ( ) => {
122- store . dispatch ( removeTokens ( ) ) ;
123- deleteCookie ( cookieName ) ;
118+ store . dispatch ( removeTokens ( ) ) ;
119+ deleteCookie ( cookieName ) ;
124120} ;
125121
126122function setAuthHeaderToAxios ( accessToken : string ) {
127- Axios . defaults . headers . common [ "Authorization" ] = `Bearer ${ accessToken } ;
123+ Axios . defaults . headers . common [ "Authorization" ] = `Bearer ${ accessToken } ;
128124}
0 commit comments