Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

MOSIP-27405 resolved ui audit log issues #621

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

MOSIP-27405 resolved ui audit log issues #621

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
803a3e7
MOSIP-27405 resolved ui audit log issues
Madhuravas Dec 28, 2023
503d730
[DSD-4191] fixed build issues
syedsalman3753 Jan 11, 2024
4daba4f
Merge pull request #2 from syedsalman3753/develop
Madhuravas Jan 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 13 additions & 11 deletions resident-ui/src/app/feature/uinservices/revokevid/revokevid.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,18 +57,18 @@ export class RevokevidComponent implements OnInit, OnDestroy {
}
}else if (id === "deleteVID"){
this.revokeVID(this.newVidValue)
if(this.newVidValue === "Perpetual"){
if(this.newVidType === "Perpetual"){
this.auditService.audit('RP-014', 'Generate/revoke VID', 'RP-Generate/revoke VID', 'Generate/revoke VID', 'User clicks on "revoke perpetual VID" button','');
}else if(this.newVidValue === "Temporary"){
}else if(this.newVidType === "Temporary"){
this.auditService.audit('RP-022', 'Generate/revoke VID', 'RP-Generate/revoke VID', 'Generate/revoke VID', 'User clicks on "revoke temporary VID" button', '');
}else{
this.auditService.audit('RP-018', 'Generate/revoke VID', 'RP-Generate/revoke VID', 'Generate/revoke VID', 'User clicks on "revoke one-time VID" button', '');
}
}else if(id === "downloadVID"){
this.vidDownloadStatus(this.newVidValue)
if(this.newVidValue === "Perpetual"){
if(this.newVidType === "Perpetual"){
this.auditService.audit('RP-015', 'Generate/revoke VID', 'RP-Generate/revoke VID', 'Generate/revoke VID', 'User clicks on "User clicks on "download perpetual VID" button', '');
}else if(this.newVidValue === "Temporary"){
}else if(this.newVidType === "Temporary"){
this.auditService.audit('RP-023', 'Generate/revoke VID', 'RP-Generate/revoke VID', 'Generate/revoke VID', 'User clicks on "download temporary VID" button', '');
}else{
this.auditService.audit('RP-019', 'Generate/revoke VID', 'RP-Generate/revoke VID', 'Generate/revoke VID', 'User clicks on "download one-time VID" button', '');
Expand Down Expand Up @@ -168,12 +168,14 @@ export class RevokevidComponent implements OnInit, OnDestroy {
}

displayVid(finalTypeList, policyType, policy, showvid) {
if(policyType === "Perpetual"){
this.auditService.audit('RP-016', 'Generate/revoke VID', 'RP-Generate/revoke VID', 'Generate/revoke VID', 'User clicks on "User clicks on "eye" icon to unmask the perpetual VID', '');
}else if(policyType === "Temporary"){
this.auditService.audit('RP-024', 'Generate/revoke VID', 'RP-Generate/revoke VID', 'Generate/revoke VID', 'User clicks on "eye" icon to unmask the temporary VID', '');
}else{
this.auditService.audit('RP-020', 'Generate/revoke VID', 'RP-Generate/revoke VID', 'Generate/revoke VID', 'User clicks on "eye" icon to unmask the one-time VID', '');
if(showvid){
if(policyType === "Perpetual"){
this.auditService.audit('RP-016', 'Generate/revoke VID', 'RP-Generate/revoke VID', 'Generate/revoke VID', 'User clicks on "User clicks on "eye" icon to unmask the perpetual VID', '');
}else if(policyType === "Temporary"){
this.auditService.audit('RP-024', 'Generate/revoke VID', 'RP-Generate/revoke VID', 'Generate/revoke VID', 'User clicks on "eye" icon to unmask the temporary VID', '');
}else{
this.auditService.audit('RP-020', 'Generate/revoke VID', 'RP-Generate/revoke VID', 'Generate/revoke VID', 'User clicks on "eye" icon to unmask the one-time VID', '');
}
}
let self = this;
let results = [];
Expand Down Expand Up @@ -294,7 +296,7 @@ export class RevokevidComponent implements OnInit, OnDestroy {
revokeVIDBtn(vidValue: any,vidType:any){
this.showDeleteMessage(vidType)
this.newVidValue = vidValue
this.newVidType - vidType
this.newVidType = vidType
}

revokeVID(vidValue: any) {
Expand Down
3 changes: 3 additions & 0 deletions residenttest/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
FROM selenium/standalone-chrome:latest

USER root

ARG SOURCE
ARG COMMIT_HASH
ARG COMMIT_ID
Expand Down Expand Up @@ -33,6 +35,7 @@ USER ${container_user_uid}:${container_user_gid}

COPY --chown=${container_user_uid}:${container_user} --chmod=771 ./entrypoint.sh ${work_dir}/entrypoint.sh
COPY --chown=${container_user}:${container_user} ./src/main/resources/ ${work_dir}
COPY --chown=${container_user}:${container_user} ./target/residentui*.jar ${work_dir}

# set working directory
WORKDIR ${work_dir}
Expand Down
69 changes: 20 additions & 49 deletions residenttest/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,55 +247,6 @@
<argLine>-Dfile.encoding=UTF-8</argLine>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>3.0.0</version>
<executions>
<execution>
<id>make-jar-executable</id>
<phase>package</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target>
<!-- Create a shell script to run the JAR file with executable permission -->
<chmod file="${project.build.directory}/*.jar" perm="ugo+rx"/>
</target>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<groupId>pl.project13.maven</groupId>
<artifactId>git-commit-id-plugin</artifactId>
<version>3.0.1</version>
<executions>
<execution>
<id>populate-git-commit-information</id>
<goals>
<goal>revision</goal>
</goals>
<configuration>
<verbose>true</verbose>
<dateFormat>MM/dd/yyyy HH:mm:ss Z</dateFormat>
<abbrevLength>8</abbrevLength>
<generateGitPropertiesFile>true</generateGitPropertiesFile>
<generateGitPropertiesFilename>${project.build.outputDirectory}/git.properties</generateGitPropertiesFilename>
</configuration>
</execution>
</executions>
<configuration>
<dotGitDirectory>${project.basedir}/.git</dotGitDirectory>
</configuration>
</plugin>




<!-- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
Expand Down Expand Up @@ -356,6 +307,26 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>3.0.0</version>
<executions>
<execution>
<id>make-jar-executable</id>
<phase>package</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target>
<!-- Create a shell script to run the JAR file with executable permission -->
<chmod file="${project.build.directory}/*.jar" perm="ugo+rx"/>
</target>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

Expand Down
Loading