@solidstarters/solid-core 1.2.122 → 1.2.123

package/src/seeders/seed-data/solid-core-metadata.json

@@ -1750,6 +1750,18 @@
             "encrypt": false,
             "isSystem": true
           },
+          {
+            "name": "profilePicture",
+            "displayName": "Profile Picture",
+            "type": "mediaSingle",
+            "required": false,
+            "unique": true,
+            "index": false,
+            "private": false,
+            "encrypt": false,
+            "isSystem": true,
+            "mediaStorageProviderUserKey": "default-filesystem"
+          },
           {
             "name": "lastLoginProvider",
             "displayName": "Last Login Provider",
@@ -2074,6 +2086,86 @@
           }
         ]
       },
+      {
+        "singularName": "userActivityHistory",
+        "tableName": "ss_user_activity_history",
+        "pluralName": "userActivityHistories",
+        "displayName": "User Activity History",
+        "description": "Model to capture Users Activity",
+        "dataSource": "default",
+        "dataSourceType": "postgres",
+        "userKeyFieldUserKey": "",
+        "isSystem": true,
+        "fields": [
+          {
+            "name": "user",
+            "displayName": "User",
+            "description": null,
+            "type": "relation",
+            "ormType": "integer",
+            "isSystem": false,
+            "relationType": "many-to-one",
+            "relationCoModelFieldName": null,
+            "relationCreateInverse": false,
+            "relationCoModelSingularName": "user",
+            "relationCoModelColumnName": "",
+            "relationModelModuleName": "solid-core",
+            "relationCascade": "cascade",
+            "required": false,
+            "unique": false,
+            "index": false,
+            "private": false,
+            "encrypt": false,
+            "encryptionType": null,
+            "decryptWhen": null,
+            "columnName": null,
+            "relationJoinTableName": "",
+            "isRelationManyToManyOwner": null
+          },
+          {
+            "name": "event",
+            "displayName": "Event",
+            "type": "selectionStatic",
+            "ormType": "varchar",
+            "length": 256,
+            "required": false,
+            "index": true,
+            "isSystem": true,
+            "selectionValueType": "string",
+            "selectionStaticValues": [
+              "login:login",
+              "logout:logout",
+              "tokenRefreshed:tokenRefreshed"
+            ]
+          },
+          {
+            "name": "ipAddress",
+            "displayName": "IP Address",
+            "type": "shortText",
+            "ormType": "varchar",
+            "length": 512,
+            "required": false,
+            "unique": false,
+            "index": true,
+            "private": false,
+            "encrypt": false,
+            "isSystem": true
+          },
+          {
+            "name": "userAgent",
+            "displayName": "User Agent",
+            "type": "shortText",
+            "ormType": "varchar",
+            "length": 512,
+            "required": false,
+            "unique": false,
+            "index": true,
+            "private": false,
+            "encrypt": false,
+            "isSystem": true
+          }
+        ]
+      },
       {
         "singularName": "permissionMetadata",
         "pluralName": "permissionMetadatas",
@@ -2455,6 +2547,47 @@
             "private": false,
             "encrypt": false,
             "isSystem": true
+          },
+          {
+            "name": "type",
+            "displayName": "Type",
+            "type": "selectionStatic",
+            "ormType": "varchar",
+            "length": 256,
+            "required": false,
+            "index": false,
+            "isSystem": true,
+            "columnName": "type",
+            "selectionValueType": "string",
+            "selectionStaticValues": [
+              "system:System",
+              "user:User"
+            ]
+          },
+          {
+            "name": "user",
+            "displayName": "User",
+            "description": "This is the user id field",
+            "type": "relation",
+            "ormType": "integer",
+            "isSystem": false,
+            "relationType": "many-to-one",
+            "relationCoModelFieldName": null,
+            "relationCreateInverse": false,
+            "relationCoModelSingularName": "user",
+            "relationCoModelColumnName": null,
+            "relationModelModuleName": "solid-core",
+            "relationCascade": "cascade",
+            "required": false,
+            "unique": false,
+            "index": false,
+            "private": false,
+            "encrypt": false,
+            "encryptionType": null,
+            "decryptWhen": null,
+            "columnName": null,
+            "relationJoinTableName": null,
+            "isRelationManyToManyOwner": null
           }
         ]
       },
