@chevre/domain 22.9.0-alpha.0 → 22.9.0-alpha.1

package/example/src/chevre/adminIdentityProviders.ts

@@ -0,0 +1,65 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+const project = { id: String(process.env.PROJECT_ID) };
+const IDENTIFIER = 'https://example.com';
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const providerRepo = await chevre.repository.IdentityProvider.createInstance(mongoose.connection);
+
+    let providers = await providerRepo.projectFields(
+        {
+            project: { id: { $eq: project.id } },
+            identifier: { $eq: IDENTIFIER }
+        },
+        ['identifier', 'typeOf', 'verified', 'project']
+    );
+    console.log('providers:', providers);
+    console.log(providers.length, 'providers found');
+
+    if (providers.length > 0) {
+        await providerRepo.deleteById({
+            project: { id: providers[0].project.id },
+            id: providers[0].id
+        });
+        console.log('application deleted', providers[0].id);
+    }
+
+    await providerRepo.projectFields(
+        {
+            project: { id: { $eq: project.id } },
+            identifier: { $eq: IDENTIFIER }
+        },
+        ['identifier', 'typeOf', 'verified', 'project']
+    );
+    console.log('providers:', providers);
+    console.log(providers.length, 'providers found');
+
+    await providerRepo.save({
+        attributes: {
+            project: { id: project.id, typeOf: chevre.factory.organizationType.Project },
+            typeOf: chevre.factory.organizationType.Organization,
+            identifier: IDENTIFIER,
+            verified: false
+        }
+    });
+    console.log('application created');
+
+    providers = await await providerRepo.projectFields(
+        {
+            project: { id: { $eq: project.id } },
+            identifier: { $eq: IDENTIFIER }
+        },
+        ['identifier', 'typeOf', 'verified', 'project']
+    );
+    console.log('providers:', providers);
+    console.log(providers.length, 'providers found');
+}
+
+main()
+    .then()
+    .catch(console.error);

package/lib/chevre/repo/application.js

@@ -118,7 +118,7 @@ class ApplicationRepo {
                     .skip(conditions.limit * (page - 1));
             }
             if (typeof ((_a = conditions.sort) === null || _a === void 0 ? void 0 : _a.clientId) === 'number') {
-                query.sort({ identifier: conditions.sort.clientId });
+                query.sort({ clientId: conditions.sort.clientId });
             }
             return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
                 .lean()

package/lib/chevre/repo/identityProvider.d.ts

@@ -0,0 +1,36 @@
+import { Connection, FilterQuery } from 'mongoose';
+import { IIdentityProvider, ISearchConditions } from './mongoose/schemas/identityProvider';
+export type ISavingIdentityProvider = Pick<IIdentityProvider, 'identifier' | 'project' | 'typeOf' | 'verified'> & {
+    id?: never;
+};
+interface IUnset {
+    $unset?: {
+        [key: string]: 1;
+    };
+}
+type IIdentityProviderWithId = IIdentityProvider & {
+    id: string;
+};
+type IKeyOfProjection = keyof IIdentityProvider;
+/**
+ * IDPリポジトリ
+ */
+export declare class IdentityProviderRepo {
+    private readonly identityProviderModel;
+    constructor(connection: Connection);
+    static CREATE_FILTER_QUERY(params: ISearchConditions): FilterQuery<IIdentityProvider>[];
+    save(params: {
+        id?: string;
+        attributes: ISavingIdentityProvider & IUnset;
+    }): Promise<{
+        id: string;
+    }>;
+    projectFields(conditions: ISearchConditions, inclusion: IKeyOfProjection[]): Promise<IIdentityProviderWithId[]>;
+    deleteById(params: {
+        id: string;
+        project: {
+            id: string;
+        };
+    }): Promise<void>;
+}
+export {};

package/lib/chevre/repo/identityProvider.js

