Brought over 'userID' function from easybasejs

easybase · Jun 7, 2021 · b5534d3 · b5534d3
1 parent a565191
commit b5534d3
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 5 deletions.
diff --git a/example/src/ProjectUser.tsx b/example/src/ProjectUser.tsx
@@ -25,7 +25,8 @@ export default function ProjectUser() {
         onSignIn,
         db,
         forgotPassword,
-        forgotPasswordConfirm
+        forgotPasswordConfirm,
+        userID
     } = useEasybase();
 
     const onSignUpClick = async () => {
@@ -101,6 +102,7 @@ export default function ProjectUser() {
         return (
             <div style={{ display: "flex", width: '100vw', height: '90vh', justifyContent: 'center', alignItems: 'center', flexDirection: "column" }}>
                 <div style={{ display: "flex", flexDirection: "column", backgroundColor: "#BBB", padding: 40, borderRadius: 5 }}>
+                    <h5>User ID: {userID()}</h5>
                     <button className="btn green m-4" onClick={onUserAttrsClick}><span>Get user attrs</span></button>
                     <button className="btn orange m-4" onClick={signOut}><span>Sign Out</span></button>
                     <button className="btn orange m-4" onClick={addUserRecord}><span>Add User Record</span></button>

diff --git a/package.json b/package.json
@@ -54,7 +54,7 @@
     "native"
   ],
   "dependencies": {
-    "easybasejs": "^4.2.15",
+    "easybasejs": "^4.2.17",
     "easyqb": "^1.0.20",
     "fast-deep-equal": "^3.1.3",
     "object-observer": "^4.0.3",

diff --git a/src/EasybaseProvider.tsx b/src/EasybaseProvider.tsx
@@ -40,7 +40,8 @@ const {
     signIn,
     signOut,
     forgotPassword,
-    forgotPasswordConfirm
+    forgotPasswordConfirm,
+    userID
 } = authFactory(g);
 
 const { log } = utilsFactory(g);
@@ -144,12 +145,14 @@ const EasybaseProvider = ({ children, ebconfig, options }: EasybaseProviderProps
 
                     const refreshTokenRes = await tokenPost(POST_TYPES.REQUEST_TOKEN, {
                         refreshToken: g.refreshToken,
-                        token: g.token
+                        token: g.token,
+                        getUserID: true
                     });
 
                     if (refreshTokenRes.success) {
                         clearTimeout(fallbackMount);
                         g.token = refreshTokenRes.data.token;
+                        g.userID = refreshTokenRes.data.userID;
                         await cache.setCacheTokens(g, cookieName);
                         setUserSignedIn(true);
                     } else {
@@ -569,7 +572,8 @@ const EasybaseProvider = ({ children, ebconfig, options }: EasybaseProviderProps
         e,
         useReturn,
         forgotPassword,
-        forgotPasswordConfirm
+        forgotPasswordConfirm,
+        userID
     }
 
     return (

diff --git a/src/types/types.tsx b/src/types/types.tsx
@@ -44,6 +44,7 @@ export interface ContextValue {
     onSignIn(callback: () => void): void;
     /**
      * Check if a user is currently signed in.
+     * @return {boolean} Is a user signed in.
      */
     isUserSignedIn(): boolean;
     /**
@@ -283,6 +284,11 @@ export interface ContextValue {
      * @return {Promise<StatusResponse>} A StatusResponse corresponding to the successful setting of a new password
      */
     forgotPasswordConfirm(code: string, username: string, newPassword: string): Promise<StatusResponse>
+    /**
+     * Retrieve the currently signed-in user's ID.
+     * @return {string | undefined} The currently signed-in user's ID (username), otherwise undefined.
+     */
+    userID(): string | undefined;
 }
 
 /**
@@ -447,4 +453,5 @@ export interface Globals {
     instance: string;
     mounted: boolean;
     newTokenCallback(): void;
+    userID: string | undefined;
 }