@@ -4238,6 +4371,58 @@
       "viewUserKey": "locale-list-view",
       "moduleUserKey": "solid-core",
       "modelUserKey": "locale"
+    },
+    {
+      "displayName": "User Activity History List View",
+      "name": "userActivityHistory-list-view",
+      "type": "solid",
+      "domain": "",
+      "context": "",
+      "customComponent": "/admin/address-master/userActivityHistory/all",
+      "customIsModal": true,
+      "serverEndpoint": "",
+      "viewUserKey": "userActivityHistory-list-view",
+      "moduleUserKey": "solid-core",
+      "modelUserKey": "userActivityHistory"
+    },
+    {
+      "displayName": "App Settings",
+      "name": "app-settings-action",
+      "type": "custom",
+      "domain": "",
+      "context": "",
+      "customComponent": "/admin/core/solid-core/settings/app-settings",
+      "customIsModal": true,
+      "serverEndpoint": "",
+      "viewUserKey": "",
+      "moduleUserKey": "solid-core",
+      "modelUserKey": "setting"
+    },
+    {
+      "displayName": "Authentication Settings",
+      "name": "authentication-settings-action",
+      "type": "custom",
+      "domain": "",
+      "context": "",
+      "customComponent": "/admin/core/solid-core/settings/authentication-settings",
+      "customIsModal": true,
+      "serverEndpoint": "",
+      "viewUserKey": "",
+      "moduleUserKey": "solid-core",
+      "modelUserKey": "setting"
+    },
+    {
+      "displayName": "Misc",
+      "name": "misc-settings-action",
+      "type": "custom",
+      "domain": "",
+      "context": "",
+      "customComponent": "/admin/core/solid-core/settings/misc-settings",
+      "customIsModal": true,
+      "serverEndpoint": "",
+      "viewUserKey": "",
+      "moduleUserKey": "solid-core",
+      "modelUserKey": "setting"
     }
   ],
   "menus": [
@@ -4488,6 +4673,46 @@
       "actionUserKey": "locale-list-action",
       "moduleUserKey": "solid-core",
       "parentMenuItemUserKey": "other-menu-item"
+    },
+    {
+      "displayName": "User Activity History",
+      "name": "userActivityHistory-menu-item",
+      "sequenceNumber": 1,
+      "actionUserKey": "userActivityHistory-list-view",
+      "moduleUserKey": "solid-core",
+      "parentMenuItemUserKey": "other-menu-item"
+    },
+    {
+      "displayName": "Settings",
+      "name": "settings-menu-item",
+      "sequenceNumber": 3,
+      "actionUserKey": "settings-root",
+      "moduleUserKey": "solid-core",
+      "parentMenuItemUserKey": ""
+    },
+    {
+      "displayName": "App Settings",
+      "name": "app-settings-menu-item",
+      "sequenceNumber": 1,
+      "actionUserKey": "app-settings-action",
+      "moduleUserKey": "solid-core",
+      "parentMenuItemUserKey": "settings-menu-item"
+    },
+    {
+      "displayName": "Authentication Settings",
+      "name": "authentication-settings-menu-item",
+      "sequenceNumber": 2,
+      "actionUserKey": "authentication-settings-action",
+      "moduleUserKey": "solid-core",
+      "parentMenuItemUserKey": "settings-menu-item"
+    },
+    {
+      "displayName": "Misc",
+      "name": "misc-settings-menu-item",
+      "sequenceNumber": 3,
+      "actionUserKey": "misc-settings-action",
+      "moduleUserKey": "solid-core",
+      "parentMenuItemUserKey": "settings-menu-item"
     }
   ],
   "views": [
@@ -9360,6 +9585,106 @@
           }
         ]
       }
