@intellegens/cornerstone-client 0.0.36 → 0.0.37

package/data/api/dto/read/ReadSelectedSearchDefinitionDto.d.ts

@@ -14,5 +14,5 @@ export type ReadSelectedSearchDefinitionDto = {
     /**
      * Nested search definitions for complex queries.
      */
-    nestedSearchCriteria?: ReadSelectedSearchPropertyDefinitionDto[];
+    nestedSearchCriteria?: ReadSelectedSearchDefinitionDto[];
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@intellegens/cornerstone-client",
-  "version": "0.0.36",
+  "version": "0.0.37",
   "main": "index.js",
   "type": "module",
   "scripts": {

package/services/auth/client/AuthService/index.d.ts

@@ -22,10 +22,10 @@ export declare class AuthService<TKey, TUser extends UserDto<TKey> = UserDto<TKe
     /**
      * Checks if user is authenticated and retrieves the current user's details if they are
      *
-     * @return {Promise<TUser>} Currently logged in user's details
+     * @return {Promise<UserInfoDto<TKey, TUser>>} Currently logged in user's details
      * @throws {Error} Error if fetch fails
      */
-    whoAmI(): Promise<ApiSuccessResponse<TUser | undefined, EmptyMetadata>>;
+    whoAmI(): Promise<ApiSuccessResponse<UserInfoDto<TKey, TUser> | undefined, EmptyMetadata>>;
     /**
      * Authenticates a user using their username and password, and retrieves user's details
      *

package/services/auth/client/AuthService/index.js

@@ -24,7 +24,7 @@ export class AuthService {
     /**
      * Checks if user is authenticated and retrieves the current user's details if they are
      *
-     * @return {Promise<TUser>} Currently logged in user's details
+     * @return {Promise<UserInfoDto<TKey, TUser>>} Currently logged in user's details
      * @throws {Error} Error if fetch fails
      */
     async whoAmI() {
@@ -42,8 +42,8 @@ export class AuthService {
             const { success, result, metadata, error } = (await res.json());
             if (!success)
                 throw new Error(error.message);
-            this.user = result;
-            return { result: this.user, metadata };
+            this.user = result.user;
+            return { result: { user: this.user, accessTokenExpiry: result.accessTokenExpiry }, metadata };
         }
         catch (err) {
             // TODO: Extract error from well-formed response
@@ -73,7 +73,7 @@ export class AuthService {
             const { result, metadata } = await this.whoAmI();
             if (result === undefined)
                 throw undefined;
-            this.user = result;
+            this.user = result.user;
             return { result: this.user, metadata };
         }
         catch (err) {