Merge pull request #92 from getamis/ASL-5124/add-phone-field-in-qubic…

…-user

[ASL-5124] add phone field in qubic user

package.json

@@ -30,7 +30,6 @@
     "tslib": "^2.6.0"
   },
   "scripts": {
-    "deploy:payment:dev": "yarn workspace @qubic-connect/payment-form-web deploy:dev",
     "build": "lerna run build --scope={'@qubic-connect/redirect,@qubic-connect/detect-iab,@qubic-connect/core'}",
     "watch": "lerna run watch --scope={'@qubic-connect/redirect,@qubic-connect/detect-iab,@qubic-connect/core'}",
     "release": "npm run build && lerna publish --force-publish",
@@ -49,4 +48,4 @@
     "url": "https://github.com/getamis/qubic-creator-sdk/issues"
   },
   "homepage": "https://github.com/getamis/qubic-creator-sdk#readme"
-}
+}

packages/core/src/QubicConnect.ts

@@ -75,9 +75,6 @@ export class QubicConnect {
         // user did not install metamask
         return;
       }
-      if (!providerOptions.metamask.provider.isMetaMask) {
-        throw Error('metamask only accept MetaMask provider');
-      }
     }
 
     if (providerOptions.walletconnect) {
@@ -194,11 +191,14 @@ export class QubicConnect {
         provider,
         ...restUser
       } = user;
+
+      // do not saved sensitive user data
+      restUser.qubicUser = null;
       localStorage.setItem(USER_STORAGE_KEY, JSON.stringify(restUser));
     }
   }
 
-  private hydrateUser() {
+  private async hydrateUser() {
     const saved = localStorage.getItem(USER_STORAGE_KEY);
     if (!saved) return;
     try {
@@ -211,8 +211,14 @@ export class QubicConnect {
       if (QubicConnect.ifTokenExpired(user.expiredAt)) {
         this.handleLogout(null);
       } else {
+        // login again to get qubicUser data if exists
+        const {
+          me: { qubicUser },
+        } = await getMe(this.marketRequestGraphql);
+
         this.handleLogin(null, {
           ...user,
+          qubicUser,
           provider,
         });
       }

packages/core/src/api/me.ts

@@ -16,6 +16,7 @@ export const GET_ME = gql`
       qubicUser {
         provider
         email
+        phone
       }
     }
   }

packages/core/src/types/QubicUser.ts

@@ -9,4 +9,5 @@ export enum QubicUserProvider {
 export interface QubicUser {
   provider: QubicUserProvider;
   email: string;
+  phone: string | null;
 }