+    },
+    {
+      "name": "userActivityHistory-list-view",
+      "displayName": "User Activity History",
+      "type": "list",
+      "context": "{}",
+      "moduleUserKey": "solid-core",
+      "modelUserKey": "userActivityHistory",
+      "layout": {
+        "type": "list",
+        "attrs": {
+          "pagination": true,
+          "pageSizeOptions": [
+            10,
+            25,
+            50
+          ],
+          "enableGlobalSearch": true,
+          "create": true,
+          "edit": true,
+          "delete": true
+        },
+        "children": [
+          {
+            "type": "field",
+            "attrs": {
+              "name": "id",
+              "sortable": true,
+              "filterable": true
+            }
+          },
+          {
+            "type": "field",
+            "attrs": {
+              "name": "user",
+              "sortable": true,
+              "filterable": true
+            }
+          }
+        ]
+      }
+    },
+    {
+      "name": "userActivityHistory-form-view",
+      "displayName": "User Activity History",
+      "type": "form",
+      "context": "{}",
+      "moduleUserKey": "solid-core",
+      "modelUserKey": "userActivityHistory",
+      "layout": {
+        "type": "form",
+        "attrs": {
+          "name": "form-1",
+          "label": "User Activity History",
+          "className": "grid"
+        },
+        "children": [
+          {
+            "type": "sheet",
+            "attrs": {
+              "name": "sheet-1"
+            },
+            "children": [
+              {
+                "type": "row",
+                "attrs": {
+                  "name": "sheet-1"
+                },
+                "children": [
+                  {
+                    "type": "column",
+                    "attrs": {
+                      "name": "group-1",
+                      "label": "",
+                      "className": "col-6"
+                    },
+                    "children": [
+                      {
+                        "type": "field",
+                        "attrs": {
+                          "name": "user"
+                        }
+                      }
+                    ]
+                  },
+                  {
+                    "type": "column",
+                    "attrs": {
+                      "name": "group-2",
+                      "label": "",
+                      "className": "col-6"
+                    },
+                    "children": []
+                  }
+                ]
+              }
+            ]
+          }
+        ]
+      }
     }
   ],
   "emailTemplates": [

package/src/services/authentication.service.ts

@@ -4,6 +4,7 @@ import {
     ConflictException,
     Inject,
     Injectable,
+    InternalServerErrorException,
     Logger,
     NotFoundException,
     UnauthorizedException,
@@ -43,6 +44,8 @@ import { SettingService } from './setting.service';
 import { CreateUserDto } from 'src/dtos/create-user.dto';
 import { RoleMetadataService } from './role-metadata.service';
 import commonConfig from 'src/config/common.config';
+import { UserActivityHistoryService } from './user-activity-history.service';
+import { RequestContextService } from './request-context.service';
 
 
 enum LoginProvider {
@@ -79,13 +82,14 @@ export class AuthenticationService {
         private readonly roleMetadataService: RoleMetadataService,
         @Inject(commonConfig.KEY)
         private readonly commonConfiguration: ConfigType<typeof commonConfig>,
-
+        private readonly userActivityHistoryService: UserActivityHistoryService,
+        private readonly requestContextService: RequestContextService,
     ) { }
 
-    private async getConfig( key: string): Promise<any> {
+    private async getConfig(key: string): Promise<any> {
         return this.settingService.getConfigValue(key);
     }
-    
+
     private async getCompanyLogo(): Promise<string> {
         return await this.settingService.getConfigValue('companylogo');
     }
@@ -122,7 +126,7 @@ export class AuthenticationService {
 
         return user;
     }
-        
+
     async signUp(signUpDto: SignUpDto, activeUser: ActiveUserData = null): Promise<User> {
         // If public registrations are disabled and no activeUser is present when invoking signUp then we throw an exception.
         if (!(await this.settingService.getConfigValue('allowPublicRegistration')) && !activeUser) {
@@ -131,7 +135,7 @@ export class AuthenticationService {
 
         try {
             const onForcePasswordChange = await this.getConfig('forceChangePasswordOnFirstLogin');
-            var { user, pwd, autoGeneratedPwd } = await this.populateForSignup(new User(), signUpDto, this.iamConfiguration.activateUserOnRegistration,onForcePasswordChange);
+            var { user, pwd, autoGeneratedPwd } = await this.populateForSignup(new User(), signUpDto, this.iamConfiguration.activateUserOnRegistration, onForcePasswordChange);
             const savedUser = await this.userRepository.save(user);
             // Also assign a default role to the newly created user. 
             const userRoles = signUpDto.roles ?? [];
@@ -145,7 +149,7 @@ export class AuthenticationService {
             return savedUser;
         } catch (err) {
             const pgUniqueViolationErrorCode = '23505';
-        if (err.code === pgUniqueViolationErrorCode) {
+            if (err.code === pgUniqueViolationErrorCode) {
                 throw new ConflictException();
             }
             throw err;
@@ -158,7 +162,7 @@ export class AuthenticationService {
             // Merge the extended signUpDto attributes into the user entity 
             //@ts-ignore 
             const extensionUser = extensionUserRepo.merge(extensionUserRepo.create() as T, extensionUserDto);
-            var { user, pwd, autoGeneratedPwd } = await this.populateForSignup<T>(extensionUser, signUpDto,onForcePasswordChange);
+            var { user, pwd, autoGeneratedPwd } = await this.populateForSignup<T>(extensionUser, signUpDto, onForcePasswordChange);
             const savedUser = await extensionUserRepo.save(user);
 
             await this.handlePostSignup(savedUser, signUpDto.roles, pwd, autoGeneratedPwd);
@@ -175,7 +179,7 @@ export class AuthenticationService {
     }
 
 
-    private async populateForSignup<T extends User>(user: T, signUpDto: SignUpDto, isUserActive: boolean = true,onForcePasswordChange?:boolean) {
+    private async populateForSignup<T extends User>(user: T, signUpDto: SignUpDto, isUserActive: boolean = true, onForcePasswordChange?: boolean) {
         // const user = new User();
 
         if (signUpDto.roles && signUpDto.roles.length > 0) {
@@ -191,7 +195,7 @@ export class AuthenticationService {
         if (signUpDto.mobile) {
             user.mobile = signUpDto.mobile;
         }
-        this.logger.debug("user",user);
+        this.logger.debug("user", user);
         // If password has been specified by the user, then we simply create & activate the user based on the configuration parameter "activateUserOnRegistration".
         let pwd = '';
         let autoGeneratedPwd = '';
@@ -490,6 +494,9 @@ export class AuthenticationService {
 
         // TODO: Unset the password etc...
         const tokens = await this.generateTokens(user);
+
+        await this.userActivityHistoryService.logEvent('login', user);
+
         return {
             user: {
                 email: user.email,
@@ -957,6 +964,8 @@ export class AuthenticationService {
 
             const currentRefreshToken = await this.refreshTokenIdsStorage.validateAndRotate(user, refreshTokenDto.refreshToken);
 
+            await this.userActivityHistoryService.logEvent('tokenRefreshed', user);
+
             return {
                 accessToken: await this.generateAccessToken(user),
                 refreshToken: currentRefreshToken,
@@ -1040,13 +1049,37 @@ export class AuthenticationService {
     }
 
     //FIXME - Pending implementation
+    // async logout() {
+    //     // const user = this.request.user; //TODO: // Access the user from the execution context
+
+    //     // Invalidate the refresh token
+    //     // await this.refreshTokenIdsStorage.invalidate(user.id);
+    // }
     async logout() {
-        // const user = this.request.user; //TODO: // Access the user from the execution context
+        try {
+            const activeUser = this.requestContextService.getActiveUser();
+            const userId = activeUser?.sub;
+            const user = await this.userRepository.findOne({
+                where: {
+                    id: userId,
+                }
+            })
+            // Invalidate refresh token if you store them
+            await this.refreshTokenIdsStorage.invalidate(userId); // ← Your existing logic
+
+            // Log logout event
+            await this.userActivityHistoryService.logEvent('logout', user);
 
-        // Invalidate the refresh token
-        // await this.refreshTokenIdsStorage.invalidate(user.id);
+
+            return { message: 'Logged out successfully' };
+        } catch (err) {
+            throw err instanceof UnauthorizedException || err instanceof InternalServerErrorException
+                ? err
+                : new InternalServerErrorException('Logout failed due to an unexpected error.');
+        }
     }
 
+
     async activateUser(userId: number) {
         const user = await this.userService.findOne(userId, {});
         if (!user) {

package/src/services/request-context.service.ts

@@ -12,4 +12,12 @@ export class RequestContextService {
         return this.cls.get(REQUEST_USER_KEY);
     }
 
+    getIp(): string | undefined {
+        return this.cls.get('ipAddress');
+    }
+
+    getUserAgent(): string | undefined {
+        return this.cls.get('userAgent');
+    }
+
 }