Merge pull request #43 from 8base/add-email-verified

ej9x · web-flow · commit c3f4de465f44 · 2020-09-28T13:27:40.000+03:00
feat: add isEmailVerified data
diff --git a/examples/with-api-token-app/package.json b/examples/with-api-token-app/package.json
@@ -4,7 +4,7 @@
   "private": true,
   "dependencies": {
     "8base-react-sdk": "^1.5.0",
-    "@8base/auth": "^1.3.2",
+    "@8base/auth": "^1.4.0",
     "apollo-client": "^2.6.3",
     "graphql": "^14.3.1",
     "react": "^16.8.6",
diff --git a/examples/with-authorization-app/package.json b/examples/with-authorization-app/package.json
@@ -4,7 +4,7 @@
   "private": true,
   "dependencies": {
     "8base-react-sdk": "^1.5.0",
-    "@8base/auth": "^1.3.2",
+    "@8base/auth": "^1.4.0",
     "apollo-client": "^2.6.3",
     "graphql": "^14.3.1",
     "react": "^16.8.6",
diff --git a/examples/with-protected-routes/package.json b/examples/with-protected-routes/package.json
@@ -4,7 +4,7 @@
   "private": true,
   "dependencies": {
     "8base-react-sdk": "^1.5.0",
-    "@8base/auth": "^1.3.2",
+    "@8base/auth": "^1.4.0",
     "apollo-client": "^2.6.3",
     "graphql": "^14.3.1",
     "react": "^16.8.6",
diff --git a/packages/app-provider/package.json b/packages/app-provider/package.json
@@ -21,15 +21,15 @@
   "dependencies": {
     "@8base-react/auth": "^1.5.0",
     "@8base-react/table-schema-provider": "^1.5.0",
-    "@8base/apollo-client": "^1.3.2",
-    "@8base/auth": "^1.3.2",
+    "@8base/apollo-client": "^1.4.0",
+    "@8base/auth": "^1.4.0",
     "@8base/error-codes": "^1.0.22",
-    "@8base/utils": "^1.3.2",
+    "@8base/utils": "^1.4.0",
     "apollo-cache-inmemory": "^1.5.1",
     "ramda": "^0.26.1"
   },
   "devDependencies": {
-    "@8base/web-auth0-auth-client": "^1.2.8",
+    "@8base/web-auth0-auth-client": "^1.4.0",
     "@types/graphql": "^0.13.0",
     "@types/jest": "^24.0.13",
     "@types/node": "^12.0.2",
diff --git a/packages/auth/package.json b/packages/auth/package.json
@@ -17,8 +17,8 @@
   },
   "dependencies": {
     "@8base-react/utils": "^1.5.0",
-    "@8base/auth": "^1.3.2",
-    "@8base/utils": "^1.3.2"
+    "@8base/auth": "^1.4.0",
+    "@8base/utils": "^1.4.0"
   },
   "devDependencies": {
     "@types/jest": "^24.0.13",
diff --git a/packages/auth/src/AuthContext.tsx b/packages/auth/src/AuthContext.tsx
@@ -4,6 +4,7 @@ import { ISubscribableAuthClient } from '@8base/auth';
 
 export type AuthContextProps = {
   isAuthorized: boolean;
+  isEmailVerified?: boolean;
   authState: IAuthState;
   authClient: ISubscribableAuthClient;
 };
diff --git a/packages/auth/src/AuthProvider.tsx b/packages/auth/src/AuthProvider.tsx
@@ -11,6 +11,7 @@ type AuthProviderProps = {
 
 type AuthProviderState = {
   isAuthorized: boolean;
+  isEmailVerified?: boolean;
   authState: IAuthState;
 };
 
@@ -54,8 +55,10 @@ class AuthProvider extends React.Component<AuthProviderProps, AuthProviderState>
 
     const authState = authClient.getState();
     const isAuthorized = authClient.checkIsAuthorized();
+    const isEmailVerified =
+      authClient.checkIsEmailVerified && (authClient.checkIsEmailVerified() as boolean | undefined);
 
-    this.setState({ isAuthorized, authState });
+    this.setState({ isAuthorized, isEmailVerified, authState });
   };
 
   public componentDidMount() {
@@ -82,14 +85,15 @@ class AuthProvider extends React.Component<AuthProviderProps, AuthProviderState>
 
   public render() {
     const { children, authClient } = this.props;
-    const { isAuthorized, authState } = this.state;
+    const { isAuthorized, isEmailVerified, authState } = this.state;
 
     return (
       <AuthContext.Provider
         value={{
           authClient,
           authState,
           isAuthorized,
+          isEmailVerified,
         }}
       >
         {children}
diff --git a/packages/auth/test/utils.ts b/packages/auth/test/utils.ts
@@ -46,7 +46,12 @@ export const DummyAuthClient = (): IAuthClient => {
     return externalAuth.logout();
   });
 
+  const getTokenInfo = jest.fn(() => {
+    return {};
+  });
+
   return {
+    getTokenInfo,
     getState,
     setState,
     purgeState,
diff --git a/packages/crud/package.json b/packages/crud/package.json
@@ -21,7 +21,7 @@
     "@8base-react/permissions-provider": "^1.5.0",
     "@8base-react/table-schema-provider": "^1.5.0",
     "@8base/schema-name-generator": "^0.1.21",
-    "@8base/utils": "^1.3.2",
+    "@8base/utils": "^1.4.0",
     "graphql-tag": "^2.10.0",
     "ramda": "^0.26.1"
   },
diff --git a/packages/forms/package.json b/packages/forms/package.json
@@ -22,8 +22,8 @@
     "@8base-react/permissions-provider": "^1.5.0",
     "@8base-react/table-schema-provider": "^1.5.0",
     "@8base/error-codes": "^1.0.22",
-    "@8base/utils": "^1.3.2",
-    "@8base/validate": "^1.3.2",
+    "@8base/utils": "^1.4.0",
+    "@8base/validate": "^1.4.0",
     "final-form": "^4.20.1",
     "final-form-arrays": "^3.0.2",
     "graphql-tag": "^2.10.0",
diff --git a/packages/table-schema-provider/package.json b/packages/table-schema-provider/package.json
@@ -20,7 +20,7 @@
   },
   "dependencies": {
     "@8base-react/utils": "^1.5.0",
-    "@8base/utils": "^1.3.2",
+    "@8base/utils": "^1.4.0",
     "graphql-tag": "^2.10.0",
     "ramda": "^0.26.1"
   },
diff --git a/yarn.lock b/yarn.lock
@@ -2,20 +2,21 @@
 # yarn lockfile v1
 
 
-"@8base/api-token-auth-client@^1.3.2":
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/@8base/api-token-auth-client/-/api-token-auth-client-1.3.2.tgz#5c6fcb7f1efb9027bb8c20fac128c837d43e573f"
-  integrity sha512-eabWq9v7oZQL4MJvvv84/qo43kpqkhJJ/OhpH+ohW1x3q3NKqN45Gl3K9q1KuYftcIjgf2XGwVa1VbpLu2qB4A==
+"@8base/api-token-auth-client@^1.4.0":
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/@8base/api-token-auth-client/-/api-token-auth-client-1.4.0.tgz#c99b452ba81ad76aef5112c3c166cd317de840aa"
+  integrity sha512-Sqv+8k4IMkEpT3AfI8L0HMxaGB8zwolQu/PJ13y/E86idd6yA6RQJgUkTknod0x5aQwjm3ObXdK4kR3cYRzq7g==
   dependencies:
-    "@8base/utils" "^1.3.2"
+    "@8base/utils" "^1.4.0"
+    jwt-decode "^3.0.0-beta.2"
 
-"@8base/apollo-client@^1.3.2":
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/@8base/apollo-client/-/apollo-client-1.3.2.tgz#c24aeafe130dbb50dec2bef035feb4470ee05b62"
-  integrity sha512-lfp1VQrPGRLDhD+MQ7+8pxi9K0plJoG7AWIFCfekzxsT9fp/iCfbwZ1O9wksl1sYB4CbKlMDeqqVmB3TpVNz6A==
+"@8base/apollo-client@^1.4.0":
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/@8base/apollo-client/-/apollo-client-1.4.0.tgz#50e837a1e16c8d106d9a63ad48b6ff262dedf76a"
+  integrity sha512-imNOWgpC78C1Sm4jsgsDY6tShEoFlo5WD/NNZDmIo2sDVFvIoMwPSDCuLchKdwd61X0GE/GlILAl/Ce5ga4D+A==
   dependencies:
-    "@8base/apollo-links" "^1.3.2"
-    "@8base/utils" "^1.3.2"
+    "@8base/apollo-links" "^1.4.0"
+    "@8base/utils" "^1.4.0"
     apollo-cache-inmemory "^1.5.1"
     apollo-link "1.2.11"
     apollo-link-batch-http "^1.2.11"
@@ -31,31 +32,31 @@
     apollo-link "1.2.11"
     tslib "^1.9.3"
 
-"@8base/apollo-links@^1.3.2":
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/@8base/apollo-links/-/apollo-links-1.3.2.tgz#55f4e5f9be7ce805664b36978d22e7ea5ff8d32a"
-  integrity sha512-lWS2XXys6jT6U0IZuXM1gj7VAeTpiwhewYBBoyubDc/nHvPFdLBEiMmGUAobgei/is43PdKQtLAgOKL5XoTmjw==
+"@8base/apollo-links@^1.4.0":
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/@8base/apollo-links/-/apollo-links-1.4.0.tgz#df91518f2b84eb348ec1b544093d3b8e804b386d"
+  integrity sha512-4dR4Y0YgfXIWwEcihA3OlP5KRewQ+/FlLPkq/Ft9+n8k7EIMYUOIOtB+7aGZ0Y4ozqy0AvE1FPlcMswLHs/Eew==
   dependencies:
     "@8base/apollo-link-ws" "1.0.20"
     "@8base/error-codes" "^1.0.17"
     "@8base/subscriptions-transport-ws" "^0.9.16"
-    "@8base/utils" "^1.3.2"
+    "@8base/utils" "^1.4.0"
     apollo-link "1.2.11"
     apollo-link-error "^1.1.10"
     graphql-tag "^2.9.2"
     ramda "^0.26.1"
     zen-observable-ts "^0.8.18"
 
-"@8base/auth@^1.3.2":
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/@8base/auth/-/auth-1.3.2.tgz#fc57a40f0a85908a88107e8e1c09d631ac20e0c7"
-  integrity sha512-pu7OA5ltd2TAVoq+krqQbeFlLt4qJIAyx8tem2i4YjtcShznqplHT+EC6jw/SL69oUlh+M9411SzshgfySeAbw==
-  dependencies:
-    "@8base/api-token-auth-client" "^1.3.2"
-    "@8base/utils" "^1.3.2"
-    "@8base/web-auth0-auth-client" "^1.3.2"
-    "@8base/web-cognito-auth-client" "^1.3.2"
-    "@8base/web-oauth-client" "^1.3.2"
+"@8base/auth@^1.4.0":
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/@8base/auth/-/auth-1.4.0.tgz#561241e4adb640ba37e4b61aea4f7dfa3834dd63"
+  integrity sha512-eyE0T3rLY9NnrER8hUBIV7fYA/P5gnrawP9TAE7OQCY9raeoM4tnvCCcirOtTcDsxi464EcRgXcb0OAIRWUmng==
+  dependencies:
+    "@8base/api-token-auth-client" "^1.4.0"
+    "@8base/utils" "^1.4.0"
+    "@8base/web-auth0-auth-client" "^1.4.0"
+    "@8base/web-cognito-auth-client" "^1.4.0"
+    "@8base/web-oauth-client" "^1.4.0"
     ramda "^0.26.1"
 
 "@8base/error-codes@^1.0.17":
@@ -95,23 +96,10 @@
     symbol-observable "^1.0.4"
     ws "^5.2.0"
 
-"@8base/utils@^1.2.8":
-  version "1.2.8"
-  resolved "https://registry.yarnpkg.com/@8base/utils/-/utils-1.2.8.tgz#d570f6136db954030fda6444822dda7f6dac8d3a"
-  integrity sha512-WCwmJDqDuD2xMM5dQ6m3nh0mG9vOJu11yrtFf4yRaj1zOyOkZY7AFI5C76owoaC+RFwZKYtDsbx7+yCg5dnmqA==
-  dependencies:
-    "@8base/error-codes" "^1.0.17"
-    "@8base/schema-name-generator" "^0.1.5"
-    graphql-prettier "^1.0.5"
-    os "^0.1.1"
-    prettier "^1.17.0"
-    ramda "^0.26.1"
-    reselect "^4.0.0"
-
-"@8base/utils@^1.3.2":
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/@8base/utils/-/utils-1.3.2.tgz#f250dd64052c9d6b1bcb73dc7e7a6b9004baf0d4"
-  integrity sha512-AomLDKbMHpCyFNkhSUcbTgT5pXo9zX2rMD91o+R8P0gw7p5wdDLNwe00t3oj8CbQVZOQkdwUxb9JJR3ETjxOvA==
+"@8base/utils@^1.4.0":
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/@8base/utils/-/utils-1.4.0.tgz#6b02fa14dc25f5c6a30d8495364ecfd75e21f5de"
+  integrity sha512-q8ZMopAMaMiUQMRDT5EiV6SrPaKjM3bvtaX8V5WXMiusngfto3t+erRnEYh0d4sMggN6S/QoDyNlf5xRcCGk9Q==
   dependencies:
     "@8base/error-codes" "^1.0.17"
     "@8base/schema-name-generator" "^0.1.5"
@@ -121,50 +109,42 @@
     ramda "^0.26.1"
     reselect "^4.0.0"
 
-"@8base/validate@^1.3.2":
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/@8base/validate/-/validate-1.3.2.tgz#ea31f2aa7827b367d9bd29994e2ef29947785fc7"
-  integrity sha512-Yp0BkyoVhVSzJyWFT65x9eocOcU4kPRmONQjF49OEnLklxACxpLyCImbtqGiGgLA2m6jQt7/R14O5dHWHe52Xg==
+"@8base/validate@^1.4.0":
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/@8base/validate/-/validate-1.4.0.tgz#052cdd0a0e2fb9b9782563a48e896f80e03ec0c9"
+  integrity sha512-FgHID4R6+iGQzxePRWhOGUX3fH3CtKVmCmT9rzi7ETXvop1VFd7lSHcrfV2AKY2tFl+0Dj7jpjvH0QIIxcnzjw==
   dependencies:
-    "@8base/utils" "^1.3.2"
+    "@8base/utils" "^1.4.0"
     decimal.js "^10.1.1"
     ramda "^0.26.1"
 
-"@8base/web-auth0-auth-client@^1.2.8":
-  version "1.2.8"
-  resolved "https://registry.yarnpkg.com/@8base/web-auth0-auth-client/-/web-auth0-auth-client-1.2.8.tgz#5d1ec2f81e4357ac812fda70a57afe50bccb25b1"
-  integrity sha512-oY6S9h4U6dru0oee1V4zLTZ3rPx6ratVvAQYbcsOkrFexF0hyDKrG5WvdeFcxYg8zuozIYOX/1pqnDmJcfKpUw==
-  dependencies:
-    "@8base/utils" "^1.2.8"
-    auth0-js "^9.11.1"
-    ramda "^0.26.1"
-
-"@8base/web-auth0-auth-client@^1.3.2":
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/@8base/web-auth0-auth-client/-/web-auth0-auth-client-1.3.2.tgz#78731a8dd3902aec1e359ed1862aa630649bb362"
-  integrity sha512-t2RNyIRqfjo4hTFxgw61rluQ6nU3hBciDEmsLmpG9xBWNZyJkZq4PAV8ejc+ofoCQtL0PqvUsABL7Hg1LSe/jg==
+"@8base/web-auth0-auth-client@^1.4.0":
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/@8base/web-auth0-auth-client/-/web-auth0-auth-client-1.4.0.tgz#689f9533da32fa6895c3f06505ad9ff2cfc91f52"
+  integrity sha512-NJq23NE6KMe1iK2Vi070wB4fzOm2igvXhzSNBVJTZvNS6AXUIjojzZiDMNK96S3rNYMfQi7rZskeZKd/LJDTXw==
   dependencies:
-    "@8base/utils" "^1.3.2"
+    "@8base/utils" "^1.4.0"
     auth0-js "^9.11.1"
     jwt-decode "^3.0.0-beta.2"
     ramda "^0.26.1"
 
-"@8base/web-cognito-auth-client@^1.3.2":
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/@8base/web-cognito-auth-client/-/web-cognito-auth-client-1.3.2.tgz#969f80831a06b183927cb98419b7f5c367714ead"
-  integrity sha512-5GQZ/yX4mN/9/eMuKatdDLT11yO8X7ZeiQ/DayK7PptahGEI6G0acye5RhZhO2GhTJAhL6FW7j57lBBJgbZ3yw==
+"@8base/web-cognito-auth-client@^1.4.0":
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/@8base/web-cognito-auth-client/-/web-cognito-auth-client-1.4.0.tgz#e4a9cbd2f6b9683512772cfce11c1065e5f39d02"
+  integrity sha512-U67orJQuweH30l2LFMnHhGSdK9VSmKXTlbSal1Uud71rPZcG2zT/acV2surEPtu8UkK3QMRHZh/dS/OzjJli/g==
   dependencies:
-    "@8base/utils" "^1.3.2"
+    "@8base/utils" "^1.4.0"
     jwt-decode "^3.0.0-beta.2"
     qs "^6.9.4"
     ramda "^0.26.1"
 
-"@8base/web-oauth-client@^1.3.2":
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/@8base/web-oauth-client/-/web-oauth-client-1.3.2.tgz#85c410b5056017a5be8021e6c187436e577ea1c9"
-  integrity sha512-ATO898Bb9xAburmTnVrc5q7csOARQkDeF5LOdqABFGpQL98kW7BzAZlaf85gl62KtrGTexrq1gZfR/6QJQjNWQ==
+"@8base/web-oauth-client@^1.4.0":
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/@8base/web-oauth-client/-/web-oauth-client-1.4.0.tgz#59da32e465f0a6345bcf6029ef929c5e2be493d8"
+  integrity sha512-BhUExEG8Hv4lLOSdvd1DExmnDdIYoLuCd4ZyullpIeadbLgu5J7piwUZ0JOvzSsM25VbzD5BFPXfLBWXFPqY/g==
   dependencies:
-    "@8base/utils" "^1.3.2"
+    "@8base/utils" "^1.4.0"
+    jwt-decode "^3.0.0-beta.2"
 
 "@apollo/react-common@^3.1.0", "@apollo/react-common@^3.1.1":
   version "3.1.1"
