Page MenuHomePhorge
Files F32562467

D11738.1767339408.diff
No OneTemporary
Actions

Size
4 KB
Referenced Files
None
Subscribers
None

D11738.1767339408.diff
View Options

diff --git a/lib/actions/user-actions.js b/lib/actions/user-actions.js
--- a/lib/actions/user-actions.js
+++ b/lib/actions/user-actions.js
@@ -852,8 +852,6 @@
return { updates };
};
-const setAccessTokenActionType = 'SET_ACCESS_TOKEN';
-
export {
changeKeyserverUserPasswordActionTypes,
changeKeyserverUserPassword,
@@ -886,7 +884,6 @@
policyAcknowledgmentActionTypes,
updateUserAvatarActionTypes,
updateUserAvatar,
- setAccessTokenActionType,
deleteAccountActionTypes,
useDeleteAccount,
keyserverAuthActionTypes,
diff --git a/lib/reducers/master-reducer.js b/lib/reducers/master-reducer.js
--- a/lib/reducers/master-reducer.js
+++ b/lib/reducers/master-reducer.js
@@ -19,7 +19,6 @@
import reduceBaseNavInfo from './nav-reducer.js';
import policiesReducer from './policies-reducer.js';
import reduceReportStore from './report-store-reducer.js';
-import reduceServicesAccessToken from './services-access-token-reducer.js';
import { reduceSyncedMetadataStore } from './synced-metadata-reducer.js';
import reduceGlobalThemeInfo from './theme-reducer.js';
import { reduceThreadActivity } from './thread-activity-reducer.js';
@@ -206,10 +205,6 @@
reportStore,
dataLoaded: reduceDataLoaded(state.dataLoaded, action),
userPolicies: policiesReducer(state.userPolicies, action),
- commServicesAccessToken: reduceServicesAccessToken(
- state.commServicesAccessToken,
- action,
- ),
inviteLinksStore: reduceInviteLinks(state.inviteLinksStore, action),
keyserverStore,
integrityStore,
diff --git a/lib/reducers/services-access-token-reducer.js b/lib/reducers/services-access-token-reducer.js
deleted file mode 100644
--- a/lib/reducers/services-access-token-reducer.js
+++ /dev/null
@@ -1,14 +0,0 @@
-// @flow
-
-import { setAccessTokenActionType } from '../actions/user-actions.js';
-import type { BaseAction } from '../types/redux-types.js';
-
-export default function reduceServicesAccessToken(
- state: ?string,
- action: BaseAction,
-): ?string {
- if (action.type === setAccessTokenActionType) {
- return action.payload;
- }
- return state;
-}
diff --git a/lib/types/redux-types.js b/lib/types/redux-types.js
--- a/lib/types/redux-types.js
+++ b/lib/types/redux-types.js
@@ -1333,10 +1333,6 @@
+payload: Error,
+loadingInfo: LoadingInfo,
}
- | {
- +type: 'SET_ACCESS_TOKEN',
- +payload: ?string,
- }
| {
+type: 'UPDATE_THREAD_LAST_NAVIGATED',
+payload: { +threadID: string, +time: number },
diff --git a/native/components/access-token-handler.react.js b/native/components/access-token-handler.react.js
--- a/native/components/access-token-handler.react.js
+++ b/native/components/access-token-handler.react.js
@@ -2,12 +2,12 @@
import * as React from 'react';
-import { setAccessTokenActionType } from 'lib/actions/user-actions.js';
import type { UserAuthMetadata } from 'lib/types/identity-service-types.js';
import { useDispatch } from 'lib/utils/redux-utils.js';
import { getCommServicesAuthMetadataEmitter } from '../event-emitters/csa-auth-metadata-emitter.js';
import { commCoreModule } from '../native-modules.js';
+import { setAccessTokenActionType } from '../redux/action-types.js';
function AccessTokenHandler(): React.Node {
const dispatch = useDispatch();
diff --git a/native/redux/action-types.js b/native/redux/action-types.js
--- a/native/redux/action-types.js
+++ b/native/redux/action-types.js
@@ -19,6 +19,7 @@
export const setStoreLoadedActionType = 'SET_STORE_LOADED';
export const setReduxStateActionType = 'SET_REDUX_STATE';
export const setLocalSettingsActionType = 'SET_LOCAL_SETTINGS';
+export const setAccessTokenActionType = 'SET_ACCESS_TOKEN';
export const backgroundActionTypes: Set<string> = new Set([
saveMessagesActionType,
@@ -56,6 +57,7 @@
| {
+type: 'SET_STORE_LOADED',
}
- | { +type: 'SET_LOCAL_SETTINGS', +payload: LocalSettings },
+ | { +type: 'SET_LOCAL_SETTINGS', +payload: LocalSettings }
+ | { +type: 'SET_ACCESS_TOKEN', +payload: ?string },
},
>;
diff --git a/native/redux/redux-setup.js b/native/redux/redux-setup.js
--- a/native/redux/redux-setup.js
+++ b/native/redux/redux-setup.js
@@ -45,6 +45,7 @@
type Action,
setLocalSettingsActionType,
} from './action-types.js';
+import { setAccessTokenActionType } from './action-types.js';
import { defaultState } from './default-state.js';
import { remoteReduxDevServerConfig } from './dev-tools.js';
import { persistConfig, setPersistor } from './persist.js';
@@ -229,6 +230,8 @@
...state,
localSettings: { ...state.localSettings, ...action.payload },
};
+ } else if (action.type === setAccessTokenActionType) {
+ return { ...state, commServicesAccessToken: action.payload };
}
if (action.type === setNewSessionActionType) {

File Metadata

Mime Type
text/plain
Expires
Fri, Jan 2, 7:36 AM (4 h, 35 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5878698
Default Alt Text
D11738.1767339408.diff (4 KB)

Event Timeline