Skip to content

Commit

Permalink
[#ENTE-20] Update @pagopa/io-functions-commons fix authorized cidrs (#…
Browse files Browse the repository at this point in the history
…108)

* [#ENTE-20] Fix authorized cidrs check without subnet

* [#ENTE-20] Fix lint

* [#ENTE-20] Remove dist folder before build, small lint test fix
  • Loading branch information
BurnedMarshal committed Apr 7, 2021
1 parent be9c252 commit 3d6b1ce
Show file tree
Hide file tree
Showing 61 changed files with 358 additions and 359 deletions.
4 changes: 2 additions & 2 deletions CreateMessage/__tests__/handler.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

import * as fc from "fast-check";

import { MessageModel } from "io-functions-commons/dist/src/models/message";
import { UserGroup } from "io-functions-commons/dist/src/utils/middlewares/azure_api_auth";
import { MessageModel } from "@pagopa/io-functions-commons/dist/src/models/message";
import { UserGroup } from "@pagopa/io-functions-commons/dist/src/utils/middlewares/azure_api_auth";

import { none, some } from "fp-ts/lib/Option";

Expand Down
30 changes: 15 additions & 15 deletions CreateMessage/handler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,48 +14,48 @@ import { fromEither, TaskEither, tryCatch } from "fp-ts/lib/TaskEither";

import * as t from "io-ts";

import { FiscalCode } from "io-functions-commons/dist/generated/definitions/FiscalCode";
import { NewMessage as ApiNewMessage } from "io-functions-commons/dist/generated/definitions/NewMessage";
import { TimeToLiveSeconds } from "io-functions-commons/dist/generated/definitions/TimeToLiveSeconds";
import { CreatedMessageEvent } from "io-functions-commons/dist/src/models/created_message_event";
import { FiscalCode } from "@pagopa/io-functions-commons/dist/generated/definitions/FiscalCode";
import { NewMessage as ApiNewMessage } from "@pagopa/io-functions-commons/dist/generated/definitions/NewMessage";
import { TimeToLiveSeconds } from "@pagopa/io-functions-commons/dist/generated/definitions/TimeToLiveSeconds";
import { CreatedMessageEvent } from "@pagopa/io-functions-commons/dist/src/models/created_message_event";
import {
Message,
MessageModel,
NewMessageWithoutContent
} from "io-functions-commons/dist/src/models/message";
import { ServiceModel } from "io-functions-commons/dist/src/models/service";
} from "@pagopa/io-functions-commons/dist/src/models/message";
import { ServiceModel } from "@pagopa/io-functions-commons/dist/src/models/service";
import {
AzureApiAuthMiddleware,
IAzureApiAuthorization,
UserGroup
} from "io-functions-commons/dist/src/utils/middlewares/azure_api_auth";
} from "@pagopa/io-functions-commons/dist/src/utils/middlewares/azure_api_auth";
import {
AzureUserAttributesMiddleware,
IAzureUserAttributes
} from "io-functions-commons/dist/src/utils/middlewares/azure_user_attributes";
} from "@pagopa/io-functions-commons/dist/src/utils/middlewares/azure_user_attributes";
import {
ClientIp,
ClientIpMiddleware
} from "io-functions-commons/dist/src/utils/middlewares/client_ip_middleware";
import { ContextMiddleware } from "io-functions-commons/dist/src/utils/middlewares/context_middleware";
import { OptionalFiscalCodeMiddleware } from "io-functions-commons/dist/src/utils/middlewares/fiscalcode";
} from "@pagopa/io-functions-commons/dist/src/utils/middlewares/client_ip_middleware";
import { ContextMiddleware } from "@pagopa/io-functions-commons/dist/src/utils/middlewares/context_middleware";
import { OptionalFiscalCodeMiddleware } from "@pagopa/io-functions-commons/dist/src/utils/middlewares/fiscalcode";
import {
IRequestMiddleware,
withRequestMiddlewares,
wrapRequestHandler
} from "io-functions-commons/dist/src/utils/request_middleware";
} from "@pagopa/io-functions-commons/dist/src/utils/request_middleware";
import {
IResponseErrorQuery,
ResponseErrorQuery
} from "io-functions-commons/dist/src/utils/response";
} from "@pagopa/io-functions-commons/dist/src/utils/response";
import {
checkSourceIpForHandler,
clientIPAndCidrTuple as ipTuple
} from "io-functions-commons/dist/src/utils/source_ip_check";
} from "@pagopa/io-functions-commons/dist/src/utils/source_ip_check";
import {
ObjectIdGenerator,
ulidGenerator
} from "io-functions-commons/dist/src/utils/strings";
} from "@pagopa/io-functions-commons/dist/src/utils/strings";

