Typing fixes - the addon compiles now

Author: dfahlander

addons/dexie-cloud/src/authentication/authenticate.ts

@@ -42,7 +42,7 @@ export async function loadAccessToken(
       throw new Error(`Refresh token has expired`);
   }
   const refreshedLogin = await refreshAccessToken(
-    db.cloud.options.databaseUrl,
+    db.cloud.options!.databaseUrl,
     db.cloud.currentUser.value
   );
   await db.table("$logins").update(claims.sub, {

addons/dexie-cloud/src/authentication/login.ts

@@ -4,16 +4,16 @@ import { AuthPersistedContext } from "./AuthPersistedContext";
 import { setCurrentUser } from "./setCurrentUser";
 
 export async function login(db: DexieCloudDB) {
-  if (db.cloud.currentUser.isLoggedIn) return;
+  if (db.cloud.currentUser.value.isLoggedIn) return;
   const context = new AuthPersistedContext(db, {
     claims: {},
     lastLogin: new Date(0),
   });
   await authenticate(
-    db.cloud.options.databaseUrl,
+    db.cloud.options!.databaseUrl,
     context,
     dummyAuthDialog, // TODO: Fixthis!
-    db.cloud.options.fetchTokens
+    db.cloud.options!.fetchTokens
   );
   await context.save();
   await setCurrentUser(db, context);

addons/dexie-cloud/src/authentication/setCurrentUser.ts

@@ -21,18 +21,18 @@ import { getNumUnsyncedMutationsObservable } from "../sync/numUnsyncedMutations"
  * @param newUser 
  */
 export async function setCurrentUser(db: DexieCloudDB, user: AuthPersistedContext) {
-  const currentUserObservable = db.cloud.currentUserObservable;
+  const currentUserObservable = db.cloud.currentUser;
   if (!currentUserObservable)
     throw new Error(`Given Dexie instance doesn't have the dexie-cloud addon.`);
-  if (user.userId === db.cloud.currentUser.userId) return; // Already this user.
+  if (user.userId === db.cloud.currentUserId) return; // Already this user.
 
   // Yes, I know, we're calling authenticate() again (if you were following login.ts and came here.)
   // But this function can also be called from db.ready!
   const authenticationPromise = authenticate(
-    db.cloud.options.databaseUrl,
+    db.cloud.options!.databaseUrl,
     user,
     dummyAuthDialog, // TODO: Fixthis!
-    db.cloud.options.fetchTokens
+    db.cloud.options!.fetchTokens
   ); 
 
   // Wait til all readwrite transactions have ended and there is nothing more to sync
@@ -44,7 +44,7 @@ export async function setCurrentUser(db: DexieCloudDB, user: AuthPersistedContex
   const safeToChangeUser = outstandingTxAndUnsyncedChangesCombo.pipe(
     filter(
       ([txSet, numOps]) =>
-        makeArray(txSet.values()).every((tx) => tx.db !== db.backendDB()) &&
+        makeArray(txSet.values()).every((tx) => tx.db !== db.dx.backendDB()) &&
         numOps === 0
     )
   );

addons/dexie-cloud/src/default-ui/Styles.ts

@@ -1,5 +1,6 @@
-export const Styles: { [styleAlias: string]: Partial<CSSStyleDeclaration> } = {
+export const Styles: { [styleAlias: string]: Partial<CSSStyleDeclaration> | any} = {
   Error: {
     color: "red",
   },
+  DialogOuter: {}
 };

addons/dexie-cloud/src/default-ui/index.tsx

@@ -19,7 +19,7 @@ export default class LoginGui extends Component<Props, LoginState> {
   }
 
   componentDidMount() {
-    this.subscription = from(this.props.db.cloud.loginStateObservable).subscribe({
+    this.subscription = from(this.props.db.cloud.loginState).subscribe({
       next: (state) => this.setState(state),
       error: (error) =>
         this.setState({ type: "error", message: error?.message || error }),

addons/dexie-cloud/test/unit/test-dexie-cloud-client.ts

@@ -19,14 +19,10 @@ db.version(1).stores({
 
 
 promisedTest("basic-test", async ()=>{
-  await new Dexie("argur", {addons: []}).delete();
-  await db.cloud.configure({
+  await Dexie.delete(db.name);
+  db.cloud.configure({
     databaseUrl: "http://localhost:3000/z8qgl998z",
     requireAuth: true
-  }).then(x => {
-    console.log("db.cloud configure succeeded");
-  }).catch(error => {
-    console.log("db.cloud.configure failed");
   });
   console.log("Waiting for open to resolve");
   await db.open();