mobile: fix cannot read property 'groupBy' of undefined

apps/desktop/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@notesnook/desktop",
-  "version": "3.0.4",
+  "version": "3.0.3",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@notesnook/desktop",
-      "version": "3.0.4",
+      "version": "3.0.3",
       "hasInstallScript": true,
       "license": "GPL-3.0-or-later",
       "dependencies": {

apps/desktop/package.json

@@ -2,7 +2,7 @@
   "name": "@notesnook/desktop",
   "productName": "Notesnook",
   "description": "Your private note taking space",
-  "version": "3.0.4",
+  "version": "3.0.3",
   "appAppleId": "1544027013",
   "private": true,
   "main": "./dist/index.js",

apps/mobile/app/components/sheets/sort/index.js

@@ -86,16 +86,16 @@ const Sort = ({ type, screen }) => {
         <Button
           title={
             groupOptions?.sortDirection === "asc"
-              ? groupOptions.groupBy === "abc" ||
-                groupOptions.sortBy === "title"
+              ? groupOptions?.groupBy === "abc" ||
+                groupOptions?.sortBy === "title"
                 ? "A - Z"
-                : groupOptions.sortBy === "dueDate"
+                : groupOptions?.sortBy === "dueDate"
                 ? "Earliest first"
                 : "Old - New"
-              : groupOptions.groupBy === "abc" ||
-                groupOptions.sortBy === "title"
+              : groupOptions?.groupBy === "abc" ||
+                groupOptions?.sortBy === "title"
               ? "Z - A"
-              : groupOptions.sortBy === "dueDate"
+              : groupOptions?.sortBy === "dueDate"
               ? "Latest first"
               : "New - Old"
           }
@@ -134,7 +134,7 @@ const Sort = ({ type, screen }) => {
           alignItems: "center"
         }}
       >
-        {groupOptions.groupBy === "abc" ? (
+        {groupOptions?.groupBy === "abc" ? (
           <Button
             type="secondary"
             title="Title"
@@ -154,18 +154,18 @@ const Sort = ({ type, screen }) => {
               item === "dateEdited") ? null : (
               <Button
                 key={item}
-                type={groupOptions.sortBy === item ? "selected" : "plain"}
+                type={groupOptions?.sortBy === item ? "selected" : "plain"}
                 title={SORT[item]}
                 height={40}
                 iconPosition="left"
-                icon={groupOptions.sortBy === item ? "check" : null}
+                icon={groupOptions?.sortBy === item ? "check" : null}
                 style={{
                   marginRight: 10,
                   paddingHorizontal: 8
                 }}
                 buttonType={{
                   text:
-                    groupOptions.sortBy === item
+                    groupOptions?.sortBy === item
                       ? colors.primary.accent
                       : colors.secondary.paragraph
                 }}
@@ -213,11 +213,11 @@ const Sort = ({ type, screen }) => {
                 key={item}
                 testID={"btn-" + item}
                 type={
-                  groupOptions.groupBy === GROUP[item] ? "selected" : "plain"
+                  groupOptions?.groupBy === GROUP[item] ? "selected" : "plain"
                 }
                 buttonType={{
                   text:
-                    groupOptions.groupBy === GROUP[item]
+                    groupOptions?.groupBy === GROUP[item]
                       ? colors.primary.accent
                       : colors.secondary.paragraph
                 }}
@@ -235,7 +235,7 @@ const Sort = ({ type, screen }) => {
                   updateGroupOptions(_groupOptions);
                 }}
                 height={40}
-                icon={groupOptions.groupBy === GROUP[item] ? "check" : null}
+                icon={groupOptions?.groupBy === GROUP[item] ? "check" : null}
                 title={
                   item.slice(0, 1).toUpperCase() + item.slice(1, item.length)
                 }

apps/web/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@notesnook/web",
-  "version": "3.0.4",
+  "version": "3.0.3",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@notesnook/web",
-      "version": "3.0.4",
+      "version": "3.0.3",
       "hasInstallScript": true,
       "license": "GPL-3.0-or-later",
       "dependencies": {

apps/web/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@notesnook/web",
   "description": "Your private note taking space",
-  "version": "3.0.4",
+  "version": "3.0.3",
   "private": true,
   "main": "./src/app.js",
   "homepage": "https://notesnook.com/",

packages/core/src/api/mfa-manager.ts

@@ -92,10 +92,7 @@ class MFAManager {
   }
 
   async sendCode(method: "sms" | "email") {
-    const token = await this.tokenManager.getAccessToken([
-      "IdentityServerApi",
-      "auth:grant_types:mfa"
-    ]);
+    const token = await this.tokenManager.getAccessToken();
     if (!token) throw new Error("Unauthorized.");
 
     return await http.post(

packages/core/src/api/token-manager.ts

@@ -32,15 +32,6 @@ export type Token = {
   refresh_token: string;
 };
 
-type Scope = (typeof SCOPES)[number];
-
-const SCOPES = [
-  "notesnook.sync",
-  "offline_access",
-  "IdentityServerApi",
-  "auth:grant_types:mfa",
-  "auth:grant_types:mfa_password"
-] as const;
 const ENDPOINTS = {
   token: "/connect/token",
   revoke: "/connect/revocation",
@@ -88,14 +79,10 @@ class TokenManager {
     return scopes.includes("offline_access") && Boolean(refresh_token);
   }
 
-  async getAccessToken(
-    scopes: Scope[] = ["notesnook.sync", "IdentityServerApi"],
-    forceRenew = false
-  ) {
+  async getAccessToken(forceRenew = false) {
     return await getSafeToken(async () => {
       const token = await this.getToken(true, forceRenew);
-      if (!token) return;
-      if (!scopes.some((s) => token.scope.includes(s))) return;
+      if (!token || token.scope.includes("auth:grant_types")) return;
       return token.access_token;
     }, "Error getting access token:");
   }

packages/core/src/api/user-manager.ts

@@ -191,7 +191,7 @@ class UserManager {
         username: email,
         password: hashedPassword,
         grant_type: code ? "mfa" : "password",
-        scope: "notesnook.sync offline_access IdentityServerApi",
+        scope: "notesnook.sync offline_access openid IdentityServerApi",
         client_id: "notesnook",
         "mfa:code": code,
         "mfa:method": method