@api-client/core 0.6.30 → 0.7.1

package/src/models/{arc/ArcProject.ts → AppProject.ts}

@@ -4,18 +4,36 @@
 /* eslint-disable max-classes-per-file */
 // import { ARCHistoryRequest, ARCSavedRequest } from "@api-client/core/build/legacy.js";
 
-import v4 from "../../lib/uuid.js";
-import { HttpRequest, IHttpRequest } from "../HttpRequest.js";
-import { IRequest, Request } from "../Request.js";
-import { IThing, Thing } from "../Thing.js";
-import { ARCHistoryRequest, ARCSavedRequest } from "../legacy/request/ArcRequest.js";
-import { ARCProject } from "../legacy/models/ArcLegacyProject.js";
+import v4 from "../lib/uuid.js";
+import { HttpRequest, IHttpRequest } from "./HttpRequest.js";
+import { IRequest, Request } from "./Request.js";
+import { Environment, IEnvironment, Kind as EnvironmentKind } from './Environment.js';
+import { IThing, Thing } from "./Thing.js";
+import { ARCHistoryRequest, ARCSavedRequest } from "./legacy/request/ArcRequest.js";
+import { ARCProject } from "./legacy/models/ArcLegacyProject.js";
+import { Certificate, HttpCertificate } from "./ClientCertificate.js";
+import { ICCAuthorization } from "./Authorization.js";
+import { IProjectRequestIterator } from "./HttpProject.js";
 
-export const ArcProjectKind = 'ARC#HttpProject';
-export const ArcProjectFolderKind = 'ARC#HttpProjectFolder';
-export const ArcProjectRequestKind = 'ARC#HttpProjectRequest';
+export const AppProjectKind = 'Core#AppProject';
+export const AppProjectFolderKind = 'Core#AppProjectFolder';
+export const AppProjectRequestKind = 'Core#AppProjectRequest';
 
