Completely remove EteSync dependency.
Tom Hacohen
4 years ago
parent
8fb50df017
commit
4047638e6f
@ -1,47 +0,0 @@
|
||||
// SPDX-FileCopyrightText: © 2017 EteSync Authors
|
||||
// SPDX-License-Identifier: AGPL-3.0-only
|
||||
|
||||
import { shallowEqual, useSelector } from "react-redux";
|
||||
import { createSelector } from "reselect";
|
||||
|
||||
import * as store from "../store";
|
||||
|
||||
export const remoteCredentialsSelector = createSelector(
|
||||
(state: store.StoreState) => state.credentials.credentials,
|
||||
(state: store.StoreState) => state.credentials.serviceApiUrl,
|
||||
(credentials, serviceApiUrl) => {
|
||||
if (!credentials) {
|
||||
return null;
|
||||
}
|
||||
|
||||
const ret: store.CredentialsDataRemote = {
|
||||
credentials,
|
||||
serviceApiUrl,
|
||||
};
|
||||
return ret;
|
||||
}
|
||||
);
|
||||
|
||||
export function useRemoteCredentials() {
|
||||
return useSelector(remoteCredentialsSelector, shallowEqual);
|
||||
}
|
||||
|
||||
export const credentialsSelector = createSelector(
|
||||
(state: store.StoreState) => remoteCredentialsSelector(state),
|
||||
(state: store.StoreState) => state.encryptionKey.key,
|
||||
(remoteCredentials, encryptionKey) => {
|
||||
if (!remoteCredentials || !encryptionKey) {
|
||||
return null;
|
||||
}
|
||||
|
||||
const ret: store.CredentialsData = {
|
||||
...remoteCredentials,
|
||||
encryptionKey,
|
||||
};
|
||||
return ret;
|
||||
}
|
||||
);
|
||||
|
||||
export function useCredentials() {
|
||||
return useSelector(credentialsSelector, shallowEqual);
|
||||
}
|
||||
@ -1,53 +0,0 @@
|
||||
// SPDX-FileCopyrightText: © 2017 EteSync Authors
|
||||
// SPDX-License-Identifier: AGPL-3.0-only
|
||||
|
||||
import { addEntries, fetchEntries } from "./actions";
|
||||
import { entries, EntriesData } from "./reducers";
|
||||
|
||||
import { Map } from "immutable";
|
||||
|
||||
import * as EteSync from "etesync";
|
||||
|
||||
it("Entries reducer", () => {
|
||||
const jId = "24324324324";
|
||||
let state = Map({}) as EntriesData;
|
||||
|
||||
const entry = new EteSync.Entry();
|
||||
entry.deserialize({
|
||||
content: "someContent",
|
||||
uid: "6355209e2a2c26a6c1e6e967c2032737d538f602cf912474da83a2902f8a0a83",
|
||||
});
|
||||
|
||||
const action = {
|
||||
type: fetchEntries.toString(),
|
||||
meta: { journal: jId, prevUid: null as string | null },
|
||||
payload: [entry],
|
||||
};
|
||||
|
||||
let journal;
|
||||
let entry2;
|
||||
|
||||
state = entries(state, action as any);
|
||||
journal = state.get(jId)!;
|
||||
entry2 = journal.get(0)!;
|
||||
expect(entry2.serialize()).toEqual(entry.serialize());
|
||||
|
||||
// We replace if there's no prevUid
|
||||
state = entries(state, action as any);
|
||||
journal = state.get(jId)!;
|
||||
entry2 = journal.get(0)!;
|
||||
expect(entry2.serialize()).toEqual(entry.serialize());
|
||||
expect(journal.size).toBe(1);
|
||||
|
||||
// We extend if prevUid is set
|
||||
action.meta.prevUid = entry.uid;
|
||||
state = entries(state, action as any);
|
||||
journal = state.get(jId)!;
|
||||
expect(journal.size).toBe(2);
|
||||
|
||||
// Creating entries should also work the same
|
||||
action.type = addEntries.toString();
|
||||
state = entries(state, action as any);
|
||||
journal = state.get(jId)!;
|
||||
expect(journal.size).toBe(3);
|
||||
});
|
||||
@ -1,12 +1,7 @@
|
||||
// SPDX-FileCopyrightText: © 2017 EteSync Authors
|
||||
// SPDX-License-Identifier: AGPL-3.0-only
|
||||
|
||||
// SPDX-FileCopyrightText: © 2017 EteSync Authors
|
||||
// SPDX-License-Identifier: AGPL-3.0-only
|
||||
|
||||
// SPDX-FileCopyrightText: © 2019 EteSync Authors
|
||||
// SPDX-License-Identifier: GPL-3.0-only
|
||||
|
||||
import * as EteSync from "etesync";
|
||||
import * as Etebase from "etebase";
|
||||
|
||||
export const deriveKey = EteSync.deriveKey;
|
||||
export const login = Etebase.Account.login;
|
||||
export const signup = Etebase.Account.signup;
|
||||
|
||||
Loading…
Reference in New Issue