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

redirect Anon user to sign in page on shortcut use #29323

Merged
merged 4 commits into from
Oct 25, 2023
Merged

redirect Anon user to sign in page on shortcut use #29323

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6b8bdc0
redirect anon user to sign in page on shortcut use
kushu7 Oct 11, 2023
51ce9ab
merged main
kushu7 Oct 12, 2023
7a62bb1
Merge remote-tracking branch 'origin/main' into fix-28249-anonymous-s…
kushu7 Oct 22, 2023
8fad6f3
Merge remote-tracking branch 'origin/main' into fix-28249-anonymous-s…
kushu7 Oct 23, 2023
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
4 changes: 2 additions & 2 deletions src/libs/Navigation/AppNavigator/AuthScreens.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ class AuthScreens extends React.Component {
this.unsubscribeSearchShortcut = KeyboardShortcut.subscribe(
searchShortcutConfig.shortcutKey,
() => {
Modal.close(() => Navigation.navigate(ROUTES.SEARCH));
Modal.close(Session.checkIfActionIsAllowed(() => Navigation.navigate(ROUTES.SEARCH)));
},
searchShortcutConfig.descriptionKey,
searchShortcutConfig.modifiers,
Expand All @@ -229,7 +229,7 @@ class AuthScreens extends React.Component {
this.unsubscribeChatShortcut = KeyboardShortcut.subscribe(
chatShortcutConfig.shortcutKey,
() => {
Modal.close(() => Navigation.navigate(ROUTES.NEW));
Modal.close(Session.checkIfActionIsAllowed(() => Navigation.navigate(ROUTES.NEW)));
},
chatShortcutConfig.descriptionKey,
chatShortcutConfig.modifiers,
Expand Down
3 changes: 3 additions & 0 deletions src/libs/actions/Session/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,9 @@ function signOutAndRedirectToSignIn() {
signOut();
redirectToSignIn();
} else {
if (Navigation.isActiveRoute(ROUTES.SIGN_IN_MODAL)) {
return;
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kushu7 This file is migrated into .ts

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@0xmiroslav conflicts resolved

cc @AndrewGable

Navigation.navigate(ROUTES.SIGN_IN_MODAL);
Linking.getInitialURL().then((url) => {
const reportID = ReportUtils.getReportIDFromLink(url);
Expand Down