Bladeren bron

Merge pull request #137 from ente-io/error-hasSetKey-undefined

throw error if hasSetKey undefined
Neeraj Gupta 3 jaren geleden
bovenliggende
commit
b2d0d719bc
1 gewijzigde bestanden met toevoegingen van 8 en 0 verwijderingen
  1. 8 0
      src/services/userService.ts

+ 8 - 0
src/services/userService.ts

@@ -26,6 +26,8 @@ export interface RecoveryKey {
 }
 }
 const ENDPOINT = getEndpoint();
 const ENDPOINT = getEndpoint();
 
 
+const HAS_SET_KEYS = 'hasSetKeys';
+
 export interface User {
 export interface User {
     id: number;
     id: number;
     name: string;
     name: string;
@@ -133,6 +135,9 @@ export const clearFiles = async () => {
 
 
 export const isTokenValid = async () => {
 export const isTokenValid = async () => {
     try {
     try {
+        if (!getToken()) {
+            return false;
+        }
         const resp = await HTTPService.get(
         const resp = await HTTPService.get(
             `${ENDPOINT}/users/session-validity/v2`,
             `${ENDPOINT}/users/session-validity/v2`,
             null,
             null,
@@ -141,6 +146,9 @@ export const isTokenValid = async () => {
             }
             }
         );
         );
         try {
         try {
+            if (resp.data[HAS_SET_KEYS] === undefined) {
+                throw Error('resp.data.hasSetKey undefined');
+            }
             if (!resp.data['hasSetKeys']) {
             if (!resp.data['hasSetKeys']) {
                 try {
                 try {
                     await putAttributes(
                     await putAttributes(