import { initAppInsights } from "italia-ts-commons/lib/appinsights";
import { readableReport } from "italia-ts-commons/lib/reporters";
Expand Down
10 changes: 5 additions & 5 deletions CreateMessage/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@ import * as express from "express";
import {
MESSAGE_COLLECTION_NAME,
MessageModel
} from "io-functions-commons/dist/src/models/message";
} from "@pagopa/io-functions-commons/dist/src/models/message";
import {
SERVICE_COLLECTION_NAME,
ServiceModel
} from "io-functions-commons/dist/src/models/service";
import { secureExpressApp } from "io-functions-commons/dist/src/utils/express";
import { setAppContext } from "io-functions-commons/dist/src/utils/middlewares/context_middleware";
} from "@pagopa/io-functions-commons/dist/src/models/service";
import { secureExpressApp } from "@pagopa/io-functions-commons/dist/src/utils/express";
import { setAppContext } from "@pagopa/io-functions-commons/dist/src/utils/middlewares/context_middleware";

import createAzureFunctionHandler from "io-functions-express/dist/src/createAzureFunctionsHandler";

import { withAppInsightsContext } from "io-functions-commons/dist/src/utils/application_insights";
import { withAppInsightsContext } from "@pagopa/io-functions-commons/dist/src/utils/application_insights";
import { initTelemetryClient } from "../utils/appinsights";
import { CreateMessage } from "./handler";

Expand Down
26 changes: 13 additions & 13 deletions CreateNotificationActivity/handler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,26 +9,26 @@ import { fromNullable, none, Option, some } from "fp-ts/lib/Option";

import { readableReport } from "italia-ts-commons/lib/reporters";

import { BlockedInboxOrChannelEnum } from "io-functions-commons/dist/generated/definitions/BlockedInboxOrChannel";
import { FiscalCode } from "io-functions-commons/dist/generated/definitions/FiscalCode";
import { HttpsUrl } from "io-functions-commons/dist/generated/definitions/HttpsUrl";
import { MessageContent } from "io-functions-commons/dist/generated/definitions/MessageContent";
import { NotificationChannelEnum } from "io-functions-commons/dist/generated/definitions/NotificationChannel";
import { CreatedMessageEvent } from "io-functions-commons/dist/src/models/created_message_event";
import { CreatedMessageEventSenderMetadata } from "io-functions-commons/dist/src/models/created_message_sender_metadata";
import { NewMessageWithoutContent } from "io-functions-commons/dist/src/models/message";
import { BlockedInboxOrChannelEnum } from "@pagopa/io-functions-commons/dist/generated/definitions/BlockedInboxOrChannel";
import { FiscalCode } from "@pagopa/io-functions-commons/dist/generated/definitions/FiscalCode";
import { HttpsUrl } from "@pagopa/io-functions-commons/dist/generated/definitions/HttpsUrl";
import { MessageContent } from "@pagopa/io-functions-commons/dist/generated/definitions/MessageContent";
import { NotificationChannelEnum } from "@pagopa/io-functions-commons/dist/generated/definitions/NotificationChannel";
import { CreatedMessageEvent } from "@pagopa/io-functions-commons/dist/src/models/created_message_event";
import { CreatedMessageEventSenderMetadata } from "@pagopa/io-functions-commons/dist/src/models/created_message_sender_metadata";
import { NewMessageWithoutContent } from "@pagopa/io-functions-commons/dist/src/models/message";
import {
createNewNotification,
NewNotification,
NotificationAddressSourceEnum,
NotificationChannelEmail,
NotificationModel
} from "io-functions-commons/dist/src/models/notification";
import { NotificationEvent } from "io-functions-commons/dist/src/models/notification_event";
import { RetrievedProfile } from "io-functions-commons/dist/src/models/profile";
import { ulidGenerator } from "io-functions-commons/dist/src/utils/strings";
} from "@pagopa/io-functions-commons/dist/src/models/notification";
import { NotificationEvent } from "@pagopa/io-functions-commons/dist/src/models/notification_event";
import { RetrievedProfile } from "@pagopa/io-functions-commons/dist/src/models/profile";
import { ulidGenerator } from "@pagopa/io-functions-commons/dist/src/utils/strings";

import { ServiceId } from "io-functions-commons/dist/generated/definitions/ServiceId";
import { ServiceId } from "@pagopa/io-functions-commons/dist/generated/definitions/ServiceId";
import { SuccessfulStoreMessageContentActivityResult } from "../StoreMessageContentActivity/handler";

