Page MenuHomePhabricator
Differential D12972

[identity] Add config for Backup service URL
ClosedPublic
Actions

Authored by bartek on Aug 5 2024, 4:51 AM.
Tags
None
Referenced Files
Unknown Object (File)
Wed, Mar 19, 3:38 PM
Unknown Object (File)
Sat, Mar 15, 3:18 AM
Unknown Object (File)
Feb 17 2025, 10:35 AM
Unknown Object (File)
Feb 17 2025, 10:35 AM
Unknown Object (File)
Feb 17 2025, 10:34 AM
Unknown Object (File)
Feb 17 2025, 10:34 AM
Unknown Object (File)
Jan 18 2025, 12:16 AM
Unknown Object (File)
Jan 17 2025, 10:13 AM
View All 63 Files
Subscribers
ashoat
tomek

Details

Reviewers
varun
will
kamil
Commits
rCOMM2d7fe04ffc52: [identity] Add config for Backup service URL
Summary

Add Backup service URL to Identity config, to let Identity call Backup endpoints

Depends on D12971

Test Plan

Cargo build. Played with clap CLI args in the Terminal

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Revision Contents
Changeset List

PathSize
services/
identity/
src/
17 lines
4 lines

Diff 43125

View Options

services/identity/src/config.rs

Show All 15 Linesimport {
cookieSelector, cookieSelector,
deviceTokenSelector, deviceTokenSelector,
} from '../selectors/keyserver-selectors.js'; } from '../selectors/keyserver-selectors.js';
import { isLoggedInToKeyserver } from '../selectors/user-selectors.js'; import { isLoggedInToKeyserver } from '../selectors/user-selectors.js';
import { IdentityClientContext } from '../shared/identity-client-context.js'; import { IdentityClientContext } from '../shared/identity-client-context.js';
import { OlmSessionCreatorContext } from '../shared/olm-session-creator-context.js'; import { OlmSessionCreatorContext } from '../shared/olm-session-creator-context.js';
import type { BaseSocketProps } from '../socket/socket.react.js'; import type { BaseSocketProps } from '../socket/socket.react.js';
import { logInActionSources } from '../types/account-types.js'; import { logInActionSources } from '../types/account-types.js';
import { authoritativeKeyserverID } from '../utils/authoritative-keyserver.js';
import { useDispatchActionPromise } from '../utils/redux-promise-utils.js'; import { useDispatchActionPromise } from '../utils/redux-promise-utils.js';
import { useSelector } from '../utils/redux-utils.js'; import { useSelector } from '../utils/redux-utils.js';
import { usingCommServicesAccessToken } from '../utils/services-utils.js'; import { usingCommServicesAccessToken } from '../utils/services-utils.js';
import sleep from '../utils/sleep.js'; import sleep from '../utils/sleep.js';
import { ashoatKeyserverID } from '../utils/validation-utils.js';
type Props = { type Props = {
...BaseSocketProps, ...BaseSocketProps,
+socketComponent: React.ComponentType<BaseSocketProps>, +socketComponent: React.ComponentType<BaseSocketProps>,
}; };
const AUTH_RETRY_DELAY_MS = 60000; const AUTH_RETRY_DELAY_MS = 60000;
const CANCELLED_ERROR = 'cancelled'; const CANCELLED_ERROR = 'cancelled';
Show All 13 Linesfunction KeyserverConnectionHandler(props: Props) {
const dataLoaded = useSelector(state => state.dataLoaded); const dataLoaded = useSelector(state => state.dataLoaded);
const keyserverDeviceToken = useSelector(deviceTokenSelector(keyserverID)); const keyserverDeviceToken = useSelector(deviceTokenSelector(keyserverID));
// We have an assumption that we should be always connected to Ashoat's // We have an assumption that we should be always connected to Ashoat's
// keyserver. It is possible that a token which it has is correct, so we can // keyserver. It is possible that a token which it has is correct, so we can
// try to use it. In worst case it is invalid and our push-handler will try // try to use it. In worst case it is invalid and our push-handler will try
// to fix it. // to fix it.
const ashoatKeyserverDeviceToken = useSelector( const ashoatKeyserverDeviceToken = useSelector(
deviceTokenSelector(ashoatKeyserverID), deviceTokenSelector(authoritativeKeyserverID()),
); );
const deviceToken = keyserverDeviceToken ?? ashoatKeyserverDeviceToken; const deviceToken = keyserverDeviceToken ?? ashoatKeyserverDeviceToken;
const navInfo = useSelector(state => state.navInfo); const navInfo = useSelector(state => state.navInfo);
const calendarFilters = useSelector(state => state.calendarFilters); const calendarFilters = useSelector(state => state.calendarFilters);
const calendarQuery = React.useMemo(() => { const calendarQuery = React.useMemo(() => {
const filters = filterThreadIDsInFilterList( const filters = filterThreadIDsInFilterList(
calendarFilters, calendarFilters,
▲ Show 20 Lines • Show All 94 Lines • ▼ Show 20 Lines const promise = (async () => {
return; return;
} }
console.log( console.log(
`Error while authenticating to keyserver with id ${keyserverID}`, `Error while authenticating to keyserver with id ${keyserverID}`,
e, e,
); );
if (!dataLoaded && keyserverID === ashoatKeyserverID) { if (!dataLoaded && keyserverID === authoritativeKeyserverID()) {
await dispatchActionPromise(logOutActionTypes, callLogOut()); await dispatchActionPromise(logOutActionTypes, callLogOut());
} }
} finally { } finally {
if (!cancelled) { if (!cancelled) {
await sleep(AUTH_RETRY_DELAY_MS); await sleep(AUTH_RETRY_DELAY_MS);
setAuthInProgress(false); setAuthInProgress(false);
} }
} }
▲ Show 20 Lines • Show All 41 Lines • ▼ Show 20 Lines React.useEffect(() => {
if (authInProgress) { if (authInProgress) {
return; return;
} }
const [, cancel] = performAuth(); const [, cancel] = performAuth();
cancelPendingAuth.current = cancel; cancelPendingAuth.current = cancel;
}, [authInProgress, hasAccessToken, isUserAuthenticated, performAuth]); }, [authInProgress, hasAccessToken, isUserAuthenticated, performAuth]);
if (keyserverID !== ashoatKeyserverID) { if (keyserverID !== authoritativeKeyserverID()) {
return null; return null;
} }
return <Socket {...socketProps} />; return <Socket {...socketProps} />;
} }
const Handler: React.ComponentType<Props> = React.memo<Props>( const Handler: React.ComponentType<Props> = React.memo<Props>(
KeyserverConnectionHandler, KeyserverConnectionHandler,
); );
export default Handler; export default Handler;
View Options

services/identity/src/constants.rs

Show All 15 Linesimport {
cookieSelector, cookieSelector,
deviceTokenSelector, deviceTokenSelector,
} from '../selectors/keyserver-selectors.js'; } from '../selectors/keyserver-selectors.js';
import { isLoggedInToKeyserver } from '../selectors/user-selectors.js'; import { isLoggedInToKeyserver } from '../selectors/user-selectors.js';
import { IdentityClientContext } from '../shared/identity-client-context.js'; import { IdentityClientContext } from '../shared/identity-client-context.js';
import { OlmSessionCreatorContext } from '../shared/olm-session-creator-context.js'; import { OlmSessionCreatorContext } from '../shared/olm-session-creator-context.js';
import type { BaseSocketProps } from '../socket/socket.react.js'; import type { BaseSocketProps } from '../socket/socket.react.js';
import { logInActionSources } from '../types/account-types.js'; import { logInActionSources } from '../types/account-types.js';
import { authoritativeKeyserverID } from '../utils/authoritative-keyserver.js';
import { useDispatchActionPromise } from '../utils/redux-promise-utils.js'; import { useDispatchActionPromise } from '../utils/redux-promise-utils.js';
import { useSelector } from '../utils/redux-utils.js'; import { useSelector } from '../utils/redux-utils.js';
import { usingCommServicesAccessToken } from '../utils/services-utils.js'; import { usingCommServicesAccessToken } from '../utils/services-utils.js';
import sleep from '../utils/sleep.js'; import sleep from '../utils/sleep.js';
import { ashoatKeyserverID } from '../utils/validation-utils.js';
type Props = { type Props = {
...BaseSocketProps, ...BaseSocketProps,
+socketComponent: React.ComponentType<BaseSocketProps>, +socketComponent: React.ComponentType<BaseSocketProps>,
}; };
const AUTH_RETRY_DELAY_MS = 60000; const AUTH_RETRY_DELAY_MS = 60000;
const CANCELLED_ERROR = 'cancelled'; const CANCELLED_ERROR = 'cancelled';
Show All 13 Linesfunction KeyserverConnectionHandler(props: Props) {
const dataLoaded = useSelector(state => state.dataLoaded); const dataLoaded = useSelector(state => state.dataLoaded);
const keyserverDeviceToken = useSelector(deviceTokenSelector(keyserverID)); const keyserverDeviceToken = useSelector(deviceTokenSelector(keyserverID));
// We have an assumption that we should be always connected to Ashoat's // We have an assumption that we should be always connected to Ashoat's
// keyserver. It is possible that a token which it has is correct, so we can // keyserver. It is possible that a token which it has is correct, so we can
// try to use it. In worst case it is invalid and our push-handler will try // try to use it. In worst case it is invalid and our push-handler will try
// to fix it. // to fix it.
const ashoatKeyserverDeviceToken = useSelector( const ashoatKeyserverDeviceToken = useSelector(
deviceTokenSelector(ashoatKeyserverID), deviceTokenSelector(authoritativeKeyserverID()),
); );
const deviceToken = keyserverDeviceToken ?? ashoatKeyserverDeviceToken; const deviceToken = keyserverDeviceToken ?? ashoatKeyserverDeviceToken;
const navInfo = useSelector(state => state.navInfo); const navInfo = useSelector(state => state.navInfo);
const calendarFilters = useSelector(state => state.calendarFilters); const calendarFilters = useSelector(state => state.calendarFilters);
const calendarQuery = React.useMemo(() => { const calendarQuery = React.useMemo(() => {
const filters = filterThreadIDsInFilterList( const filters = filterThreadIDsInFilterList(
calendarFilters, calendarFilters,
▲ Show 20 Lines • Show All 94 Lines • ▼ Show 20 Lines const promise = (async () => {
return; return;
} }
console.log( console.log(
`Error while authenticating to keyserver with id ${keyserverID}`, `Error while authenticating to keyserver with id ${keyserverID}`,
e, e,
); );
if (!dataLoaded && keyserverID === ashoatKeyserverID) { if (!dataLoaded && keyserverID === authoritativeKeyserverID()) {
await dispatchActionPromise(logOutActionTypes, callLogOut()); await dispatchActionPromise(logOutActionTypes, callLogOut());
} }
} finally { } finally {
if (!cancelled) { if (!cancelled) {
await sleep(AUTH_RETRY_DELAY_MS); await sleep(AUTH_RETRY_DELAY_MS);
setAuthInProgress(false); setAuthInProgress(false);
} }
} }
▲ Show 20 Lines • Show All 41 Lines • ▼ Show 20 Lines React.useEffect(() => {
if (authInProgress) { if (authInProgress) {
return; return;
} }
const [, cancel] = performAuth(); const [, cancel] = performAuth();
cancelPendingAuth.current = cancel; cancelPendingAuth.current = cancel;
}, [authInProgress, hasAccessToken, isUserAuthenticated, performAuth]); }, [authInProgress, hasAccessToken, isUserAuthenticated, performAuth]);
if (keyserverID !== ashoatKeyserverID) { if (keyserverID !== authoritativeKeyserverID()) {
return null; return null;
} }
return <Socket {...socketProps} />; return <Socket {...socketProps} />;
} }
const Handler: React.ComponentType<Props> = React.memo<Props>( const Handler: React.ComponentType<Props> = React.memo<Props>(
KeyserverConnectionHandler, KeyserverConnectionHandler,
); );
export default Handler; export default Handler;