Merge branch 'main' into service-portal/health-overview-fix

apps/service-portal/src/auth.ts

@@ -7,7 +7,6 @@ import {
   EndorsementsScope,
   HmsScope,
   NationalRegistryScope,
-  NotificationsScope,
   UserProfileScope,
 } from '@island.is/auth/scopes'
 
@@ -52,8 +51,6 @@ const SERVICE_PORTAL_SCOPES = [
   ApiScope.healthRightsStatus,
   ApiScope.healthDentists,
   ApiScope.signatureCollection,
-  NotificationsScope.read,
-  NotificationsScope.write,
 ]
 
 const userMocked = process.env.API_MOCKS === 'true'

apps/services/user-notification/src/app/modules/notifications/me-notifications.controller.ts

@@ -11,7 +11,7 @@ import {
 } from '@nestjs/common'
 import { ApiSecurity, ApiTags } from '@nestjs/swagger'
 
-import { NotificationsScope } from '@island.is/auth/scopes'
+import { DocumentsScope } from '@island.is/auth/scopes'
 import { NotificationsService } from './notifications.service'
 import {
   CurrentUser,
@@ -33,8 +33,8 @@ import {
 import { Documentation } from '@island.is/nest/swagger'
 
 @UseGuards(IdsUserGuard, ScopesGuard)
-@Scopes(NotificationsScope.read)
-@ApiSecurity('oauth2', [NotificationsScope.read])
+@Scopes(DocumentsScope.main)
+@ApiSecurity('oauth2', [DocumentsScope.main])
 @ApiTags('user-notification')
 @Controller({
   path: 'me/notifications',
@@ -91,8 +91,6 @@ export class MeNotificationsController {
   }
 
   @Post('/mark-all-as-seen')
-  @Scopes(NotificationsScope.write)
-  @ApiSecurity('oauth2', [NotificationsScope.write])
   @Documentation({
     summary: 'Updates all of  current user notifications as seen',
     response: { status: HttpStatus.NO_CONTENT },
@@ -102,8 +100,6 @@ export class MeNotificationsController {
   }
 
   @Post('/mark-all-as-read')
-  @Scopes(NotificationsScope.write)
-  @ApiSecurity('oauth2', [NotificationsScope.write])
   @Documentation({
     summary: 'Updates all of  current user notifications as read',
     response: { status: HttpStatus.NO_CONTENT },
@@ -117,8 +113,6 @@ export class MeNotificationsController {
     response: { status: HttpStatus.OK, type: RenderedNotificationDto },
   })
   @Patch(':id')
-  @Scopes(NotificationsScope.write)
-  @ApiSecurity('oauth2', [NotificationsScope.write])
   update(
     @CurrentUser() user: User,
     @Param('id') id: number,

apps/services/user-notification/src/app/modules/notifications/tests/me-notifications.controller.spec.ts

@@ -10,7 +10,7 @@ import {
 
 import { AppModule } from '../../../app.module'
 import { SequelizeConfigService } from '../../../sequelizeConfig.service'
-import { NotificationsScope } from '@island.is/auth/scopes'
+import { DocumentsScope } from '@island.is/auth/scopes'
 
 beforeAll(async () => {
   process.env.INIT_SCHEMA = 'true' // Disabling Firebase init
@@ -92,7 +92,7 @@ describe('MeNotificationsController - GET With Auth And Scope', () => {
         AppModule,
         SequelizeConfigService,
         user: createCurrentUser({
-          scope: [NotificationsScope.read],
+          scope: [DocumentsScope.main],
         }),
       })
       const server = request(app.getHttpServer())
@@ -122,7 +122,7 @@ describe('MeNotificationsController - PATCH With Auth And Scope', () => {
         AppModule,
         SequelizeConfigService,
         user: createCurrentUser({
-          scope: [NotificationsScope.read, NotificationsScope.write],
+          scope: [DocumentsScope.main],
         }),
       })
       const server = request(app.getHttpServer())

apps/services/user-notification/src/app/modules/notifications/tests/notifications.service.spec.ts

@@ -6,7 +6,7 @@ import { CreateHnippNotificationDto } from '../dto/createHnippNotification.dto'
 import { CacheModule } from '@nestjs/cache-manager'
 import { getModelToken } from '@nestjs/sequelize'
 import { Notification } from '../notification.model'
-import { NotificationsScope } from '@island.is/auth/scopes'
+import { DocumentsScope } from '@island.is/auth/scopes'
 import type { User } from '@island.is/auth-nest-tools'
 
 import {
@@ -20,7 +20,7 @@ import {
 
 const user: User = {
   nationalId: '1234567890',
-  scope: [NotificationsScope.read, NotificationsScope.write],
+  scope: [DocumentsScope.main],
   authorization: '',
   client: '',
 }

apps/services/user-notification/src/openApi.ts

@@ -1,5 +1,5 @@
 import { DocumentBuilder } from '@nestjs/swagger'
-import { NotificationsScope } from '@island.is/auth/scopes'
+import { DocumentsScope } from '@island.is/auth/scopes'
 import { environment } from './environments/environment'
 
 export const openApi = new DocumentBuilder()
@@ -16,8 +16,7 @@ export const openApi = new DocumentBuilder()
         scopes: {
           ['openid']: '',
           ['profile']: '',
-          [NotificationsScope.read]: '',
-          [NotificationsScope.write]: '',
+          [DocumentsScope.main]: '',
         },
         authorizationUrl: `${environment.auth.issuer}/connect/authorize`,
         tokenUrl: `${environment.auth.issuer}/connect/token`,

libs/auth/scopes/src/index.ts

@@ -21,5 +21,4 @@ export * from './lib/aosh.scope'
 export * from './lib/district-commissioners.scope'
 export * from './lib/hms.scope'
 export * from './lib/recycling-fund.scope'
-export * from './lib/notifications.scope'
 export * from './lib/universityGateway.scope'