@@ -0,0 +1,134 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.IdentityProviderRepo = void 0;
+const factory = require("../factory");
+const settings_1 = require("../settings");
+const identityProvider_1 = require("./mongoose/schemas/identityProvider");
+/**
+ * IDPリポジトリ
+ */
+class IdentityProviderRepo {
+    constructor(connection) {
+        this.identityProviderModel = connection.model(identityProvider_1.modelName, (0, identityProvider_1.createSchema)());
+    }
+    // tslint:disable-next-line:max-func-body-length
+    static CREATE_FILTER_QUERY(params) {
+        var _a, _b, _c, _d, _e, _f;
+        const andConditions = [];
+        const projectIdEq = (_b = (_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
+        if (typeof projectIdEq === 'string') {
+            andConditions.push({ 'project.id': { $eq: projectIdEq } });
+        }
+        const idEq = (_c = params.id) === null || _c === void 0 ? void 0 : _c.$eq;
+        if (typeof idEq === 'string') {
+            andConditions.push({ _id: { $eq: idEq } });
+        }
+        const idIn = (_d = params.id) === null || _d === void 0 ? void 0 : _d.$in;
+        if (Array.isArray(idIn)) {
+            andConditions.push({ _id: { $in: idIn } });
+        }
+        const identifierEq = (_e = params.identifier) === null || _e === void 0 ? void 0 : _e.$eq;
+        if (typeof identifierEq === 'string') {
+            andConditions.push({ identifier: { $eq: identifierEq } });
+        }
+        const identifierRegex = (_f = params.identifier) === null || _f === void 0 ? void 0 : _f.$regex;
+        if (typeof identifierRegex === 'string' && identifierRegex.length > 0) {
+            andConditions.push({ identifier: { $regex: new RegExp(identifierRegex) } });
+        }
+        const verified = params.verified;
+        if (typeof verified === 'boolean') {
+            andConditions.push({ verified: verified });
+        }
+        return andConditions;
+    }
+    save(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
+            let doc;
+            let savedId;
+            const savingId = params.id;
+            if (typeof savingId === 'string') {
+                if (savingId === '') {
+                    throw new factory.errors.ArgumentNull('id');
+                }
+                const _c = params.attributes, { id, identifier, project, typeOf, $unset } = _c, updateFields = __rest(_c, ["id", "identifier", "project", "typeOf", "$unset"]);
+                const filter = {
+                    _id: { $eq: savingId },
+                    'project.id': { $eq: project.id }
+                };
+                const update = Object.assign({ $set: updateFields }, ($unset !== undefined && $unset !== null) ? { $unset } : undefined);
+                const options = {
+                    upsert: false,
+                    new: true,
+                    projection: { _id: 1, id: { $toString: '$_id' } }
+                };
+                doc = yield this.identityProviderModel.findOneAndUpdate(filter, update, options)
+                    .lean()
+                    .exec();
+                if (doc === null) {
+                    throw new factory.errors.NotFound(this.identityProviderModel.modelName);
+                }
+                savedId = savingId;
+            }
+            else {
+                const _d = params.attributes, { $unset, id } = _d, createParams = __rest(_d, ["$unset", "id"]);
+                const result = yield this.identityProviderModel.insertMany(createParams, { rawResult: true });
+                const insertedId = (_b = (_a = result.insertedIds) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.toHexString();
+                if (typeof insertedId !== 'string') {
+                    throw new factory.errors.Internal(`not saved unexpectedly. result:${JSON.stringify(result)}`);
+                }
+                savedId = insertedId;
+            }
+            return { id: savedId };
+        });
+    }
+    projectFields(conditions, inclusion) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            const andConditions = IdentityProviderRepo.CREATE_FILTER_QUERY(conditions);
+            const projection = Object.assign({ _id: 0, id: { $toString: '$_id' } }, Object.fromEntries(inclusion.map((key) => ([key, 1]))));
+            const query = this.identityProviderModel.find((andConditions.length > 0) ? { $and: andConditions } : {}, projection);
+            if (typeof conditions.limit === 'number' && conditions.limit > 0) {
+                const page = (typeof conditions.page === 'number' && conditions.page > 0) ? conditions.page : 1;
+                query.limit(conditions.limit)
+                    .skip(conditions.limit * (page - 1));
+            }
+            if (typeof ((_a = conditions.sort) === null || _a === void 0 ? void 0 : _a.identifier) === 'number') {
+                query.sort({ identifier: conditions.sort.identifier });
+            }
+            return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+                .lean()
+                .exec();
+        });
+    }
+    deleteById(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.identityProviderModel.findOneAndDelete({
+                _id: { $eq: params.id },
+                'project.id': { $eq: params.project.id }
+            }, { projection: { _id: 1 } })
+                .exec();
+        });
+    }
+}
+exports.IdentityProviderRepo = IdentityProviderRepo;

