-
Notifications
You must be signed in to change notification settings - Fork 105
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.
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
[IOPID-2566] Refactor AuthErrorComponent #6565
Open
ChrisMattew
wants to merge
12
commits into
master
Choose a base branch
from
IOPID-2566-auth-error-screen
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
d085423
refactor(AuthErrorComponent): remove onRetry function from navigation…
ChrisMattew 800a12d
fix(AuthErrorScreen): reset spidLoginState on cancel
ChrisMattew 9d346fa
chore: update snapshots
ChrisMattew 0e30587
Merge branch 'master' into IOPID-2566-auth-error-screen
ChrisMattew dba0245
Merge branch 'master' into IOPID-2566-auth-error-screen
ChrisMattew 3037325
Merge branch 'master' into IOPID-2566-auth-error-screen
ChrisMattew 0462524
Merge branch 'master' into IOPID-2566-auth-error-screen
ChrisMattew 8aea08c
Merge branch 'master' into IOPID-2566-auth-error-screen
Ladirico 1e3c983
Merge branch 'master' into IOPID-2566-auth-error-screen
Ladirico 1c1a515
chore(IdpLoginScreen): add explanation about the choice of replace in…
ChrisMattew 14db7aa
perf: improve spidLogin selectors
ChrisMattew 836c550
Merge branch 'master' into IOPID-2566-auth-error-screen
ChrisMattew File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
import { ActionType, createStandardAction } from "typesafe-actions"; | ||
import * as pot from "@pagopa/ts-commons/lib/pot"; | ||
import { ErrorType, NativeLoginRequestInfo } from "../../types"; | ||
|
||
export const setNativeLoginRequestInfo = createStandardAction( | ||
"SET_NATIVE_LOGIN_REQUEST_INFO" | ||
)<NativeLoginRequestInfo>(); | ||
export const incrementNativeLoginNativeAttempts = createStandardAction( | ||
"INCREMENT_NATIVE_LOGIN_NATIVE_ATTEMPTS" | ||
)(); | ||
export const setStandardLoginRequestState = createStandardAction( | ||
"SET_STNDARD_LOGIN_REQUEST_STATE" | ||
)<pot.Pot<true, ErrorType>>(); | ||
export const setStandardLoginInLoadingState = createStandardAction( | ||
"SET_STANDARD_LOGIN_IN_LOADING_STATE" | ||
)(); | ||
export const resetSpidLoginState = createStandardAction("RESET_LOGIN_STATE")(); | ||
|
||
export type SpidConfigActions = | ||
| ActionType<typeof setNativeLoginRequestInfo> | ||
| ActionType<typeof incrementNativeLoginNativeAttempts> | ||
| ActionType<typeof setStandardLoginRequestState> | ||
| ActionType<typeof setStandardLoginInLoadingState> | ||
| ActionType<typeof resetSpidLoginState>; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,87 @@ | ||
import { getType } from "typesafe-actions"; | ||
import * as pot from "@pagopa/ts-commons/lib/pot"; | ||
import { Action } from "../../../../store/actions/types"; | ||
import { StandardLoginRequestInfo, NativeLoginRequestInfo } from "../../types"; | ||
import { | ||
incrementNativeLoginNativeAttempts, | ||
setStandardLoginRequestState, | ||
setNativeLoginRequestInfo, | ||
setStandardLoginInLoadingState, | ||
resetSpidLoginState | ||
} from "../actions"; | ||
|
||
export type SpidLoginState = { | ||
nativeLogin: { | ||
requestInfo: NativeLoginRequestInfo; | ||
}; | ||
standardLogin: { | ||
requestInfo: StandardLoginRequestInfo; | ||
}; | ||
}; | ||
|
||
const spidLoginInitialState: SpidLoginState = { | ||
nativeLogin: { | ||
requestInfo: { | ||
requestState: "LOADING", | ||
nativeAttempts: 0 | ||
} | ||
}, | ||
standardLogin: { | ||
requestInfo: { | ||
requestState: pot.noneLoading | ||
} | ||
} | ||
}; | ||
|
||
export const spidLoginReducer = ( | ||
state: SpidLoginState = spidLoginInitialState, | ||
action: Action | ||
): SpidLoginState => { | ||
switch (action.type) { | ||
case getType(setNativeLoginRequestInfo): | ||
return { | ||
...state, | ||
nativeLogin: { | ||
...state.nativeLogin, | ||
requestInfo: action.payload | ||
} | ||
}; | ||
case getType(incrementNativeLoginNativeAttempts): | ||
return { | ||
...state, | ||
nativeLogin: { | ||
...state.nativeLogin, | ||
requestInfo: { | ||
requestState: "LOADING", | ||
nativeAttempts: state.nativeLogin.requestInfo.nativeAttempts + 1 | ||
} | ||
} | ||
}; | ||
case getType(setStandardLoginRequestState): | ||
return { | ||
...state, | ||
standardLogin: { | ||
...state.standardLogin, | ||
requestInfo: { | ||
...state.standardLogin.requestInfo, | ||
requestState: action.payload | ||
} | ||
} | ||
}; | ||
case getType(setStandardLoginInLoadingState): | ||
return { | ||
...state, | ||
standardLogin: { | ||
...state.standardLogin, | ||
requestInfo: { | ||
...state.standardLogin.requestInfo, | ||
requestState: pot.noneLoading | ||
} | ||
} | ||
}; | ||
case getType(resetSpidLoginState): | ||
return spidLoginInitialState; | ||
default: | ||
return state; | ||
} | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
import { createSelector } from "reselect"; | ||
import { GlobalState } from "../../../../store/reducers/types"; | ||
|
||
export const spidLoginSelector = (state: GlobalState) => | ||
state.features.loginFeatures.spidLogin; | ||
|
||
export const nativeLoginRequestInfoSelector = createSelector( | ||
spidLoginSelector, | ||
({ nativeLogin }) => nativeLogin.requestInfo | ||
); | ||
|
||
export const standardLoginRequestInfoSelector = createSelector( | ||
spidLoginSelector, | ||
({ standardLogin }) => standardLogin.requestInfo | ||
); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
import * as pot from "@pagopa/ts-commons/lib/pot"; | ||
|
||
export enum ErrorType { | ||
"LOADING_ERROR" = "LOADING_ERROR", | ||
"LOGIN_ERROR" = "LOGIN_ERROR" | ||
} | ||
|
||
export type RequestInfoPositiveStates = { | ||
requestState: "LOADING" | "AUTHORIZED" | "AUTHORIZING"; | ||
nativeAttempts: number; | ||
}; | ||
|
||
export type RequestInfoError = { | ||
requestState: "ERROR"; | ||
errorType: ErrorType; | ||
errorCodeOrMessage?: string; | ||
nativeAttempts: number; | ||
}; | ||
|
||
export type NativeLoginRequestInfo = | ||
| RequestInfoPositiveStates | ||
| RequestInfoError; | ||
|
||
export type StandardLoginRequestInfo = { | ||
requestState: pot.Pot<true, ErrorType>; | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As above.