Merge branch 'main' into judicial-system/ical-iteration-2

island-is · Jan 11, 2022 · b65b63c · b65b63c
2 parents 64923cd + 61bb744
commit b65b63c
Show file tree

Hide file tree

Showing 37 changed files with 132 additions and 133 deletions.
diff --git a/apps/application-system/api/src/app/modules/application/application.controller.ts b/apps/application-system/api/src/app/modules/application/application.controller.ts
@@ -282,7 +282,7 @@ export class ApplicationController {
     )
 
     this.auditService.audit({
-      user,
+      auth: user,
       action: 'create',
       resources: updatedApplication.id,
       meta: { type: application.typeId },
@@ -425,7 +425,7 @@ export class ApplicationController {
     )
 
     this.auditService.audit({
-      user,
+      auth: user,
       action: 'update',
       resources: updatedApplication.id,
       meta: { fields: Object.keys(newAnswers) },
@@ -492,7 +492,7 @@ export class ApplicationController {
     }
 
     this.auditService.audit({
-      user,
+      auth: user,
       action: 'updateExternalData',
       resources: updatedApplication.id,
       meta: { providers: externalDataDto },
@@ -574,7 +574,7 @@ export class ApplicationController {
     )
 
     this.auditService.audit({
-      user,
+      auth: user,
       action: 'submitApplication',
       resources: existingApplication.id,
       meta: {
@@ -812,7 +812,7 @@ export class ApplicationController {
     })
 
     this.auditService.audit({
-      user,
+      auth: user,
       action: 'addAttachment',
       resources: updatedApplication.id,
       meta: {
@@ -853,7 +853,7 @@ export class ApplicationController {
     )
 
     this.auditService.audit({
-      user,
+      auth: user,
       action: 'deleteAttachment',
       resources: updatedApplication.id,
       meta: {
@@ -889,7 +889,7 @@ export class ApplicationController {
     )
 
     this.auditService.audit({
-      user,
+      auth: user,
       action: 'generatePdf',
       resources: existingApplication.id,
       meta: { type: input.type },
@@ -927,7 +927,7 @@ export class ApplicationController {
     )
 
     this.auditService.audit({
-      user,
+      auth: user,
       action: 'requestFileSignature',
       resources: existingApplication.id,
       meta: { type: input.type },
@@ -963,7 +963,7 @@ export class ApplicationController {
     )
 
     this.auditService.audit({
-      user,
+      auth: user,
       action: 'uploadSignedFile',
       resources: existingApplication.id,
       meta: { type: input.type },
@@ -999,7 +999,7 @@ export class ApplicationController {
     )
 
     this.auditService.audit({
-      user,
+      auth: user,
       action: 'getPresignedUrl',
       resources: existingApplication.id,
       meta: { type },

diff --git a/apps/application-system/api/src/app/modules/payment/payment.controller.ts b/apps/application-system/api/src/app/modules/payment/payment.controller.ts
@@ -30,7 +30,6 @@ import { InjectModel } from '@nestjs/sequelize'
 import { Payment } from './payment.model'
 import { PaymentService } from './payment.service'
 import { PaymentStatusResponseDto } from './dto/paymentStatusResponse.dto'
-import { isUuid } from 'uuidv4'
 import { CreateChargeInput } from './dto/createChargeInput.dto'
 import { PaymentAPI } from '@island.is/clients/payment'
 
@@ -87,7 +86,7 @@ export class PaymentController {
     const chargeResult = await this.paymentService.createCharge(payment, user)
 
     this.auditService.audit({
-      user,
+      auth: user,
       action: 'createCharge',
       resources: paymentDto.application_id as string,
       meta: { applicationId: paymentDto.application_id, id: payment.id },

diff --git a/apps/financial-aid/backend/src/app/modules/application/application.controller.ts b/apps/financial-aid/backend/src/app/modules/application/application.controller.ts
@@ -114,7 +114,7 @@ export class ApplicationController {
     )
 
     this.auditService.audit({
-      user,
+      auth: user,
       action: 'findByNationalId',
       resources: applications.map((application) => application.id),
     })
@@ -172,7 +172,7 @@ export class ApplicationController {
     this.logger.debug(`Application controller: Getting application by id ${id}`)
 
     this.auditService.audit({
-      user,
+      auth: user,
       action: 'getApplication',
       resources: application.id,
     })

diff --git a/...landic-names-registry/backend/src/app/modules/icelandic-name/icelandic-name.controller.ts b/...landic-names-registry/backend/src/app/modules/icelandic-name/icelandic-name.controller.ts
@@ -113,7 +113,7 @@ export class IcelandicNameController {
     }
 
     this.auditService.audit({
-      user,
+      auth: user,
       action: 'updateNameById',
       resources: `${id}`,
       meta: { fields: Object.keys(body) },
@@ -142,7 +142,7 @@ export class IcelandicNameController {
   ): Promise<IcelandicName> {
     return this.auditService.auditPromise<IcelandicName>(
       {
-        user,
+        auth: user,
         action: 'createName',
         resources: (name) => `${name.id}`,
       },
@@ -173,7 +173,7 @@ export class IcelandicNameController {
     }
 
     this.auditService.audit({
-      user,
+      auth: user,
       action: 'deleteById',
       resources: `${id}`,
     })

diff --git a/apps/services/auth-admin-api/src/app/modules/access/access.controller.ts b/apps/services/auth-admin-api/src/app/modules/access/access.controller.ts
@@ -124,7 +124,7 @@ export class AccessController {
 
     return this.auditService.auditPromise(
       {
-        user,
+        auth: user,
         action: 'udpate',
         namespace,
         resources: nationalId,
@@ -148,7 +148,7 @@ export class AccessController {
 
     return this.auditService.auditPromise(
       {
-        user,
+        auth: user,
         action: 'delete',
         namespace,
         resources: nationalId,

diff --git a/apps/services/auth-admin-api/src/app/modules/clients/client-allowed-scope.controller.ts b/apps/services/auth-admin-api/src/app/modules/clients/client-allowed-scope.controller.ts
@@ -77,7 +77,7 @@ export class ClientAllowedScopeController {
 
     return this.auditService.auditPromise(
       {
-        user,
+        auth: user,
         action: 'delete',
         namespace,
         resources: clientId,

diff --git a/apps/services/auth-admin-api/src/app/modules/clients/client-claim.controller.ts b/apps/services/auth-admin-api/src/app/modules/clients/client-claim.controller.ts
@@ -65,7 +65,7 @@ export class ClientClaimController {
 
     return this.auditService.auditPromise(
       {
-        user,
+        auth: user,
         action: 'delete',
         namespace,
         resources: `${clientId}/${claimType}/${claimValue}`,

diff --git a/apps/services/auth-admin-api/src/app/modules/clients/client-grant-type.controller.ts b/apps/services/auth-admin-api/src/app/modules/clients/client-grant-type.controller.ts
@@ -65,7 +65,7 @@ export class ClientGrantTypeController {
 
     return this.auditService.auditPromise(
       {
-        user,
+        auth: user,
         action: 'delete',
         namespace,
         resources: clientId,

diff --git a/...ices/auth-admin-api/src/app/modules/clients/client-post-logout-redirect-uri.controller.ts b/...ices/auth-admin-api/src/app/modules/clients/client-post-logout-redirect-uri.controller.ts
@@ -65,7 +65,7 @@ export class ClientPostLogoutRedirectUriController {
 
     return this.auditService.auditPromise(
       {
-        user,
+        auth: user,
         action: 'delete',
         namespace,
         resources: clientId,

diff --git a/apps/services/auth-admin-api/src/app/modules/clients/client-secret.controller.ts b/apps/services/auth-admin-api/src/app/modules/clients/client-secret.controller.ts
@@ -64,7 +64,7 @@ export class ClientSecretController {
 
     return this.auditService.auditPromise(
       {
-        user,
+        auth: user,
         action: 'delete',
         namespace,
         resources: clientSecret.clientId,

diff --git a/apps/services/auth-admin-api/src/app/modules/clients/clients.controller.ts b/apps/services/auth-admin-api/src/app/modules/clients/clients.controller.ts
@@ -134,7 +134,7 @@ export class ClientsController {
 
     return this.auditService.auditPromise(
       {
-        user,
+        auth: user,
         action: 'update',
         namespace,
         resources: id,
@@ -158,7 +158,7 @@ export class ClientsController {
 
     return this.auditService.auditPromise(
       {
-        user,
+        auth: user,
         action: 'delete',
         namespace,
         resources: id,

diff --git a/apps/services/auth-admin-api/src/app/modules/clients/cors.controller.ts b/apps/services/auth-admin-api/src/app/modules/clients/cors.controller.ts
@@ -65,7 +65,7 @@ export class CorsController {
 
     return this.auditService.auditPromise(
       {
-        user,
+        auth: user,
         action: 'delete',
         namespace,
         resources: clientId,

diff --git a/apps/services/auth-admin-api/src/app/modules/clients/idp-restriction.controller.ts b/apps/services/auth-admin-api/src/app/modules/clients/idp-restriction.controller.ts
@@ -67,7 +67,7 @@ export class IdpRestrictionController {
 
     return this.auditService.auditPromise(
       {
-        user,
+        auth: user,
         action: 'delete',
         namespace,
         resources: clientId,

diff --git a/apps/services/auth-admin-api/src/app/modules/clients/redirect-uri.controller.ts b/apps/services/auth-admin-api/src/app/modules/clients/redirect-uri.controller.ts
@@ -65,7 +65,7 @@ export class RedirectUriController {
 
     return this.auditService.auditPromise(
       {
-        user,
+        auth: user,
         action: 'delete',
         namespace,
         resources: clientId,

diff --git a/apps/services/auth-admin-api/src/app/modules/grant-types/grant-types.controller.ts b/apps/services/auth-admin-api/src/app/modules/grant-types/grant-types.controller.ts
@@ -157,7 +157,7 @@ export class GrantTypeController {
 
     return this.auditService.auditPromise(
       {
-        user,
+        auth: user,
         action: 'updateGrantType',
         namespace,
         resources: name,
@@ -180,7 +180,7 @@ export class GrantTypeController {
     }
     return this.auditService.auditPromise(
       {
-        user,
+        auth: user,
         action: 'deleteGrantType',
         namespace,
         resources: name,

diff --git a/apps/services/auth-admin-api/src/app/modules/idp-provider/idp-provider.controller.ts b/apps/services/auth-admin-api/src/app/modules/idp-provider/idp-provider.controller.ts
@@ -121,7 +121,7 @@ export class IdpProviderController {
 
     return this.auditService.auditPromise(
       {
-        user,
+        auth: user,
         action: 'delete',
         namespace,
         resources: name,
@@ -148,7 +148,7 @@ export class IdpProviderController {
 
     return this.auditService.auditPromise(
       {
-        user,
+        auth: user,
         action: 'update',
         namespace,
         resources: name,

diff --git a/...h-admin-api/src/app/modules/personal-representative/personal-representative.controller.ts b/...h-admin-api/src/app/modules/personal-representative/personal-representative.controller.ts
@@ -114,7 +114,7 @@ export class PersonalRepresentativeController {
 
     return this.auditService.auditPromise(
       {
-        user,
+        auth: user,
         action: 'deleteScopePermission',
         namespace,
         resources: id,