package/lib/chevre/repo/mongoose/schemas/identityProvider.d.ts

@@ -0,0 +1,38 @@
+import { IndexDefinition, IndexOptions, Model, Schema, SchemaDefinition } from 'mongoose';
+import * as factory from '../../../factory';
+export interface ISearchConditions {
+    limit?: number;
+    page?: number;
+    sort?: {
+        identifier?: factory.sortType;
+    };
+    project?: {
+        id?: {
+            $eq?: string;
+        };
+    };
+    id?: {
+        $eq?: string;
+        $in?: string[];
+    };
+    identifier?: {
+        $eq?: string;
+        $regex?: string;
+    };
+    verified?: boolean;
+}
+export interface IIdentityProvider {
+    id: string;
+    identifier: string;
+    project: Pick<factory.project.IProject, 'id' | 'typeOf'>;
+    typeOf: factory.organizationType.Organization;
+    verified: boolean;
+}
+type IDocType = Omit<IIdentityProvider, 'id'>;
+type IModel = Model<IDocType>;
+type ISchemaDefinition = SchemaDefinition<IDocType>;
+type ISchema = Schema<IDocType, IModel, {}, {}, {}, {}, ISchemaDefinition, IDocType>;
+declare const modelName = "IdentityProvider";
+declare const indexes: [d: IndexDefinition, o: IndexOptions][];
+declare function createSchema(): ISchema;
+export { createSchema, IModel, indexes, modelName };

package/lib/chevre/repo/mongoose/schemas/identityProvider.js

@@ -0,0 +1,76 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.modelName = exports.indexes = void 0;
+exports.createSchema = createSchema;
+const mongoose_1 = require("mongoose");
+const writeConcern_1 = require("../writeConcern");
+const settings_1 = require("../../../settings");
+const modelName = 'IdentityProvider';
+exports.modelName = modelName;
+const schemaDefinition = {
+    project: {
+        type: mongoose_1.SchemaTypes.Mixed,
+        required: true
+    },
+    typeOf: {
+        type: String,
+        required: true
+    },
+    identifier: {
+        type: String,
+        required: true
+    },
+    verified: {
+        type: Boolean,
+        required: true
+    }
+};
+const schemaOptions = {
+    autoIndex: settings_1.MONGO_AUTO_INDEX,
+    autoCreate: false,
+    collection: 'identityProviders',
+    id: true,
+    read: settings_1.MONGO_READ_PREFERENCE,
+    writeConcern: writeConcern_1.writeConcern,
+    strict: true,
+    strictQuery: false,
+    timestamps: false,
+    versionKey: false,
+    toJSON: {
+        getters: false,
+        virtuals: false,
+        minimize: false,
+        versionKey: false
+    },
+    toObject: {
+        getters: false,
+        virtuals: true,
+        minimize: false,
+        versionKey: false
+    }
+};
+const indexes = [
+    [
+        { 'project.id': 1, identifier: 1 },
+        {
+            name: 'uniqueIdentifier',
+            unique: true
+        }
+    ]
+];
+exports.indexes = indexes;
+/**
+ * IDPスキーマ
+ */
+let schema;
+function createSchema() {
+    if (schema === undefined) {
+        schema = new mongoose_1.Schema(schemaDefinition, schemaOptions);
+        if (settings_1.MONGO_AUTO_INDEX) {
+            indexes.forEach((indexParams) => {
+                schema === null || schema === void 0 ? void 0 : schema.index(...indexParams);
+            });
+        }
+    }
+    return schema;
+}