-export interface IArcRequestCloneOptions {
+export interface IAppProjectItemOptions {
+  /**
+   * The parent folder to add the item to.
+   */
+  parent?: string;
+}
+
+export interface IAppProjectItemCreateOptions extends IAppProjectItemOptions {
+  /**
+   * The position at which to add the item.
+   */
+  index?: number;
+}
+
+export interface IAppProjectRequestCloneOptions {
   /**
    * By default it revalidates (re-creates) keys in the request.
    * Set this to true to not make any changes to the keys.
@@ -29,14 +47,14 @@ export interface IArcRequestCloneOptions {
   withoutAttach?: boolean;
 }
 
-export interface IArcFolderAddOptions {
+export interface IAppProjectFolderAddOptions {
   /**
    * Optionally the position at which to add the request into the list of items.
    */
   index?: number;
 }
 
-export interface IArcFolderCloneOptions {
+export interface IAppProjectFolderCloneOptions {
   /**
    * By default it clones the folder with all requests in it.
    * Set this to `true` to skip copying the requests along with the folder.
@@ -53,7 +71,7 @@ export interface IArcFolderCloneOptions {
    * is put into the project root rather than the parent folder (as it would when cloning
    * a folder inside the same project).
    */
-  targetProject?: ArcProject;
+  targetProject?: AppProject;
   /**
    * The **key** of the target folder.
    * 
@@ -63,23 +81,19 @@ export interface IArcFolderCloneOptions {
   targetFolder?: string;
 }
 
-export interface IArcFolderCreateOptions {
+export interface IAppProjectFolderCreateOptions extends IAppProjectItemOptions {
   /**
    * Ignores the operation when the folder with the same name already exists. 
    * This command can be used used to ensure that the folder exists.
    */
   skipExisting?: boolean;
-  /**
-   * The id of the parent folder. When not set it adds the folder to the project root.
-   */
-  parent?: string;
   /**
    * Optionally the position at which to add the folder into the list of items.
    */
   index?: number;
 }
 
-export interface IArcFolderSearchOptions {
+export interface IAppProjectFolderSearchOptions {
   /**
    * When set it searches for a folder using keys only. 
    * By default it searches for a key and the name.
@@ -87,25 +101,21 @@ export interface IArcFolderSearchOptions {
   keyOnly?: boolean;
 }
 
-export interface IArcFolderDeleteOptions {
+export interface IAppProjectFolderDeleteOptions {
   /**
    * When set it won't throw an error when the folder is not found in the project.
    */
   safe?: boolean;
 }
 
-export interface IArcRequestAddOptions {
-  /**
-   * The id of the parent folder. When not set it adds the request to the project root.
-   */
-  parent?: string;
+export interface IAppProjectRequestAddOptions extends IAppProjectItemOptions {
   /**
    * Optionally the position at which to add the request into the list of items.
    */
   index?: number;
 }
 
-export interface IArcRequestSearchOptions {
+export interface IAppProjectRequestSearchOptions {
   /**
    * When set it searches for a request using keys only. 
    * By default it searches for a key and the name.
@@ -113,33 +123,28 @@ export interface IArcRequestSearchOptions {
   keyOnly?: boolean;
 }
 
-export interface IArcRequestDeleteOptions {
+export interface IAppProjectRequestDeleteOptions {
   /**
    * When set it won't throw an error when the request is not found in the project.
    */
   safe?: boolean;
 }
 
-export interface IArcProjectMoveOptions {
+export interface IAppProjectProjectMoveOptions extends IAppProjectItemOptions {
   /**
    * The position at which to insert the object in the destination. BY default it adds the object at the end.
    */
   index?: number;
-  /**
-   * The name or the key of the parent folder to move the item into. 
-   * When not set it moves the item to the project's root.
-   */
-  parent?: string;
 }
 
-export interface IArcFolderListOptions {
+export interface IAppProjectFolderListOptions {
   /**
    * Folder name or key to list folders for.
    */
   folder?: string;
 }
 
-export interface IArcProjectCloneOptions {
+export interface IAppProjectProjectCloneOptions {
   /**
    * By default it revalidates (re-creates) keys in the request.
    * Set this to true to not make any changes to the keys.
@@ -147,49 +152,72 @@ export interface IArcProjectCloneOptions {
   withoutRevalidate?: boolean;
 }
 
-export interface IArcProjectRequest extends IRequest {
-  kind: typeof ArcProjectRequestKind;
+export interface IAppProjectEnvironmentCreateOptions extends IAppProjectItemOptions {
+  /**
+   * The position at which to add the item.
+   */
+  index?: number;
+}
+
+export interface IAppProjectReadEnvironmentOptions extends IAppProjectItemOptions {
+  /**
+   * The name or the key of the environment to select.
+   * 
+   * When the name is not specified it selects: 
+   * - the first environment from the project, if any
+   * - any parent folder's first environment to the requested folder, if any (if parent is set)
+   * - the requested folder's first environment, if any (if parent is set)
+   */
+  nameOrKey?: string;
+}
+
+export interface IAppProjectRequest extends IRequest {
+  kind: typeof AppProjectRequestKind;
   key: string;
 }
 
-export interface IArcProjectItem {
-  kind: typeof ArcProjectFolderKind | typeof ArcProjectRequestKind;
+export interface IAppProjectItem {
+  kind: typeof AppProjectFolderKind | typeof AppProjectRequestKind | typeof EnvironmentKind;
   key: string;
 }
 
-export interface IArcProjectDefinitions {
+export interface IAppProjectDefinitions {
   /**
    * The list of all folders defined in the project.
    */
-  folders?: IProjectParent[];
+  folders?: IAppProjectParent[];
   /**
    * The list of all requests defined in the project.
    */
-  requests?: IArcProjectRequest[];
+  requests?: IAppProjectRequest[];
+  environments?: IEnvironment[];
+  certificates?: HttpCertificate[];
 }
 
-export interface ArcProjectDefinitions {
+export interface AppProjectDefinitions {
   /**
    * The list of all folders defined in the project.
    */
-  folders: ArcProjectFolder[];
+  folders: AppProjectFolder[];
   /**
    * The list of all requests defined in the project.
    */
-  requests: ArcProjectRequest[];
+  requests: AppProjectRequest[];
+  environments: Environment[];
+  certificates: Certificate[];
 }
 
-export interface IArcProject extends IProjectParent {
-  definitions: IArcProjectDefinitions;
+/**
+ * An app project is similar to the HttpProject but stored for a single application
+ * and has no sharing options. The AppProject can be upgraded to an HttpProject.
+ */
+export interface IAppProject extends IAppProjectParent {
+  definitions: IAppProjectDefinitions;
 }
 
-export interface IProjectParent {
+export interface IAppProjectParent {
   key: string;
-  /**
-   * The auto-generated key for the folder object.
-   * For the project root this is the same as the `_id`.
-   */
-  kind: typeof ArcProjectKind | typeof ArcProjectFolderKind;
+  kind: typeof AppProjectKind | typeof AppProjectFolderKind;
   /**
    * Folder meta
    */
@@ -199,7 +227,7 @@ export interface IProjectParent {
    * It is an ordered list of requests and folders.
    * The actual definition is kept in the root's `definitions`.
    */
-  items: IArcProjectItem[];
+  items: IAppProjectItem[];
   /**
    * Timestamp when the project was last updated.
    */
@@ -210,8 +238,8 @@ export interface IProjectParent {
   created?: number;
 }
 
-export class ArcProjectRequest extends Request {
-  kind = ArcProjectRequestKind;
+export class AppProjectRequest extends Request {
+  kind = AppProjectRequestKind;
 
   /**
    * The identifier of the request.
@@ -221,7 +249,7 @@ export class ArcProjectRequest extends Request {
   /**
    * A reference to the top level project object.
    */
-  project: ArcProject;
+  project: AppProject;
 
   /**
    * Creates a project request from an URL.
@@ -230,14 +258,14 @@ export class ArcProjectRequest extends Request {
    * @param url The Request URL. This is required.
    * @param project The parent project.
    */
-  static fromUrl(url: string, project?: ArcProject): ArcProjectRequest {
+  static fromUrl(url: string, project?: AppProject): AppProjectRequest {
     if (!project) {
       throw new Error(`The project is required.`);
     }
     const now: number = Date.now();
-    const request = new ArcProjectRequest(project, {
+    const request = new AppProjectRequest(project, {
       key: v4(),
-      kind: ArcProjectRequestKind,
+      kind: AppProjectRequestKind,
       created: now,
       updated: now,
       expects: HttpRequest.fromBaseValues({ url, method: 'GET' }).toJSON(),
@@ -253,14 +281,14 @@ export class ArcProjectRequest extends Request {
    * @param name The Request name.
    * @param project The parent project.This is required.
    */
-  static fromName(name: string, project?: ArcProject): ArcProjectRequest {
+  static fromName(name: string, project?: AppProject): AppProjectRequest {
     if (!project) {
       throw new Error(`The project is required.`);
     }
     const now: number = Date.now();
-    const request = new ArcProjectRequest(project, {
+    const request = new AppProjectRequest(project, {
       key: v4(),
-      kind: ArcProjectRequestKind,
+      kind: AppProjectRequestKind,
       created: now,
       updated: now,
       expects: new HttpRequest().toJSON(),
@@ -276,14 +304,14 @@ export class ArcProjectRequest extends Request {
    * @param project The parent project This is required.
    * @param info The request data.
    */
-  static fromHttpRequest(info: IHttpRequest, project?: ArcProject): ArcProjectRequest {
+  static fromHttpRequest(info: IHttpRequest, project?: AppProject): AppProjectRequest {
     if (!project) {
       throw new Error(`The project is required.`);
     }
     const now: number = Date.now();
-    const request = new ArcProjectRequest(project, {
+    const request = new AppProjectRequest(project, {
       key: v4(),
-      kind: ArcProjectRequestKind,
+      kind: AppProjectRequestKind,
       created: now,
       updated: now,
       expects: HttpRequest.fromBaseValues({ method: info.method, url: info.url, headers: info.headers, payload: info.payload }).toJSON(),
@@ -295,18 +323,18 @@ export class ArcProjectRequest extends Request {
   /**
    * Creates a project request for a schema of a Request.
    */
-  static fromRequest(request: IRequest, project: ArcProject): ArcProjectRequest {
+  static fromRequest(request: IRequest, project: AppProject): AppProjectRequest {
     const key = v4();
-    const init: IArcProjectRequest = { ...request, key, kind: ArcProjectRequestKind };
-    const result = new ArcProjectRequest(project, init);
+    const init: IAppProjectRequest = { ...request, key, kind: AppProjectRequestKind };
+    const result = new AppProjectRequest(project, init);
     return result;
   }
 
-  constructor(project: ArcProject, input?: string | IArcProjectRequest) {
+  constructor(project: AppProject, input?: string | IAppProjectRequest) {
     super(input);
     this.project = project;
 
-    let init: IArcProjectRequest | undefined;
+    let init: IAppProjectRequest | undefined;
     if (typeof input === 'string') {
       init = JSON.parse(input);
     } else if (typeof input === 'object') {
@@ -315,27 +343,27 @@ export class ArcProjectRequest extends Request {
     if (init) {
       this.key = init.key || v4();
     }
-    this.kind = ArcProjectRequestKind;
+    this.kind = AppProjectRequestKind;
   }
 
-  new(init: IArcProjectRequest): void {
+  new(init: IAppProjectRequest): void {
     super.new(init);
 
     const { key = v4() } = init;
     this.key = key;
-    this.kind = ArcProjectRequestKind;
+    this.kind = AppProjectRequestKind;
   }
 
-  toJSON(): IArcProjectRequest {
+  toJSON(): IAppProjectRequest {
     const request = super.toJSON();
-    const result: IArcProjectRequest = { ...request, key: this.key, kind: ArcProjectRequestKind };
+    const result: IAppProjectRequest = { ...request, key: this.key, kind: AppProjectRequestKind };
     return result;
   }
 
   /**
    * @returns The instance of the ArcProject or a ArcProjectFolder that is a closes parent of this instance.
    */
-  getParent(): ArcProjectFolder | ArcProject | undefined {
+  getParent(): AppProjectFolder | AppProject | undefined {
     const { project, key } = this;
     return project.findParent(key);
   }
@@ -343,7 +371,7 @@ export class ArcProjectRequest extends Request {
   /**
    * @returns A reference to the parent folder or the top-level HTTP project.
    */
-  getProject(): ArcProject {
+  getProject(): AppProject {
     return this.project;
   }
 
@@ -359,8 +387,8 @@ export class ArcProjectRequest extends Request {
    * By default it attaches the copied request to the same parent.
    * Use the options dictionary to control this behavior.
    */
-  clone(opts: IArcRequestCloneOptions = {}): ArcProjectRequest {
-    const copy = new ArcProjectRequest(this.project, this.toJSON());
+  clone(opts: IAppProjectRequestCloneOptions = {}): AppProjectRequest {
+    const copy = new AppProjectRequest(this.project, this.toJSON());
     if (!opts.withoutRevalidate) {
       copy.key = v4();
     }
@@ -382,17 +410,17 @@ export class ArcProjectRequest extends Request {
    * @param opts Optional options.
    * @returns The copied request.
    */
-  static clone(request: IArcProjectRequest, project: ArcProject, opts: IArcRequestCloneOptions = {}): ArcProjectRequest {
-    const obj = new ArcProjectRequest(project, request);
+  static clone(request: IAppProjectRequest, project: AppProject, opts: IAppProjectRequestCloneOptions = {}): AppProjectRequest {
+    const obj = new AppProjectRequest(project, request);
     return obj.clone(opts);
   }
 }
 
-export class ArcProjectItem {
+export class AppProjectItem {
   /**
    * The kind of the item.
    */
-  kind: typeof ArcProjectFolderKind | typeof ArcProjectRequestKind = ArcProjectRequestKind;
+  kind: typeof AppProjectFolderKind | typeof AppProjectRequestKind | typeof EnvironmentKind = AppProjectRequestKind;
 
   /**
    * The identifier of the object in the `definitions` array of the project.
@@ -402,14 +430,14 @@ export class ArcProjectItem {
   /**
    * A reference to the top level project object.
    */
-  project: ArcProject;
+  project: AppProject;
 
   /**
    * Checks whether the input is a definition of a project item.
    */
   static isProjectItem(input: unknown): boolean {
-    const typed = input as IArcProjectItem;
-    if (!input || ![ArcProjectFolderKind, ArcProjectRequestKind].includes(typed.kind)) {
+    const typed = input as IAppProjectItem;
+    if (!input || ![AppProjectFolderKind, AppProjectRequestKind, EnvironmentKind].includes(typed.kind)) {
       return false;
     }
     return true;
@@ -418,9 +446,9 @@ export class ArcProjectItem {
   /**
    * @return An instance that represents a request item
    */
-  static projectRequest(project: ArcProject, key: string): ArcProjectItem {
-    const item = new ArcProjectItem(project, {
-      kind: ArcProjectRequestKind,
+  static projectRequest(project: AppProject, key: string): AppProjectItem {
+    const item = new AppProjectItem(project, {
+      kind: AppProjectRequestKind,
       key,
     });
     return item;
@@ -429,9 +457,20 @@ export class ArcProjectItem {
   /**
    * @return An instance that represents a folder item
    */
-  static projectFolder(project: ArcProject, key: string): ArcProjectItem {
-    const item = new ArcProjectItem(project, {
-      kind: ArcProjectFolderKind,
+  static projectFolder(project: AppProject, key: string): AppProjectItem {
+    const item = new AppProjectItem(project, {
+      kind: AppProjectFolderKind,
+      key,
+    });
+    return item;
+  }
+
+  /**
+   * @return An instance that represents an environment item
+   */
+  static projectEnvironment(project: AppProject, key: string): AppProjectItem {
+    const item = new AppProjectItem(project, {
+      kind: EnvironmentKind,
       key,
     });
     return item;
@@ -441,18 +480,23 @@ export class ArcProjectItem {
    * @param project The top-most project.
    * @param input The project item definition used to restore the state.
    */
-  constructor(project: ArcProject, input: string | IArcProjectItem) {
+  constructor(project: AppProject, input: string | IAppProjectItem) {
     this.project = project;
-    let init: IArcProjectItem;
+    let init: IAppProjectItem;
     if (typeof input === 'string') {
       if (input === 'http-request') {
         init = {
-          kind: ArcProjectRequestKind,
+          kind: AppProjectRequestKind,
           key: '',
         };
       } else if (input === 'folder') {
         init = {
-          kind: ArcProjectFolderKind,
+          kind: AppProjectFolderKind,
+          key: '',
+        };
+      } else if (input === 'environment') {
+        init = {
+          kind: EnvironmentKind,
           key: '',
         };
       } else {
@@ -471,8 +515,8 @@ export class ArcProjectItem {
    * 
    * Note, this throws an error when the project item is not a project item. 
    */
-  new(init: IArcProjectItem): void {
-    if (!ArcProjectItem.isProjectItem(init)) {
+  new(init: IAppProjectItem): void {
+    if (!AppProjectItem.isProjectItem(init)) {
       throw new Error(`Not a project item.`);
     }
     const { kind, key } = init;
@@ -480,8 +524,8 @@ export class ArcProjectItem {
     this.key = key;
   }
 
-  toJSON(): IArcProjectItem {
-    const result: IArcProjectItem = {
+  toJSON(): IAppProjectItem {
+    const result: IAppProjectItem = {
       kind: this.kind,
       key: this.key,
     };
@@ -491,33 +535,36 @@ export class ArcProjectItem {
   /**
    * @returns The instance of the definition associated with this item.
    */
-  getItem(): ArcProjectFolder | ArcProjectRequest | undefined {
+  getItem(): AppProjectFolder | AppProjectRequest | Environment | undefined {
     const { project, key, kind } = this;
     const { definitions } = project;
-    if (kind === ArcProjectRequestKind) {
+    if (kind === AppProjectRequestKind) {
       return definitions.requests.find(i => i.key === key);
     }
-    if (kind === ArcProjectFolderKind) {
+    if (kind === AppProjectFolderKind) {
       return definitions.folders.find(i => i.key === key);
     }
+    if (kind === EnvironmentKind) {
+      return definitions.environments.find(i => i.key === key);
+    }
     return undefined;
   }
 
   /**
    * @returns The instance of the ArcProject or a ArcProjectFolder that is a closest parent of this item.
    */
-  getParent(): ArcProjectFolder | ArcProject | undefined {
+  getParent(): AppProjectFolder | AppProject | undefined {
     const { project, key } = this;
     return project.findParent(key);
   }
 }
 
-export abstract class ArcProjectParent {
+export abstract class AppProjectParent {
   /**
    * The auto-generated key for the folder object.
    * For the project root this is the same as the `_id`.
    */
-  kind: typeof ArcProjectKind | typeof ArcProjectFolderKind;
+  kind: typeof AppProjectKind | typeof AppProjectFolderKind;
 
   /**
    * The key of the project / folder.
@@ -534,7 +581,7 @@ export abstract class ArcProjectParent {
    * It is an ordered list of requests and folders.
    * The actual definition is kept in the root's `definitions`.
    */
-  items: ArcProjectItem[] = [];
+  items: AppProjectItem[] = [];
 
   /**
    * Timestamp when the project was last updated.
@@ -546,10 +593,10 @@ export abstract class ArcProjectParent {
    */
   created: number = Date.now();
 
-  constructor(kind: typeof ArcProjectKind | typeof ArcProjectFolderKind, input?: string | IProjectParent) {
+  constructor(kind: typeof AppProjectKind | typeof AppProjectFolderKind, input?: string | IAppProjectParent) {
     this.kind = kind;
 
-    let init: IProjectParent;
+    let init: IAppProjectParent;
     if (typeof input === 'string') {
       init = JSON.parse(input);
     } else if (typeof input === 'object') {
@@ -573,7 +620,7 @@ export abstract class ArcProjectParent {
    * 
    * Note, this throws an error when the project folder is not a project folder.
    */
-  new(init: IProjectParent): void {
+  new(init: IAppProjectParent): void {
     const { key = v4(), created = Date.now(), updated = Date.now(), items, info, kind } = init;
     this.kind = kind;
     this.key = key;
@@ -587,54 +634,54 @@ export abstract class ArcProjectParent {
     }
   }
 
-  abstract setItems(items?: IArcProjectItem[]): void;
+  abstract setItems(items?: IAppProjectItem[]): void;
 
   /**
    * Lists items (not the actual definitions!) that are folders.
    */
-  listFolderItems(): ArcProjectItem[] {
+  listFolderItems(): AppProjectItem[] {
     const { items = [] } = this;
-    return items.filter(i => i.kind === ArcProjectFolderKind);
+    return items.filter(i => i.kind === AppProjectFolderKind);
   }
 
   /**
    * Lists items (not the actual definitions!) that are requests.
    */
-  listRequestItems(): ArcProjectItem[] {
+  listRequestItems(): AppProjectItem[] {
     const { items = [] } = this;
-    return items.filter(i => i.kind === ArcProjectRequestKind);
+    return items.filter(i => i.kind === AppProjectRequestKind);
   }
 }
 
-export class ArcProjectFolder extends ArcProjectParent {
+export class AppProjectFolder extends AppProjectParent {
 
-  project: ArcProject;
+  project: AppProject;
 
   /**
    * Creates a new ArcProjectFolder object from a name.
    * @param project The top-most project.
    * @param name The name to set.
    */
-  static fromName(project: ArcProject, name = 'New folder'): ArcProjectFolder {
+  static fromName(project: AppProject, name = 'New folder'): AppProjectFolder {
     const now = Date.now();
     const key = v4();
     const info = Thing.fromName(name);
-    const definition = new ArcProjectFolder(project, {
+    const definition = new AppProjectFolder(project, {
       key,
       created: now,
       updated: now,
       items: [],
-      kind: ArcProjectFolderKind,
+      kind: AppProjectFolderKind,
       info: info.toJSON(),
     });
     return definition;
   }
 
-  constructor(project: ArcProject, input?: string | IProjectParent) {
-    super(ArcProjectFolderKind, input);
+  constructor(project: AppProject, input?: string | IAppProjectParent) {
+    super(AppProjectFolderKind, input);
     this.project = project;
 
-    let init: IProjectParent | undefined;
+    let init: IAppProjectParent | undefined;
     if (typeof input === 'string') {
       init = JSON.parse(input);
     } else if (typeof input === 'object') {
@@ -643,12 +690,12 @@ export class ArcProjectFolder extends ArcProjectParent {
     if (init) {
       this.key = init.key || v4();
     }
-    this.kind = ArcProjectFolderKind;
+    this.kind = AppProjectFolderKind;
   }
 
-  toJSON(): IProjectParent {
-    const result: IProjectParent = {
-      kind: ArcProjectFolderKind,
+  toJSON(): IAppProjectParent {
+    const result: IAppProjectParent = {
+      kind: AppProjectFolderKind,
       info: this.info.toJSON(),
       key: this.key,
       created: this.created,
@@ -661,9 +708,9 @@ export class ArcProjectFolder extends ArcProjectParent {
     return result;
   }
 
-  setItems(items?: IArcProjectItem[]): void {
+  setItems(items?: IAppProjectItem[]): void {
     if (Array.isArray(items)) {
-      this.items = items.map(i => new ArcProjectItem(this.project, i));
+      this.items = items.map(i => new AppProjectItem(this.project, i));
     } else {
       this.items = [];
     }
@@ -675,7 +722,7 @@ export class ArcProjectFolder extends ArcProjectParent {
    * @param folder The folder to add to this project.
    * @returns The added folder.
    */
-  addFolder(folder: ArcProjectFolder): ArcProjectFolder;
+  addFolder(folder: AppProjectFolder): AppProjectFolder;
 
   /**
    * Appends new folder to a project from a full folder schema.
@@ -685,7 +732,7 @@ export class ArcProjectFolder extends ArcProjectParent {
    * @param folder The folder schema to add to this project.
    * @returns The added folder.
    */
-  addFolder(folder: IProjectParent): ArcProjectFolder;
+  addFolder(folder: IAppProjectParent): AppProjectFolder;
 
   /**
    * Appends a new folder to the project or a sub-folder.
@@ -693,15 +740,15 @@ export class ArcProjectFolder extends ArcProjectParent {
    * @param name The name to set. Optional.
    * @returns The newly inserted folder. If the folder already existed it returns its instance.
    */
-  addFolder(name?: string): ArcProjectFolder;
+  addFolder(name?: string): AppProjectFolder;
 
   /**
    * Appends a new folder to the folder. It updates the project to add the request definition.
    * @param name The name to set. Optional.
    * @returns The key of newly inserted folder.
    */
-  addFolder(name: string | IProjectParent | ArcProjectFolder | undefined): ArcProjectFolder {
-    return this.project.addFolder(name as ArcProjectFolder, { parent: this.key });
+  addFolder(name: string | IAppProjectParent | AppProjectFolder | undefined): AppProjectFolder {
+    return this.project.addFolder(name as AppProjectFolder, { parent: this.key });
   }
 
   /**
@@ -711,7 +758,7 @@ export class ArcProjectFolder extends ArcProjectParent {
    * @param opts The request add options.
    * @returns The inserted into the definitions request.
    */
-  addRequest(url: string, opts?: IArcFolderAddOptions): ArcProjectRequest;
+  addRequest(url: string, opts?: IAppProjectFolderAddOptions): AppProjectRequest;
 
   /**
    * Adds a request to the project or a sub-folder.
@@ -720,14 +767,14 @@ export class ArcProjectFolder extends ArcProjectParent {
    * @param opts The request add options.
    * @returns The inserted into the definitions request.
    */
-  addRequest(request: IArcProjectRequest | ArcProjectRequest, opts?: IArcFolderAddOptions): ArcProjectRequest;
+  addRequest(request: IAppProjectRequest | AppProjectRequest, opts?: IAppProjectFolderAddOptions): AppProjectRequest;
 
   /**
    * Appends a new request to the folder. It updates the project to add the request definition.
    * @param request The request to append to the folder.
    * @returns The key of newly inserted request.
    */
-  addRequest(request: IArcProjectRequest | ArcProjectRequest | string, opts: IArcFolderAddOptions = {}): ArcProjectRequest {
+  addRequest(request: IAppProjectRequest | AppProjectRequest | string, opts: IAppProjectFolderAddOptions = {}): AppProjectRequest {
     const addOptions = { parent: this.key, ...opts };
     if (typeof request === 'string') {
       return this.project.addRequest(request, addOptions);
@@ -738,7 +785,7 @@ export class ArcProjectFolder extends ArcProjectParent {
   /**
    * @returns The instance of the ArcProject or a ArcProjectFolder that is a closes parent of this instance.
    */
-  getParent(): ArcProjectFolder | ArcProject | undefined {
+  getParent(): AppProjectFolder | AppProject | undefined {
     const { project, key } = this;
     return project.findParent(key);
   }
@@ -746,7 +793,7 @@ export class ArcProjectFolder extends ArcProjectParent {
   /**
    * @returns A reference to the parent folder or the top-level HTTP project.
    */
-  getProject(): ArcProject {
+  getProject(): AppProject {
     return this.project;
   }
 
@@ -766,9 +813,9 @@ export class ArcProjectFolder extends ArcProjectParent {
    * 
    * @param opts Cloning options
    */
-  clone(opts: IArcFolderCloneOptions = {}): ArcProjectFolder {
+  clone(opts: IAppProjectFolderCloneOptions = {}): AppProjectFolder {
     const { targetProject = this.project, targetFolder } = opts;
-    const copy = new ArcProjectFolder(targetProject, this.toJSON());
+    const copy = new AppProjectFolder(targetProject, this.toJSON());
     copy.key = v4();
 
     const extProject = targetProject !== this.project;
@@ -808,8 +855,8 @@ export class ArcProjectFolder extends ArcProjectParent {
    * @param folder The target folder into which to put the requests. The folder has to have the target project attached to it.
    * @param project The originating project where the definitions are stored
    */
-  protected cloneRequests(folder: ArcProjectFolder, project: ArcProject): void {
-    const requests = this.items.filter(i => i.kind === ArcProjectRequestKind);
+  protected cloneRequests(folder: AppProjectFolder, project: AppProject): void {
+    const requests = this.items.filter(i => i.kind === AppProjectRequestKind);
     requests.forEach(r => {
       const request = project.findRequest(r.key, { keyOnly: true });
       if (!request) {
@@ -835,14 +882,14 @@ export class ArcProjectFolder extends ArcProjectParent {
    * @param project The originating project where the definitions are stored
    * @param withRequests Whether to clone requests with the folder.
    */
-  protected cloneSubFolders(folder: ArcProjectFolder, project: ArcProject, withRequests = true): void {
-    const folders = this.items.filter(i => i.kind === ArcProjectFolderKind);
+  protected cloneSubFolders(folder: AppProjectFolder, project: AppProject, withRequests = true): void {
+    const folders = this.items.filter(i => i.kind === AppProjectFolderKind);
     folders.forEach(f => {
       const definition = project.findFolder(f.key, { keyOnly: true });
       if (!definition) {
         return;
       }
-      const copy = new ArcProjectFolder(folder.getProject(), definition.toJSON());
+      const copy = new AppProjectFolder(folder.getProject(), definition.toJSON());
       copy.key = v4();
       copy.items = [];
       folder.addFolder(copy);
@@ -856,14 +903,14 @@ export class ArcProjectFolder extends ArcProjectParent {
   /**
    * Lists folders in this folder.
    */
-  listFolders(): ArcProjectFolder[] {
+  listFolders(): AppProjectFolder[] {
     return this.project.listFolders({ folder: this.key });
   }
 
   /**
    * Lists requests in this folder.
    */
-  listRequests(): ArcProjectRequest[] {
+  listRequests(): AppProjectRequest[] {
     return this.project.listRequests(this.key);
   }
 
@@ -873,14 +920,76 @@ export class ArcProjectFolder extends ArcProjectParent {
    * @param legacy The legacy request definition.
    * @returns The created project request.
    */
-  async addLegacyRequest(legacy: ARCSavedRequest | ARCHistoryRequest): Promise<ArcProjectRequest> {
+  async addLegacyRequest(legacy: ARCSavedRequest | ARCHistoryRequest): Promise<AppProjectRequest> {
     const request = await Request.fromLegacy(legacy);
-    const projectRequest = ArcProjectRequest.fromRequest(request.toJSON(), this.project);
+    const projectRequest = AppProjectRequest.fromRequest(request.toJSON(), this.project);
     return this.addRequest(projectRequest);
   }
+
+  /**
+   * Adds an environment to the project.
+   * 
+   * @param env The definition of the environment to use to create the environment
+   * @returns The same or created environment.
+   */
+  addEnvironment(env: IEnvironment, opts?: IAppProjectEnvironmentCreateOptions): Environment;
+
+  /**
+   * Adds an environment to the project.
+   * 
+   * @param env The instance of the environment to add
+   * @returns The same or created environment.
+   */
+  addEnvironment(env: Environment, opts?: IAppProjectEnvironmentCreateOptions): Environment;
+
+  /**
+   * Adds an environment to the project.
+   * 
+   * @param env The name of the environment to create
+   * @returns The same or created environment.
+   */
+  addEnvironment(env: string, opts?: IAppProjectEnvironmentCreateOptions): Environment;
+
+  /**
+   * Adds an environment to the project.
+   * @returns The same or created environment.
+   */
+  addEnvironment(env: IEnvironment | Environment | string, opts: IAppProjectEnvironmentCreateOptions = {}): Environment {
+    const newOptions: IAppProjectEnvironmentCreateOptions = { ...opts, parent: this.key };
+    return this.project.addEnvironment(env as Environment, newOptions);
+  }
+
+  /**
+   * @param key The environment key to read.
+   */
+  getEnvironment(key: string): Environment | undefined {
+    return this.project.getEnvironment(key, { parent: this.key });
+  }
+
+  /**
+   * Removes an environment from the folder or a sub-folder.
+   * 
+   * @param key the key of the environment to remove
+   * @returns The removed environment, if any.
+   */
+  removeEnvironment(key: string): Environment | undefined {
+    return this.project.removeEnvironment(key, { parent: this.key });
+  }
+
+  /**
+   * This is a link to the `getEnvironments()`. The difference is that on the 
+   * project level it won't return environments defined with the class initialization.
+   */
+  listEnvironments(): Environment[] {
+    return this.project.listEnvironments({ parent: this.key });
+  }
 }
 
-export class ArcProject extends ArcProjectParent {
+/**
+ * An app project is similar to the HttpProject but stored for a single application
+ * and has no sharing options. The AppProject can be upgraded to an HttpProject.
+ */
+export class AppProject extends AppProjectParent {
   /**
    * Timestamp when the project was last updated.
    */
@@ -891,14 +1000,14 @@ export class ArcProject extends ArcProjectParent {
    */
   created: number = Date.now();
 
-  definitions: ArcProjectDefinitions;
+  definitions: AppProjectDefinitions;
 
   /**
    * Creates a new ARC project from a name.
    * @param name The name to set.
    */
-  static fromName(name: string): ArcProject {
-    const project = new ArcProject();
+  static fromName(name: string): AppProject {
+    const project = new AppProject();
     const info = Thing.fromName(name);
     project.info = info;
     return project;
@@ -909,9 +1018,9 @@ export class ArcProject extends ArcProjectParent {
    * 
    * Note, the `requests` should be processed and the payload restored to it's original value.
    */
-  static async fromLegacyProject(project: ARCProject, requests: ARCSavedRequest[]): Promise<ArcProject> {
+  static async fromLegacyProject(project: ARCProject, requests: ARCSavedRequest[]): Promise<AppProject> {
     const { name = 'Unnamed project', description, requests: ids } = project;
-    const result = ArcProject.fromName(name);
+    const result = AppProject.fromName(name);
     if (project._id) {
       result.key = project._id;
     }
@@ -925,7 +1034,7 @@ export class ArcProject extends ArcProjectParent {
           return;
         }
         const request = await Request.fromLegacy(old);
-        const projectRequest = ArcProjectRequest.fromRequest(request.toJSON(), result);
+        const projectRequest = AppProjectRequest.fromRequest(request.toJSON(), result);
         if (old._id) {
           projectRequest.key = old._id;
         }
@@ -936,24 +1045,26 @@ export class ArcProject extends ArcProjectParent {
     return result;
   }
 
-  constructor(input?: string | IArcProject) {
-    super(ArcProjectKind);
+  constructor(input?: string | IAppProject) {
+    super(AppProjectKind);
     this.definitions = {
       folders: [],
       requests: [],
+      environments: [],
+      certificates: [],
     };
-    let init: IArcProject;
+    let init: IAppProject;
     if (typeof input === 'string') {
       init = JSON.parse(input);
     } else if (typeof input === 'object') {
       init = input;
       if (!init.kind) {
-        init.kind = ArcProjectKind;
+        init.kind = AppProjectKind;
       }
     } else {
       const now = Date.now();
       init = {
-        kind: ArcProjectKind,
+        kind: AppProjectKind,
         key: v4(),
         definitions: {},
         items: [],
@@ -965,7 +1076,7 @@ export class ArcProject extends ArcProjectParent {
     this.new(init);
   }
 
-  new(init: IArcProject): void {
+  new(init: IAppProject): void {
     if (!init || !init.items) {
       throw new Error(`Not a project.`);
     }
@@ -982,24 +1093,32 @@ export class ArcProject extends ArcProjectParent {
     this.definitions = {
       folders: [],
       requests: [],
+      environments: [],
+      certificates: [],
     };
     if (Array.isArray(definitions.requests)) {
       this.definitions.requests = definitions.requests.map(i => {
-        const instance = new ArcProjectRequest(this, i);
+        const instance = new AppProjectRequest(this, i);
         return instance;
       });
     }
     if (Array.isArray(definitions.folders)) {
       this.definitions.folders = definitions.folders.map(i => {
-        const instance = new ArcProjectFolder(this, i);
+        const instance = new AppProjectFolder(this, i);
         return instance;
       });
     }
+    if (Array.isArray(definitions.environments)) {
+      this.definitions.environments = definitions.environments.map(i => new Environment(i));
+    }
+    if (Array.isArray(definitions.certificates)) {
+      this.definitions.certificates = definitions.certificates.map(i => new Certificate(i));
+    }
   }
 
-  toJSON(): IArcProject {
-    const result: IArcProject = {
-      kind: ArcProjectKind,
+  toJSON(): IAppProject {
+    const result: IAppProject = {
+      kind: AppProjectKind,
       key: this.key,
       definitions: {},
       items: [],
@@ -1013,15 +1132,21 @@ export class ArcProject extends ArcProjectParent {
     if (Array.isArray(this.definitions.folders) && this.definitions.folders.length) {
       result.definitions.folders = this.definitions.folders.map(i => i.toJSON());
     }
+    if (Array.isArray(this.definitions.environments) && this.definitions.environments.length) {
+      result.definitions.environments = this.definitions.environments.map(i => i.toJSON());
+    }
+    if (Array.isArray(this.definitions.certificates) && this.definitions.certificates.length) {
+      result.definitions.certificates = this.definitions.certificates.map(i => i.toJSON());
+    }
     if (Array.isArray(this.items) && this.items.length) {
       result.items = this.items.map(i => i.toJSON());
     }
     return result;
   }
 
-  setItems(items?: IArcProjectItem[]): void {
+  setItems(items?: IAppProjectItem[]): void {
     if (Array.isArray(items)) {
-      this.items = items.map(i => new ArcProjectItem(this, i));
+      this.items = items.map(i => new AppProjectItem(this, i));
     } else {
       this.items = [];
     }
@@ -1033,7 +1158,7 @@ export class ArcProject extends ArcProjectParent {
    * @param  key The key of the definition.
    * @returns The parent or undefine when not found.
    */
-  findParent(key: string): ArcProjectFolder | ArcProject | undefined {
+  findParent(key: string): AppProjectFolder | AppProject | undefined {
     const { definitions, items = [] } = this;
     const projectItemsIndex = items.findIndex(i => i.key === key);
     if (projectItemsIndex > -1) {
@@ -1053,7 +1178,7 @@ export class ArcProject extends ArcProjectParent {
    * @param opts Optional folder add options.
    * @returns The added folder.
    */
-  addFolder(folder: ArcProjectFolder, opts?: IArcFolderCreateOptions): ArcProjectFolder;
+  addFolder(folder: AppProjectFolder, opts?: IAppProjectFolderCreateOptions): AppProjectFolder;
 
   /**
    * Appends new folder to a project from a full folder schema.
@@ -1064,7 +1189,7 @@ export class ArcProject extends ArcProjectParent {
    * @param opts Optional folder add options.
    * @returns The added folder.
    */
-  addFolder(folder: IProjectParent, opts?: IArcFolderCreateOptions): ArcProjectFolder;
+  addFolder(folder: IAppProjectParent, opts?: IAppProjectFolderCreateOptions): AppProjectFolder;
 
   /**
    * Appends a new folder to the project or a sub-folder.
@@ -1073,7 +1198,7 @@ export class ArcProject extends ArcProjectParent {
    * @param opts Folder create options.
    * @returns The newly inserted folder. If the folder already existed it returns its instance.
    */
-  addFolder(name?: string, opts?: IArcFolderCreateOptions): ArcProjectFolder;
+  addFolder(name?: string, opts?: IAppProjectFolderCreateOptions): AppProjectFolder;
 
   /**
    * Appends a new folder to the project or a sub-folder.
@@ -1085,7 +1210,7 @@ export class ArcProject extends ArcProjectParent {
    * @param opts Folder create options.
    * @returns The newly inserted folder. If the folder already existed it returns its instance.
    */
-  addFolder(init: string | IProjectParent | ArcProjectFolder = 'New Folder', opts: IArcFolderCreateOptions = {}): ArcProjectFolder {
+  addFolder(init: string | IAppProjectParent | AppProjectFolder = 'New Folder', opts: IAppProjectFolderCreateOptions = {}): AppProjectFolder {
     if (!Array.isArray(this.items)) {
       this.items = [];
     }
@@ -1093,7 +1218,7 @@ export class ArcProject extends ArcProjectParent {
       this.definitions.folders = [];
     }
     const { skipExisting, parent } = opts;
-    let root: ArcProjectFolder | ArcProject;
+    let root: AppProjectFolder | AppProject;
     if (parent) {
       const rootCandidate = this.findFolder(parent);
       if (!rootCandidate) {
@@ -1103,13 +1228,13 @@ export class ArcProject extends ArcProjectParent {
     } else {
       root = this;
     }
-    let definition: ArcProjectFolder;
+    let definition: AppProjectFolder;
     if (typeof init === 'string') {
-      definition = ArcProjectFolder.fromName(this, init);
-    } else if (init instanceof ArcProjectFolder) {
+      definition = AppProjectFolder.fromName(this, init);
+    } else if (init instanceof AppProjectFolder) {
       definition = init;
     } else {
-      definition = new ArcProjectFolder(this, init);
+      definition = new AppProjectFolder(this, init);
     }
     if (skipExisting) {
       const folders = root.listFolderItems();
@@ -1122,7 +1247,7 @@ export class ArcProject extends ArcProjectParent {
     }
 
     this.definitions.folders.push(definition);
-    const item = ArcProjectItem.projectFolder(this, definition.key);
+    const item = AppProjectItem.projectFolder(this, definition.key);
     if (!Array.isArray(root.items)) {
       root.items = [];
     }
@@ -1141,13 +1266,13 @@ export class ArcProject extends ArcProjectParent {
    * @param opts Optional search options.
    * @returns Found project folder or undefined.
    */
-  findFolder(nameOrKey: string, opts: IArcFolderSearchOptions = {}): ArcProjectFolder | undefined {
+  findFolder(nameOrKey: string, opts: IAppProjectFolderSearchOptions = {}): AppProjectFolder | undefined {
     const { definitions } = this;
     const item = definitions.folders.find((i) => {
-      if (i.kind !== ArcProjectFolderKind) {
+      if (i.kind !== AppProjectFolderKind) {
         return false;
       }
-      const folder = (i as ArcProjectFolder);
+      const folder = (i as AppProjectFolder);
       if (folder.key === nameOrKey) {
         return true;
       }
@@ -1157,7 +1282,7 @@ export class ArcProject extends ArcProjectParent {
       return !!folder.info && folder.info.name === nameOrKey;
     });
     if (item) {
-      return item as ArcProjectFolder;
+      return item as AppProjectFolder;
     }
     return undefined;
   }
@@ -1168,7 +1293,7 @@ export class ArcProject extends ArcProjectParent {
    * @param opts Folder remove options.
    * @returns The removed folder definition or undefined when not removed.
    */
-  removeFolder(key: string, opts: IArcFolderDeleteOptions = {}): ArcProjectFolder | undefined {
+  removeFolder(key: string, opts: IAppProjectFolderDeleteOptions = {}): AppProjectFolder | undefined {
     const { definitions } = this;
     const folder = this.findFolder(key, { keyOnly: true });
     if (!folder) {
@@ -1207,7 +1332,7 @@ export class ArcProject extends ArcProjectParent {
    * @param key The key of the request to move.
    * @param opts The moving options.
    */
-  moveFolder(key: string, opts: IArcProjectMoveOptions = {}): void {
+  moveFolder(key: string, opts: IAppProjectProjectMoveOptions = {}): void {
     const { index, parent } = opts;
     const movedFolder = this.findFolder(key);
     if (!movedFolder) {
@@ -1263,7 +1388,7 @@ export class ArcProject extends ArcProjectParent {
       if (item.key === child) {
         return true;
       }
-      if (item.kind === ArcProjectFolderKind) {
+      if (item.kind === AppProjectFolderKind) {
         const hasChild = this.hasChild(child, item.key);
         if (hasChild) {
           return true;
@@ -1280,7 +1405,7 @@ export class ArcProject extends ArcProjectParent {
    * @param opts The request add options.
    * @returns The inserted into the definitions request.
    */
-  addRequest(url: string, opts?: IArcRequestAddOptions): ArcProjectRequest;
+  addRequest(url: string, opts?: IAppProjectRequestAddOptions): AppProjectRequest;
 
   /**
    * Adds a request to the project or a sub-folder.
@@ -1289,7 +1414,7 @@ export class ArcProject extends ArcProjectParent {
    * @param opts The request add options.
    * @returns The inserted into the definitions request.
    */
-  addRequest(request: IArcProjectRequest | ArcProjectRequest, opts?: IArcRequestAddOptions): ArcProjectRequest;
+  addRequest(request: IAppProjectRequest | AppProjectRequest, opts?: IAppProjectRequestAddOptions): AppProjectRequest;
 
   /**
    * Adds a request to the project or a sub-folder.
@@ -1297,7 +1422,7 @@ export class ArcProject extends ArcProjectParent {
    * @param opts Thew request add options.
    * @returns The inserted into the definitions request.
    */
-  addRequest(request: IArcProjectRequest | ArcProjectRequest | string, opts: IArcRequestAddOptions = {}): ArcProjectRequest {
+  addRequest(request: IAppProjectRequest | AppProjectRequest | string, opts: IAppProjectRequestAddOptions = {}): AppProjectRequest {
     if (!Array.isArray(this.definitions.requests)) {
       this.definitions.requests = [];
     }
@@ -1308,7 +1433,7 @@ export class ArcProject extends ArcProjectParent {
     if (typeof request === 'object' && request.key) {
       const existing = this.definitions.requests.find(i => i.key === request.key);
       if (existing) {
-        existing.new(request as IArcProjectRequest);
+        existing.new(request as IAppProjectRequest);
         return existing;
       }
     }
@@ -1317,18 +1442,18 @@ export class ArcProject extends ArcProjectParent {
 
     let finalRequest;
     if (typeof request === 'string') {
-      finalRequest = ArcProjectRequest.fromUrl(request, this);
-    } else if (request instanceof ArcProjectRequest) {
+      finalRequest = AppProjectRequest.fromUrl(request, this);
+    } else if (request instanceof AppProjectRequest) {
       finalRequest = request;
       finalRequest.project = this;
     } else {
-      finalRequest = new ArcProjectRequest(this, request);
+      finalRequest = new AppProjectRequest(this, request);
     }
     if (!finalRequest.key) {
       finalRequest.key = v4();
     }
 
-    let root: ArcProjectFolder | ArcProject;
+    let root: AppProjectFolder | AppProject;
     if (opts.parent) {
       const rootCandidate = this.findFolder(opts.parent);
       if (!rootCandidate) {
@@ -1351,7 +1476,7 @@ export class ArcProject extends ArcProjectParent {
     }
 
     this.definitions.requests.push(finalRequest);
-    const item = ArcProjectItem.projectRequest(this, finalRequest.key);
+    const item = AppProjectItem.projectRequest(this, finalRequest.key);
 
     if (typeof opts.index === 'number') {
       root.items.splice(opts.index, 0, item);
@@ -1367,9 +1492,9 @@ export class ArcProject extends ArcProjectParent {
    * @param legacy The legacy request definition.
    * @returns The created project request.
    */
-  async addLegacyRequest(legacy: ARCSavedRequest | ARCHistoryRequest): Promise<ArcProjectRequest> {
+  async addLegacyRequest(legacy: ARCSavedRequest | ARCHistoryRequest): Promise<AppProjectRequest> {
     const request = await Request.fromLegacy(legacy);
-    const projectRequest = ArcProjectRequest.fromRequest(request.toJSON(), this);
+    const projectRequest = AppProjectRequest.fromRequest(request.toJSON(), this);
     return this.addRequest(projectRequest);
   }
 
@@ -1380,7 +1505,7 @@ export class ArcProject extends ArcProjectParent {
    * @param opts Optional search options.
    * @returns Found project request or undefined.
    */
-  findRequest(nameOrKey: string, opts: IArcRequestSearchOptions = {}): ArcProjectRequest | undefined {
+  findRequest(nameOrKey: string, opts: IAppProjectRequestSearchOptions = {}): AppProjectRequest | undefined {
     const { definitions } = this;
     const item = definitions.requests.find((request) => {
       if (request.key === nameOrKey) {
@@ -1392,7 +1517,7 @@ export class ArcProject extends ArcProjectParent {
       return !!request.info && request.info.name === nameOrKey;
     });
     if (item) {
-      return item as ArcProjectRequest;
+      return item as AppProjectRequest;
     }
     return undefined;
   }
@@ -1404,7 +1529,7 @@ export class ArcProject extends ArcProjectParent {
    * @param opts Request remove options.
    * @returns The removed request definition or undefined when not removed.
    */
-  removeRequest(key: string, opts: IArcRequestDeleteOptions = {}): ArcProjectRequest | undefined {
+  removeRequest(key: string, opts: IAppProjectRequestDeleteOptions = {}): AppProjectRequest | undefined {
     const { definitions } = this;
     const request = this.findRequest(key, { keyOnly: true });
     if (!request) {
@@ -1437,7 +1562,7 @@ export class ArcProject extends ArcProjectParent {
    * @param key The key of the request to move.
    * @param opts The moving options.
    */
-  moveRequest(key: string, opts: IArcProjectMoveOptions = {}): void {
+  moveRequest(key: string, opts: IAppProjectProjectMoveOptions = {}): void {
     const { index, parent } = opts;
     const request = this.findRequest(key);
     if (!request) {
@@ -1473,24 +1598,24 @@ export class ArcProject extends ArcProjectParent {
   /**
    * Lists items (not the actual definitions!) that are folders.
    */
-  listFolderItems(): ArcProjectItem[] {
+  listFolderItems(): AppProjectItem[] {
     const { items = [] } = this;
-    return items.filter(i => i.kind === ArcProjectFolderKind);
+    return items.filter(i => i.kind === AppProjectFolderKind);
   }
 
   /**
    * Lists items (not the actual definitions!) that are requests.
    */
-  listRequestItems(): ArcProjectItem[] {
+  listRequestItems(): AppProjectItem[] {
     const { items = [] } = this;
-    return items.filter(i => i.kind === ArcProjectRequestKind);
+    return items.filter(i => i.kind === AppProjectRequestKind);
   }
 
   /**
    * Lists folders from the project or a sub-folder.
    * @param opts Folder listing options.
    */
-  listFolders(opts: IArcFolderListOptions = {}): ArcProjectFolder[] {
+  listFolders(opts: IAppProjectFolderListOptions = {}): AppProjectFolder[] {
     let root;
     if (opts.folder) {
       const parent = this.findFolder(opts.folder);
@@ -1502,7 +1627,7 @@ export class ArcProject extends ArcProjectParent {
       root = this;
     }
     const items = root.listFolderItems();
-    const result: ArcProjectFolder[] = [];
+    const result: AppProjectFolder[] = [];
     const { definitions } = this;
     items.forEach((i) => {
       const definition = definitions.folders.find(d => i.key === d.key);
@@ -1517,7 +1642,7 @@ export class ArcProject extends ArcProjectParent {
    * Lists requests in this project or a sub-folder.
    * @param folder The optional folder name or the key to list requests for.
    */
-  listRequests(folder?: string): ArcProjectRequest[] {
+  listRequests(folder?: string): AppProjectRequest[] {
     let root;
     if (folder) {
       const parent = this.findFolder(folder);
@@ -1529,7 +1654,7 @@ export class ArcProject extends ArcProjectParent {
       root = this;
     }
     const items = root.listRequestItems();
-    const result: ArcProjectRequest[] = [];
+    const result: AppProjectRequest[] = [];
     const { definitions } = this;
     items.forEach((i) => {
       const definition = definitions.requests.find(d => i.key === d.key);
@@ -1544,7 +1669,7 @@ export class ArcProject extends ArcProjectParent {
    * Lists definitions for the `items` of the project or a folder.
    * @param folder Optionally the folder name to list the definitions for.
    */
-  listDefinitions(folder?: string): (ArcProjectFolder | ArcProjectRequest)[] {
+  listDefinitions(folder?: string): (AppProjectFolder | AppProjectRequest | Environment)[] {
     let root;
     if (folder) {
       const parent = this.findFolder(folder);
@@ -1555,15 +1680,17 @@ export class ArcProject extends ArcProjectParent {
     } else {
       root = this;
     }
-    const result: (ArcProjectFolder | ArcProjectRequest)[] = [];
+    const result: (AppProjectFolder | AppProjectRequest | Environment)[] = [];
     const { items = [] } = root;
     const { definitions } = this;
     items.forEach((item) => {
-      let definition: ArcProjectFolder | ArcProjectRequest | undefined;
-      if (item.kind === ArcProjectFolderKind) {
+      let definition: AppProjectFolder | AppProjectRequest | Environment | undefined;
+      if (item.kind === AppProjectFolderKind) {
         definition = definitions.folders.find(d => item.key === d.key);
-      } else if (item.kind === ArcProjectRequestKind) {
+      } else if (item.kind === AppProjectRequestKind) {
         definition = definitions.requests.find(d => item.key === d.key);
+      } else if (item.kind === EnvironmentKind) {
+        definition = definitions.environments.find(d => item.key === d.key);
       }
       if (definition) {
         result.push(definition);
@@ -1575,28 +1702,28 @@ export class ArcProject extends ArcProjectParent {
   /**
    * @returns On the project level this always returns undefined.
    */
-  getParent(): ArcProjectFolder | ArcProject | undefined {
+  getParent(): AppProjectFolder | AppProject | undefined {
     return undefined;
   }
 
-  getProject(): ArcProject {
+  getProject(): AppProject {
     return this;
   }
 
   /**
    * Makes a copy of this project.
    */
-  clone(opts: IArcProjectCloneOptions = {}): ArcProject {
-    const copy = new ArcProject(this.toJSON());
+  clone(opts: IAppProjectProjectCloneOptions = {}): AppProject {
+    const copy = new AppProject(this.toJSON());
     if (!opts.withoutRevalidate) {
       copy.key = v4();
-      ArcProject.regenerateKeys(copy);
+      AppProject.regenerateKeys(copy);
     }
     return copy;
   }
 
-  static clone(project: IArcProject, opts: IArcProjectCloneOptions = {}): ArcProject {
-    const obj = new ArcProject(project);
+  static clone(project: IAppProject, opts: IAppProjectProjectCloneOptions = {}): AppProject {
+    const obj = new AppProject(project);
     return obj.clone(opts);
   }
 
@@ -1607,7 +1734,7 @@ export class ArcProject extends ArcProjectParent {
    * 
    * @param src The project instance to re-generate keys for.
    */
-  static regenerateKeys(src: ArcProject): void {
+  static regenerateKeys(src: AppProject): void {
     const { items = [], definitions } = src;
     // create a flat list of all "items" in the project and all folders.
     let flatItems = [...items];
@@ -1639,5 +1766,324 @@ export class ArcProject extends ArcProjectParent {
       indexObject.key = newKey;
       request.key = newKey;
     });
+    (definitions.environments || []).forEach((environment) => {
+      const oldKey = environment.key;
+      const indexObject = flatItems.find(i => i.key === oldKey);
+      if (!indexObject) {
+        return;
+      }
+      const newKey = v4();
+      indexObject.key = newKey;
+      environment.key = newKey;
+    });
+    (definitions.certificates || []).forEach((cert) => {
+      cert.key = v4();
+    });
+  }
+
+  /**
+   * Adds an environment to the project.
+   * 
+   * @param env The definition of the environment to use to create the environment
+   * @returns The same or created environment.
+   */
+  addEnvironment(env: IEnvironment, opts?: IAppProjectEnvironmentCreateOptions): Environment;
+
+  /**
+   * Adds an environment to the project.
+   * 
+   * @param env The instance of the environment to add
+   * @returns The same or created environment.
+   */
+  addEnvironment(env: Environment, opts?: IAppProjectEnvironmentCreateOptions): Environment;
+
+  /**
+   * Adds an environment to the project.
+   * 
+   * @param env The name of the environment to create
+   * @returns The same or created environment.
+   */
+  addEnvironment(env: string, opts?: IAppProjectEnvironmentCreateOptions): Environment;
+
+  /**
+   * Adds an environment to the project.
+   * @returns The same or created environment.
+   */
+  addEnvironment(env: IEnvironment | Environment | string, opts: IAppProjectEnvironmentCreateOptions = {}): Environment {
+    const environment = this._createEnv(env);
+    const root = this._getRoot(opts);
+    const project = this.getProject();
+    if (!project.definitions.environments) {
+      project.definitions.environments = [];
+    }
+    project.definitions.environments.push(environment);
+    const item = AppProjectItem.projectEnvironment(project, environment.key);
+    this._insertItem(item, root, opts);
+    return environment;
+  }
+
+  protected _createEnv(env: IEnvironment | Environment | string): Environment {
+    let finalEnv: Environment;
+    if (env instanceof Environment) {
+      finalEnv = env;
+    } else if (typeof env === 'string') {
+      finalEnv = Environment.fromName(env);
+    } else {
+      finalEnv = new Environment(env);
+    }
+    if (!finalEnv.key) {
+      finalEnv.key = v4();
+    }
+    return finalEnv;
+  }
+
+  /**
+   * @param key The environment key to read.
+   */
+  getEnvironment(key: string, opts: IAppProjectItemOptions = {}): Environment | undefined {
+    const root = this._getRoot(opts);
+    const item = root.items.find(i => i.key === key);
+    if (!item) {
+      return undefined;
+    }
+    const project = this.getProject();
+    if (!Array.isArray(project.definitions.environments)) {
+      project.definitions.environments = [];
+    }
+    return project.definitions.environments.find(e => e.key === key);
+  }
+
+  /**
+   * Removes an environment from the folder or a sub-folder.
+   * 
+   * @param key the key of the environment to remove
+   * @returns The removed environment, if any.
+   */
+  removeEnvironment(key: string, opts: IAppProjectItemOptions = {}): Environment | undefined {
+    const root = this._getRoot(opts);
+    const itemIndex = root.items.findIndex(i => i.key === key);
+    if (itemIndex < 0) {
+      return undefined;
+    }
+    root.items.splice(itemIndex, 1);
+    const project = this.getProject();
+    if (!Array.isArray(project.definitions.environments)) {
+      project.definitions.environments = [];
+    }
+    const defIndex = project.definitions.environments.findIndex(i => i.key === key);
+    if (defIndex < 0) {
+      return undefined;
+    }
+    const env = project.definitions.environments[defIndex];
+    project.definitions.environments.splice(defIndex, 1);
+    return env;
+  }
+
+  /**
+   * This is a link to the `getEnvironments()`. The difference is that on the 
+   * project level it won't return environments defined with the class initialization.
+   */
+  listEnvironments(opts: IAppProjectItemOptions = {}): Environment[] {
+    const root = this._getRoot(opts);
+    const items = root.items.filter(i => i.kind === EnvironmentKind).map(i => i.key);
+    const project = this.getProject();
+    if (!Array.isArray(project.definitions.environments)) {
+      project.definitions.environments = [];
+    }
+    return project.definitions.environments.filter(e => items.includes(e.key));
+  }
+
+  /**
+   * Reads the list of environments from then selected folder up to the project root.
+   * It stops going up in the project structure when selected environment has the `encapsulated`
+   * property set to true.
+   * The environments are ordered from the top-most level to the selected folder.
+   * 
+   * @param opts The environment read options
+   */
+  readEnvironments(opts: IAppProjectReadEnvironmentOptions = {}): Environment[] {
+    const result: Environment[] = [];
+    const { parent, nameOrKey } = opts;
+
+    const root = parent ? this.findFolder(parent, { keyOnly: true }) : this;
+    if (!root) {
+      return result;
+    }
+
+    let current: AppProject | AppProjectFolder | undefined = root;
+    while (current) {
+      const environments = current.listEnvironments();
+      if (environments.length) {
+        const selected = nameOrKey ? environments.find(i => i.key === nameOrKey || i.info.name === nameOrKey) : environments[0];
+        if (selected) {
+          result.push(selected);
+          if (selected.encapsulated) {
+            break;
+          }
+        }
+      }
+      current = current.getParent();
+    }
+
+    return result.reverse();
+  }
+
+  /**
+   * Finds a definition for an environment regardless of its parent.
+   * 
+   * @param key The Key of the environment to find.
+   * @returns The environment definition or undefined if not found.
+   */
+  findEnvironment(key: string): Environment | undefined {
+    return this.definitions.environments.find(i => i.key === key);
+  }
+
+  /**
+   * Depending on the options returns a project or a folder.
+   * It throws when parent folder cannot ber found.
+   */
+  protected _getRoot(opts: { parent?: string }): AppProjectFolder | AppProject {
+    const project = this.getProject();
+    if (opts.parent) {
+      const parent = project.findFolder(opts.parent);
+      if (!parent) {
+        throw new Error(`Unable to find the parent folder ${opts.parent}.`);
+      }
+      return parent;
+    }
+    return project;
+  }
+
+  protected _insertItem(item: AppProjectItem, root: AppProjectFolder | AppProject, opts: IAppProjectItemCreateOptions): void {
+    if (!Array.isArray(root.items)) {
+      root.items = [];
+    }
+    if (typeof opts.index === 'number') {
+      root.items.splice(opts.index, 0, item);
+    } else {
+      root.items.push(item);
+    }
+  }
+
+  /**
+   * Finds a definition for a certificate.
+   * 
+   * @param key The key of the certificate to find.
+   * @returns The certificate definition or undefined if not found.
+   */
+  findCertificate(key: string): Certificate | undefined {
+    return this.definitions.certificates.find(i => i.key === key);
+  }
+
+  /**
+   * Adds a certificate to the project.
+   * 
+   * @param init Either an instance of a certificate or its definition.
+   * @returns The inserted certificate.
+   */
+  addCertificate(init: Certificate | HttpCertificate): Certificate {
+    let finalCert: Certificate;
+    if (init instanceof Certificate) {
+      finalCert = init;
+    } else {
+      finalCert = new Certificate(init);
+    }
+    if (!this.definitions.certificates) {
+      this.definitions.certificates = [];
+    }
+    this.definitions.certificates.push(finalCert);
+    return finalCert;
+  }
+
+  /**
+   * Removes a certificate from the project.
+   * 
+   * @param key the key of the certificate to remove
+   * @returns The removed certificate, if any.
+   */
+  removeCertificate(key: string): Certificate | undefined {
+    if (!Array.isArray(this.definitions.certificates)) {
+      return undefined
+    }
+    const defIndex = this.definitions.certificates.findIndex(i => i.key === key);
+    if (defIndex < 0) {
+      return undefined;
+    }
+    const cert = this.definitions.certificates[defIndex];
+    this.definitions.certificates.splice(defIndex, 1);
+    return cert;
+  }
+
+  /**
+   * Finds the requests that are using the certificate identified by the key.
+   * 
+   * @param key The key of the certificate to find the usage for.
+   * @returns The list of requests that use this certificate.
+   */
+  findCertificateRequests(key: string): AppProjectRequest[] {
+    return this.definitions.requests.filter((request) => {
+      if (!Array.isArray(request.authorization)) {
+        return false;
+      }
+      const ccAuth = request.authorization.find(auth => auth.type === 'client certificate');
+      if (!ccAuth) {
+        return false;
+      }
+      const cnf = ccAuth.config as ICCAuthorization;
+      return !!cnf && !!cnf.certificate && cnf.certificate.key === key;
+    });
+  }
+
+  /**
+   * Iterates over requests in the project.
+   */
+  * requestIterator(opts: IProjectRequestIterator = {}): Generator<AppProjectRequest> {
+    const { definitions } = this;
+    const { ignore=[], parent, recursive, requests=[] } = opts;
+    const root = parent ? this.findFolder(parent) : this;
+    if (!root) {
+      throw new Error(`The parent folder not found: ${parent}.`);
+    }
+    const items = root.items;
+    if (!items || !items.length) {
+      return;
+    }
+    for (const item of items) {
+      if (ignore.includes(item.key)) {
+        continue;
+      }
+      if (item.kind === AppProjectRequestKind) {
+        const request = definitions.requests.find(i => i.key === item.key);
+        if (!request) {
+          continue;
+        }
+        const name = request.info.name || '';
+        if (ignore.includes(name)) {
+          continue;
+        }
+        if (requests.length && !requests.includes(item.key) && !requests.includes(name)) {
+          continue;
+        }
+        yield request;
+      } else if (recursive && item.kind === AppProjectFolderKind) {
+        const folder = definitions.folders.find(i => i.key === item.key);
+        if (!folder) {
+          continue;
+        }
+        const name = folder.info.name || '';
+        if (ignore.includes(name)) {
+          continue;
+        }
+        const it = this.requestIterator({
+          parent: item.key,
+          recursive,
+          ignore,
+          requests,
+        });
+        for (const request of it) {
+          yield request;
+        }
+      }
+    }
   }
 }