/**
Expand Down
6 changes: 3 additions & 3 deletions CreateNotificationActivity/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
import { AzureFunction } from "@azure/functions";
import { cosmosdbInstance } from "../utils/cosmosdb";

import { FiscalCode } from "io-functions-commons/dist/generated/definitions/FiscalCode";
import { HttpsUrl } from "io-functions-commons/dist/generated/definitions/HttpsUrl";
import { FiscalCode } from "@pagopa/io-functions-commons/dist/generated/definitions/FiscalCode";
import { HttpsUrl } from "@pagopa/io-functions-commons/dist/generated/definitions/HttpsUrl";

import {
NOTIFICATION_COLLECTION_NAME,
NotificationModel
} from "io-functions-commons/dist/src/models/notification";
} from "@pagopa/io-functions-commons/dist/src/models/notification";

import { getCreateNotificationActivityHandler } from "./handler";

Expand Down
10 changes: 5 additions & 5 deletions CreateService/__tests__/handler.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
import {
IAzureApiAuthorization,
UserGroup
} from "io-functions-commons/dist/src/utils/middlewares/azure_api_auth";
import { IAzureUserAttributes } from "io-functions-commons/dist/src/utils/middlewares/azure_user_attributes";
} from "@pagopa/io-functions-commons/dist/src/utils/middlewares/azure_api_auth";
import { IAzureUserAttributes } from "@pagopa/io-functions-commons/dist/src/utils/middlewares/azure_user_attributes";

import { NonNegativeInteger } from "italia-ts-commons/lib/numbers";
import {
Expand All @@ -16,11 +16,11 @@ import {
OrganizationFiscalCode
} from "italia-ts-commons/lib/strings";

import { MaxAllowedPaymentAmount } from "io-functions-commons/dist/generated/definitions/MaxAllowedPaymentAmount";
import { MaxAllowedPaymentAmount } from "@pagopa/io-functions-commons/dist/generated/definitions/MaxAllowedPaymentAmount";

import { left, right } from "fp-ts/lib/Either";
import { ServiceScopeEnum } from "io-functions-commons/dist/generated/definitions/ServiceScope";
import { ServiceMetadata } from "io-functions-commons/dist/src/models/service";
import { ServiceScopeEnum } from "@pagopa/io-functions-commons/dist/generated/definitions/ServiceScope";
import { ServiceMetadata } from "@pagopa/io-functions-commons/dist/src/models/service";
import * as reporters from "italia-ts-commons/lib/reporters";
import { Subscription } from "../../generated/api-admin/Subscription";
import { UserInfo } from "../../generated/api-admin/UserInfo";
Expand Down
22 changes: 11 additions & 11 deletions CreateService/handler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,21 @@ import * as express from "express";
import {
ClientIp,
ClientIpMiddleware
} from "io-functions-commons/dist/src/utils/middlewares/client_ip_middleware";
} from "@pagopa/io-functions-commons/dist/src/utils/middlewares/client_ip_middleware";

import {
AzureApiAuthMiddleware,
IAzureApiAuthorization,
UserGroup
} from "io-functions-commons/dist/src/utils/middlewares/azure_api_auth";
} from "@pagopa/io-functions-commons/dist/src/utils/middlewares/azure_api_auth";
import {
AzureUserAttributesMiddleware,
IAzureUserAttributes
} from "io-functions-commons/dist/src/utils/middlewares/azure_user_attributes";
} from "@pagopa/io-functions-commons/dist/src/utils/middlewares/azure_user_attributes";
import {
withRequestMiddlewares,
wrapRequestHandler
} from "io-functions-commons/dist/src/utils/request_middleware";
} from "@pagopa/io-functions-commons/dist/src/utils/request_middleware";
import {
IResponseErrorForbiddenNotAuthorized,
IResponseErrorInternal,
Expand All @@ -30,18 +30,18 @@ import {
import {
checkSourceIpForHandler,
clientIPAndCidrTuple as ipTuple
} from "io-functions-commons/dist/src/utils/source_ip_check";
} from "@pagopa/io-functions-commons/dist/src/utils/source_ip_check";

import { Context } from "@azure/functions";
import { identity } from "fp-ts/lib/function";
import { TaskEither } from "fp-ts/lib/TaskEither";
import { ServiceModel } from "io-functions-commons/dist/src/models/service";
import { ContextMiddleware } from "io-functions-commons/dist/src/utils/middlewares/context_middleware";
import { RequiredBodyPayloadMiddleware } from "io-functions-commons/dist/src/utils/middlewares/required_body_payload";
import { ServiceModel } from "@pagopa/io-functions-commons/dist/src/models/service";
import { ContextMiddleware } from "@pagopa/io-functions-commons/dist/src/utils/middlewares/context_middleware";
import { RequiredBodyPayloadMiddleware } from "@pagopa/io-functions-commons/dist/src/utils/middlewares/required_body_payload";
import {
ObjectIdGenerator,
ulidGenerator
} from "io-functions-commons/dist/src/utils/strings";
} from "@pagopa/io-functions-commons/dist/src/utils/strings";
import { identity } from "fp-ts/lib/function";
import { TaskEither } from "fp-ts/lib/TaskEither";
import { initAppInsights } from "italia-ts-commons/lib/appinsights";
import {
EmailString,
Expand Down
6 changes: 3 additions & 3 deletions CreateService/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import { cosmosdbInstance } from "../utils/cosmosdb";
import {
SERVICE_COLLECTION_NAME,
ServiceModel
} from "io-functions-commons/dist/src/models/service";
import { secureExpressApp } from "io-functions-commons/dist/src/utils/express";
import { setAppContext } from "io-functions-commons/dist/src/utils/middlewares/context_middleware";
} from "@pagopa/io-functions-commons/dist/src/models/service";
import { secureExpressApp } from "@pagopa/io-functions-commons/dist/src/utils/express";
import { setAppContext } from "@pagopa/io-functions-commons/dist/src/utils/middlewares/context_middleware";

import createAzureFunctionHandler from "io-functions-express/dist/src/createAzureFunctionsHandler";

Expand Down
8 changes: 4 additions & 4 deletions CreatedMessageOrchestrator/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ import { IOrchestrationFunctionContext } from "durable-functions/lib/src/classes

import { readableReport } from "italia-ts-commons/lib/reporters";

import { NotificationChannelEnum } from "io-functions-commons/dist/generated/definitions/NotificationChannel";
import { NotificationChannelStatusValueEnum } from "io-functions-commons/dist/generated/definitions/NotificationChannelStatusValue";
import { CreatedMessageEvent } from "io-functions-commons/dist/src/models/created_message_event";
import { NotificationChannelEnum } from "@pagopa/io-functions-commons/dist/generated/definitions/NotificationChannel";
import { NotificationChannelStatusValueEnum } from "@pagopa/io-functions-commons/dist/generated/definitions/NotificationChannelStatusValue";
import { CreatedMessageEvent } from "@pagopa/io-functions-commons/dist/src/models/created_message_event";

import { MessageStatusValueEnum } from "io-functions-commons/dist/generated/definitions/MessageStatusValue";
import { MessageStatusValueEnum } from "@pagopa/io-functions-commons/dist/generated/definitions/MessageStatusValue";
import {
CreateNotificationActivityInput,
CreateNotificationActivityResult
Expand Down
20 changes: 10 additions & 10 deletions EmailNotificationActivity/__tests__/handler.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,21 @@ import {
import { some } from "fp-ts/lib/Option";
import { fromLeft, taskEither } from "fp-ts/lib/TaskEither";

import { EmailAddress } from "io-functions-commons/dist/generated/definitions/EmailAddress";
import { MessageBodyMarkdown } from "io-functions-commons/dist/generated/definitions/MessageBodyMarkdown";
import { MessageContent } from "io-functions-commons/dist/generated/definitions/MessageContent";
import { MessageSubject } from "io-functions-commons/dist/generated/definitions/MessageSubject";
import { TimeToLiveSeconds } from "io-functions-commons/dist/generated/definitions/TimeToLiveSeconds";

import { NotificationChannelEnum } from "io-functions-commons/dist/generated/definitions/NotificationChannel";
import * as mail from "io-functions-commons/dist/src/mailer";
import { CreatedMessageEventSenderMetadata } from "io-functions-commons/dist/src/models/created_message_sender_metadata";
import { EmailAddress } from "@pagopa/io-functions-commons/dist/generated/definitions/EmailAddress";
import { MessageBodyMarkdown } from "@pagopa/io-functions-commons/dist/generated/definitions/MessageBodyMarkdown";
import { MessageContent } from "@pagopa/io-functions-commons/dist/generated/definitions/MessageContent";
import { MessageSubject } from "@pagopa/io-functions-commons/dist/generated/definitions/MessageSubject";
import { TimeToLiveSeconds } from "@pagopa/io-functions-commons/dist/generated/definitions/TimeToLiveSeconds";

import { NotificationChannelEnum } from "@pagopa/io-functions-commons/dist/generated/definitions/NotificationChannel";
import * as mail from "@pagopa/io-functions-commons/dist/src/mailer";
import { CreatedMessageEventSenderMetadata } from "@pagopa/io-functions-commons/dist/src/models/created_message_sender_metadata";
import {
NewNotification,
NotificationAddressSourceEnum,
NotificationModel,
RetrievedNotification
} from "io-functions-commons/dist/src/models/notification";
} from "@pagopa/io-functions-commons/dist/src/models/notification";

beforeEach(() => jest.clearAllMocks());

Expand Down
8 changes: 4 additions & 4 deletions EmailNotificationActivity/handler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@ import * as NodeMailer from "nodemailer";
import { readableReport } from "italia-ts-commons/lib/reporters";
import { NonEmptyString } from "italia-ts-commons/lib/strings";

import { ActiveMessage } from "io-functions-commons/dist/src/models/message";
import { ActiveMessage } from "@pagopa/io-functions-commons/dist/src/models/message";
import {
EmailNotification,
NotificationModel
} from "io-functions-commons/dist/src/models/notification";
import { NotificationEvent } from "io-functions-commons/dist/src/models/notification_event";
} from "@pagopa/io-functions-commons/dist/src/models/notification";
import { NotificationEvent } from "@pagopa/io-functions-commons/dist/src/models/notification_event";

import { generateDocumentHtml } from "./utils";

import { sendMail } from "io-functions-commons/dist/src/mailer";
import { sendMail } from "@pagopa/io-functions-commons/dist/src/mailer";

export interface INotificationDefaults {
readonly HTML_TO_TEXT_OPTIONS: HtmlToTextOptions;
Expand Down
4 changes: 2 additions & 2 deletions EmailNotificationActivity/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ import { cosmosdbInstance } from "../utils/cosmosdb";
import {
NOTIFICATION_COLLECTION_NAME,
NotificationModel
} from "io-functions-commons/dist/src/models/notification";
} from "@pagopa/io-functions-commons/dist/src/models/notification";

import { getEmailNotificationActivityHandler } from "./handler";

import { getMailerTransporter } from "io-functions-commons/dist/src/mailer";
import { getMailerTransporter } from "@pagopa/io-functions-commons/dist/src/mailer";
import { getConfigOrThrow } from "../utils/config";

const config = getConfigOrThrow();
Expand Down
10 changes: 5 additions & 5 deletions EmailNotificationActivity/utils.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { Either, left, right } from "fp-ts/lib/Either";
import * as NodeMailer from "nodemailer";

import { MessageBodyMarkdown } from "io-functions-commons/dist/generated/definitions/MessageBodyMarkdown";
import { MessageSubject } from "io-functions-commons/dist/generated/definitions/MessageSubject";
import { CreatedMessageEventSenderMetadata } from "io-functions-commons/dist/src/models/created_message_sender_metadata";
import { markdownToHtml } from "io-functions-commons/dist/src/utils/markdown";
import { MessageBodyMarkdown } from "@pagopa/io-functions-commons/dist/generated/definitions/MessageBodyMarkdown";
import { MessageSubject } from "@pagopa/io-functions-commons/dist/generated/definitions/MessageSubject";
import { CreatedMessageEventSenderMetadata } from "@pagopa/io-functions-commons/dist/src/models/created_message_sender_metadata";
import { markdownToHtml } from "@pagopa/io-functions-commons/dist/src/utils/markdown";

import defaultEmailTemplate from "io-functions-commons/dist/src/templates/html/default";
import defaultEmailTemplate from "@pagopa/io-functions-commons/dist/src/templates/html/default";

const defaultEmailFooterMarkdown = `**Non rispondere a questa email. Questa casella di posta è utilizzata solo per l'invio della presente mail e, non essendo monitorata, non riceveresti risposta.**
Expand Down
6 changes: 3 additions & 3 deletions GetLimitedProfile/__tests__/handler.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ import { none, some } from "fp-ts/lib/Option";
import {
ProfileModel,
RetrievedProfile
} from "io-functions-commons/dist/src/models/profile";
} from "@pagopa/io-functions-commons/dist/src/models/profile";
import {
IAzureApiAuthorization,
UserGroup
} from "io-functions-commons/dist/src/utils/middlewares/azure_api_auth";
import { IAzureUserAttributes } from "io-functions-commons/dist/src/utils/middlewares/azure_user_attributes";
} from "@pagopa/io-functions-commons/dist/src/utils/middlewares/azure_api_auth";
import { IAzureUserAttributes } from "@pagopa/io-functions-commons/dist/src/utils/middlewares/azure_user_attributes";
import {
EmailString,
FiscalCode,
Expand Down
Loading

0 comments on commit 3d6b1ce

Please sign in to comment.