package/lib/chevre/repository.d.ts

@@ -24,6 +24,7 @@ import type { EmailMessageRepo } from './repo/emailMessage';
 import type { EventRepo } from './repo/event';
 import type { EventSellerMakesOfferRepo } from './repo/eventSellerMakesOffer';
 import type { EventSeriesRepo } from './repo/eventSeries';
+import type { IdentityProviderRepo } from './repo/identityProvider';
 import type { InterfaceRepo } from './repo/interface';
 import type { IssuerRepo } from './repo/issuer';
 import type { MemberRepo } from './repo/member';
@@ -173,6 +174,10 @@ export type EventSeries = EventSeriesRepo;
 export declare namespace EventSeries {
     function createInstance(...params: ConstructorParameters<typeof EventSeriesRepo>): Promise<EventSeriesRepo>;
 }
+export type IdentityProvider = IdentityProviderRepo;
+export declare namespace IdentityProvider {
+    function createInstance(...params: ConstructorParameters<typeof IdentityProviderRepo>): Promise<IdentityProviderRepo>;
+}
 export type Interface = InterfaceRepo;
 export declare namespace Interface {
     function createInstance(...params: ConstructorParameters<typeof InterfaceRepo>): Promise<InterfaceRepo>;

package/lib/chevre/repository.js

@@ -9,8 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ProductOffer = exports.ProductModel = exports.Product = exports.PriceSpecification = exports.place = exports.Permit = exports.Person = exports.paymentMethod = exports.PaymentServiceProvider = exports.PaymentService = exports.Passport = exports.OwnershipInfo = exports.OrderNumber = exports.OrderInTransaction = exports.Order = exports.Offer = exports.OfferItemCondition = exports.OfferCatalogItem = exports.OfferCatalog = exports.Note = exports.Message = exports.MerchantReturnPolicy = exports.MemberProgram = exports.Member = exports.Issuer = exports.Interface = exports.EventSeries = exports.EventSellerMakesOffer = exports.Event = exports.EmailMessage = exports.CustomerType = exports.Customer = exports.Credentials = exports.CreativeWork = exports.ConfirmationNumber = exports.Comment = exports.Authorization = exports.CategoryCode = exports.AssetTransaction = exports.Application = exports.Aggregation = exports.AggregateReservation = exports.AggregateOffer = exports.AdditionalProperty = exports.Action = exports.AccountTransaction = exports.AccountTitle = exports.AccountingReport = exports.Account = exports.AcceptedOffer = void 0;
-exports.rateLimit = exports.Trip = exports.TransactionProcess = exports.TransactionNumber = exports.Transaction = exports.Ticket = exports.Telemetry = exports.Task = exports.StockHolder = exports.setting = exports.Setting = exports.ServiceOutputIdentifier = exports.ServiceOutput = exports.SellerReturnPolicy = exports.SellerPaymentAccepted = exports.Seller = exports.Schedule = exports.Role = exports.Reservation = exports.ProjectMakesOffer = exports.Project = void 0;
+exports.ProductModel = exports.Product = exports.PriceSpecification = exports.place = exports.Permit = exports.Person = exports.paymentMethod = exports.PaymentServiceProvider = exports.PaymentService = exports.Passport = exports.OwnershipInfo = exports.OrderNumber = exports.OrderInTransaction = exports.Order = exports.Offer = exports.OfferItemCondition = exports.OfferCatalogItem = exports.OfferCatalog = exports.Note = exports.Message = exports.MerchantReturnPolicy = exports.MemberProgram = exports.Member = exports.Issuer = exports.Interface = exports.IdentityProvider = exports.EventSeries = exports.EventSellerMakesOffer = exports.Event = exports.EmailMessage = exports.CustomerType = exports.Customer = exports.Credentials = exports.CreativeWork = exports.ConfirmationNumber = exports.Comment = exports.Authorization = exports.CategoryCode = exports.AssetTransaction = exports.Application = exports.Aggregation = exports.AggregateReservation = exports.AggregateOffer = exports.AdditionalProperty = exports.Action = exports.AccountTransaction = exports.AccountTitle = exports.AccountingReport = exports.Account = exports.AcceptedOffer = void 0;
+exports.rateLimit = exports.Trip = exports.TransactionProcess = exports.TransactionNumber = exports.Transaction = exports.Ticket = exports.Telemetry = exports.Task = exports.StockHolder = exports.setting = exports.Setting = exports.ServiceOutputIdentifier = exports.ServiceOutput = exports.SellerReturnPolicy = exports.SellerPaymentAccepted = exports.Seller = exports.Schedule = exports.Role = exports.Reservation = exports.ProjectMakesOffer = exports.Project = exports.ProductOffer = void 0;
 var AcceptedOffer;
 (function (AcceptedOffer) {
     let repo;
@@ -323,6 +323,19 @@ var EventSeries;
     }
     EventSeries.createInstance = createInstance;
 })(EventSeries || (exports.EventSeries = EventSeries = {}));
