Skip to content

Commit

Permalink
added onboarding expiry
Browse files Browse the repository at this point in the history
Signed-off-by: Sukanya Rath <[email protected]>
  • Loading branch information
sukanya-rath committed Jun 25, 2024
1 parent acfdf47 commit 540d730
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 12 deletions.
19 changes: 10 additions & 9 deletions backend/db/migrations/V1.0.27__admin_tables.sql
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ SET search_path TO pay_transparency;

create table if not exists admin_user
(
admin_user_id uuid not null default gen_random_uuid(),
idir_user_guid uuid not null,
display_name varchar(255) not null,
create_date timestamp default current_timestamp not null,
create_user varchar(255) not null,
update_date timestamp default current_timestamp not null,
update_user varchar(255) not null,
is_active boolean default true not null,
assigned_roles varchar(255) not null,
admin_user_id uuid not null default gen_random_uuid(),
idir_user_guid uuid not null,
display_name varchar(255) not null,
create_date timestamp default current_timestamp not null,
create_user varchar(255) not null,
update_date timestamp default current_timestamp not null,
update_user varchar(255) not null,
is_active boolean default true not null,
assigned_roles varchar(255) not null,
constraint admin_user_id_pk primary key (admin_user_id)
);

Expand Down Expand Up @@ -39,6 +39,7 @@ create table if not exists admin_user_onboarding
create_date timestamp default current_timestamp not null,
created_by uuid not null,
is_onboarded boolean default false not null,
expiry_date timestamp not null,
constraint admin_user_onboarding_id_pk primary key (admin_user_onboarding_id)
);

Expand Down
3 changes: 1 addition & 2 deletions backend/src/v1/prisma/schema.prisma
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,6 @@ model admin_user {
create_user String @db.VarChar(255)
update_date DateTime @default(now()) @db.Timestamp(6)
update_user String @db.VarChar(255)
last_login_date DateTime @default(now()) @db.Timestamp(6)
is_active Boolean @default(true)
assigned_roles String @db.VarChar(255)
admin_user_history admin_user_history[]
Expand All @@ -252,7 +251,6 @@ model admin_user_history {
create_user String @db.VarChar(255)
update_date DateTime @default(now()) @db.Timestamp(6)
update_user String @db.VarChar(255)
last_login_date DateTime @default(now()) @db.Timestamp(6)
is_active Boolean @default(true)
assigned_roles String @db.VarChar(255)
admin_user admin_user @relation(fields: [admin_user_id], references: [admin_user_id], onDelete: NoAction, onUpdate: NoAction, map: "admin_user_fk")
Expand All @@ -267,6 +265,7 @@ model admin_user_onboarding {
create_date DateTime @default(now()) @db.Timestamp(6)
created_by String @db.Uuid
is_onboarded Boolean @default(false)
expiry_date DateTime @db.Timestamp(6)
}

view reports_view {
Expand Down
2 changes: 2 additions & 0 deletions backend/src/v1/services/admin-auth-service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,8 @@ class AdminAuth extends AuthBase {
is_onboarded: false
}
});
//TODO - if onboarding request exists and has expired show the page to user to ask admin to add them again.

// record found , need to do the processing.
if (adminUserOnboarding) {
// get SSO roles from Keycloak
Expand Down
3 changes: 2 additions & 1 deletion backend/src/v1/services/admin-users-services.ts
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,8 @@ export class AdminUserService {
first_name: firstname,
assigned_roles: roles,
is_onboarded: false,
created_by: createdBy
created_by: createdBy,
expiry_date: new Date(new Date().getTime() + 72 * 60 * 60 * 1000) //TODO make expiry configurable
}

});
Expand Down

0 comments on commit 540d730

Please sign in to comment.