+var IdentityProvider;
+(function (IdentityProvider) {
+    let repo;
+    function createInstance(...params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (repo === undefined) {
+                repo = (yield Promise.resolve().then(() => require('./repo/identityProvider'))).IdentityProviderRepo;
+            }
+            return new repo(...params);
+        });
+    }
+    IdentityProvider.createInstance = createInstance;
+})(IdentityProvider || (exports.IdentityProvider = IdentityProvider = {}));
 var Interface;
 (function (Interface) {
     let repo;

package/package.json

@@ -112,5 +112,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.9.0-alpha.0"
+  "version": "22.9.0-alpha.1"
 }

package/example/src/chevre/adminApplications.ts

@@ -1,66 +0,0 @@
-// tslint:disable:no-console
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../lib/index';
-
-const project = { id: String(process.env.PROJECT_ID) };
-const IDENTIFIER = '12345abcde';
-
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const applicationRepo = await chevre.repository.Application.createInstance(mongoose.connection);
-
-    let applications = await applicationRepo.projectFields(
-        {
-            project: { id: { $eq: project.id } },
-            clientId: { $eq: IDENTIFIER }
-        },
-        ['clientId', 'issuer', 'typeOf', 'verified', 'project']
-    );
-    console.log('applications:', applications);
-    console.log(applications.length, 'applications found');
-
-    if (applications.length > 0) {
-        await applicationRepo.deleteById({
-            project: { id: applications[0].project.id },
-            id: applications[0].id
-        });
-        console.log('application deleted', applications[0].id);
-    }
-
-    await applicationRepo.projectFields(
-        {
-            project: { id: { $eq: project.id } },
-            clientId: { $eq: IDENTIFIER }
-        },
-        ['clientId', 'issuer', 'typeOf', 'verified', 'project']
-    );
-    console.log('applications:', applications);
-    console.log(applications.length, 'applications found');
-
-    await applicationRepo.save({
-        attributes: {
-            project: { id: project.id, typeOf: chevre.factory.organizationType.Project },
-            typeOf: chevre.factory.creativeWorkType.WebApplication,
-            clientId: IDENTIFIER,
-            issuer: 'https://example.com',
-            verified: false
-        }
-    });
-    console.log('application created');
-
-    applications = await await applicationRepo.projectFields(
-        {
-            project: { id: { $eq: project.id } },
-            clientId: { $eq: IDENTIFIER }
-        },
-        ['clientId', 'issuer', 'typeOf', 'verified', 'project']
-    );
-    console.log('applications:', applications);
-    console.log(applications.length, 'applications found');
-}
-
-main()
-    .then()
-    .catch(console.error);