@feathersjs/authentication-oauth 5.0.0-pre.3 → 5.0.0-pre.30

package/lib/index.js

@@ -1,71 +1,37 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.expressOauth = exports.express = exports.setup = exports.OAuthStrategy = void 0;
-const merge_1 = __importDefault(require("lodash/merge"));
-const each_1 = __importDefault(require("lodash/each"));
-const omit_1 = __importDefault(require("lodash/omit"));
+exports.oauth = exports.OAuthStrategy = void 0;
 const commons_1 = require("@feathersjs/commons");
+const schema_1 = require("@feathersjs/schema");
 const strategy_1 = require("./strategy");
 Object.defineProperty(exports, "OAuthStrategy", { enumerable: true, get: function () { return strategy_1.OAuthStrategy; } });
-const express_1 = __importDefault(require("./express"));
+const service_1 = require("./service");
 const utils_1 = require("./utils");
-const debug = commons_1.createDebug('@feathersjs/authentication-oauth');
-const setup = (options) => (app) => {
-    const service = app.defaultAuthentication ? app.defaultAuthentication(options.authService) : null;
-    if (!service) {
+const debug = (0, commons_1.createDebug)('@feathersjs/authentication-oauth');
+const oauth = (settings = {}) => (app) => {
+    const authService = app.defaultAuthentication ? app.defaultAuthentication(settings.authService) : null;
+    if (!authService) {
         throw new Error('An authentication service must exist before registering @feathersjs/authentication-oauth');
     }
-    const { oauth } = service.configuration;
-    if (!oauth) {
+    if (!authService.configuration.oauth) {
         debug('No oauth configuration found in authentication configuration. Skipping oAuth setup.');
         return;
     }
-    const { strategyNames } = service;
-    // Set up all the defaults
-    const { prefix = '/oauth' } = oauth.defaults || {};
-    const port = app.get('port');
-    let host = app.get('host');
-    let protocol = 'https';
-    // Development environments commonly run on HTTP with an extended port
-    if (app.get('env') === 'development') {
-        protocol = 'http';
-        if (String(port) !== '80') {
-            host += `:${port}`;
-        }
-    }
-    const grant = merge_1.default({
-        defaults: {
-            prefix,
-            origin: `${protocol}://${host}`,
-            transport: 'session',
-            response: ['tokens', 'raw', 'profile']
-        }
-    }, omit_1.default(oauth, 'redirect'));
-    const getUrl = (url) => {
-        const { defaults } = grant;
-        return `${defaults.origin}${prefix}/${url}`;
+    const oauthOptions = {
+        linkStrategy: 'jwt',
+        ...settings
     };
-    each_1.default(grant, (value, name) => {
-        if (name !== 'defaults') {
-            value.callback = value.callback || getUrl(`${name}/authenticate`);
-            value.redirect_uri = value.redirect_uri || getUrl(`${name}/callback`);
-            if (!strategyNames.includes(name)) {
-                debug(`Registering oAuth default strategy for '${name}'`);
-                service.register(name, new strategy_1.OAuthStrategy());
-            }
-        }
+    const grantConfig = (0, utils_1.getGrantConfig)(authService);
+    const serviceOptions = (0, utils_1.getServiceOptions)(authService, oauthOptions);
+    const servicePath = `${grantConfig.defaults.prefix || 'oauth'}/:provider`;
+    app.use(servicePath, new service_1.OAuthService(authService, oauthOptions), serviceOptions);
+    const oauthService = app.service(servicePath);
+    oauthService.hooks({
+        around: { all: [(0, schema_1.resolveDispatch)(), (0, service_1.redirectHook)()] }
     });
-    app.set('grant', grant);
-};
-exports.setup = setup;
-const express = (settings = {}) => (app) => {
-    const options = utils_1.getDefaultSettings(app, settings);
-    app.configure(exports.setup(options));
-    app.configure(express_1.default(options));
+    if (typeof oauthService.publish === 'function') {
+        app.service(servicePath).publish(() => null);
+    }
 };
-exports.express = express;
-exports.expressOauth = exports.express;
+exports.oauth = oauth;
 //# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AACA,iDAAiD;AACjD,+CAAoD;AAEpD,yCAAwD;AAM3B,8FANpB,wBAAa,OAMoB;AAL1C,uCAAsD;AACtD,mCAA+E;AAE/E,MAAM,KAAK,GAAG,IAAA,qBAAW,EAAC,kCAAkC,CAAC,CAAA;AAItD,MAAM,KAAK,GAChB,CAAC,WAAwC,EAAE,EAAE,EAAE,CAC/C,CAAC,GAAgB,EAAE,EAAE;IACnB,MAAM,WAAW,GAAG,GAAG,CAAC,qBAAqB,CAAC,CAAC,CAAC,GAAG,CAAC,qBAAqB,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;IAEtG,IAAI,CAAC,WAAW,EAAE;QAChB,MAAM,IAAI,KAAK,CACb,0FAA0F,CAC3F,CAAA;KACF;IAED,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,KAAK,EAAE;QACpC,KAAK,CAAC,qFAAqF,CAAC,CAAA;QAC5F,OAAM;KACP;IAED,MAAM,YAAY,GAAG;QACnB,YAAY,EAAE,KAAK;QACnB,GAAG,QAAQ;KACZ,CAAA;IAED,MAAM,WAAW,GAAG,IAAA,sBAAc,EAAC,WAAW,CAAC,CAAA;IAC/C,MAAM,cAAc,GAAG,IAAA,yBAAiB,EAAC,WAAW,EAAE,YAAY,CAAC,CAAA;IACnE,MAAM,WAAW,GAAG,GAAG,WAAW,CAAC,QAAQ,CAAC,MAAM,IAAI,OAAO,YAAY,CAAA;IAEzE,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,sBAAY,CAAC,WAAW,EAAE,YAAY,CAAC,EAAE,cAAc,CAAC,CAAA;IAEjF,MAAM,YAAY,GAAG,GAAG,CAAC,OAAO,CAAC,WAAW,CAAC,CAAA;IAE7C,YAAY,CAAC,KAAK,CAAC;QACjB,MAAM,EAAE,EAAE,GAAG,EAAE,CAAC,IAAA,wBAAe,GAAE,EAAE,IAAA,sBAAY,GAAE,CAAC,EAAE;KACrD,CAAC,CAAA;IAEF,IAAI,OAAO,YAAY,CAAC,OAAO,KAAK,UAAU,EAAE;QAC9C,GAAG,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAA;KAC7C;AACH,CAAC,CAAA;AApCU,QAAA,KAAK,SAoCf"}

package/lib/service.d.ts

@@ -0,0 +1,36 @@
+import { HookContext, NextFunction, Params } from '@feathersjs/feathers';
+import { FeathersError } from '@feathersjs/errors';
+import { AuthenticationService } from '@feathersjs/authentication';
+import { OauthSetupSettings } from './utils';
+export declare type GrantResponse = {
+    location: string;
+    session: any;
+    state: any;
+};
+export declare type OAuthParams = Omit<Params, 'route'> & {
+    session: any;
+    state: Record<string, any>;
+    route: {
+        provider: string;
+    };
+};
+export declare class OAuthError extends FeathersError {
+    location: string;
+    constructor(message: string, data: any, location: string);
+}
+export declare const redirectHook: () => (context: HookContext, next: NextFunction) => Promise<void>;
+export declare class OAuthService {
+    service: AuthenticationService;
+    settings: OauthSetupSettings;
+    grant: any;
+    constructor(service: AuthenticationService, settings: OauthSetupSettings);
+    handler(method: string, params: OAuthParams, body?: any, override?: string): Promise<GrantResponse>;
+    authenticate(params: OAuthParams, result: GrantResponse): Promise<{
+        location: string;
+    }>;
+    find(params: OAuthParams): Promise<GrantResponse>;
+    get(override: string, params: OAuthParams): Promise<{
+        location: string;
+    }>;
+    create(data: any, params: OAuthParams): Promise<GrantResponse>;
+}

package/lib/service.js

@@ -0,0 +1,141 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OAuthService = exports.redirectHook = exports.OAuthError = void 0;
+const commons_1 = require("@feathersjs/commons");
+const errors_1 = require("@feathersjs/errors");
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+//@ts-ignore
+const grant_1 = __importDefault(require("grant/lib/grant"));
+const utils_1 = require("./utils");
+const debug = (0, commons_1.createDebug)('@feathersjs/authentication-oauth/services');
+class OAuthError extends errors_1.FeathersError {
+    constructor(message, data, location) {
+        super(message, 'NotAuthenticated', 401, 'not-authenticated', data);
+        this.location = location;
+    }
+}
+exports.OAuthError = OAuthError;
+const redirectHook = () => async (context, next) => {
+    try {
+        await next();
+        const { location } = context.result;
+        debug(`oAuth redirect to ${location}`);
+        if (location) {
+            context.http = {
+                ...context.http,
+                location
+            };
+        }
+    }
+    catch (error) {
+        if (error.location) {
+            context.http = {
+                ...context.http,
+                location: error.location
+            };
+            context.result = typeof error.toJSON === 'function' ? error.toJSON() : error;
+        }
+        else {
+            throw error;
+        }
+    }
+};
+exports.redirectHook = redirectHook;
+class OAuthService {
+    constructor(service, settings) {
+        this.service = service;
+        this.settings = settings;
+        const config = (0, utils_1.getGrantConfig)(service);
+        this.grant = (0, grant_1.default)({ config });
+    }
+    async handler(method, params, body, override) {
+        const { session, state, query, route: { provider } } = params;
+        const result = await this.grant({
+            params: { provider, override },
+            state: state.grant,
+            session: session.grant,
+            query,
+            method,
+            body
+        });
+        session.grant = result.session;
+        state.grant = result.state;
+        return result;
+    }
+    async authenticate(params, result) {
+        var _a, _b;
+        const name = params.route.provider;
+        const { linkStrategy, authService } = this.settings;
+        const { accessToken, grant, query = {}, redirect } = params.session;
+        const strategy = this.service.getStrategy(name);
+        const authParams = {
+            ...params,
+            authStrategies: [name],
+            authentication: accessToken
+                ? {
+                    strategy: linkStrategy,
+                    accessToken
+                }
+                : null,
+            query,
+            redirect
+        };
+        const payload = (grant === null || grant === void 0 ? void 0 : grant.response) || ((_a = result === null || result === void 0 ? void 0 : result.session) === null || _a === void 0 ? void 0 : _a.response) || ((_b = result === null || result === void 0 ? void 0 : result.state) === null || _b === void 0 ? void 0 : _b.response) || params.query;
+        const authentication = {
+            strategy: name,
+            ...payload
+        };
+        try {
+            debug(`Calling ${authService}.create authentication with strategy ${name}`);
+            const authResult = await this.service.create(authentication, authParams);
+            debug('Successful oAuth authentication, sending response');
+            const location = await strategy.getRedirect(authResult, authParams);
+            if (typeof params.session.destroy === 'function') {
+                await params.session.destroy();
+            }
+            return {
+                ...authResult,
+                location
+            };
+        }
+        catch (error) {
+            const location = await strategy.getRedirect(error, authParams);
+            const e = new OAuthError(error.message, error.data, location);
+            if (typeof params.session.destroy === 'function') {
+                await params.session.destroy();
+            }
+            e.stack = error.stack;
+            throw e;
+        }
+    }
+    async find(params) {
+        const { session, query } = params;
+        const { feathers_token, redirect, ...restQuery } = query;
+        const handlerParams = {
+            ...params,
+            query: restQuery
+        };
+        if (feathers_token) {
+            debug('Got feathers_token query parameter to link accounts', feathers_token);
+            session.accessToken = feathers_token;
+        }
+        session.redirect = redirect;
+        session.query = restQuery;
+        return this.handler('GET', handlerParams, {});
+    }
+    async get(override, params) {
+        const result = await this.handler('GET', params, {}, override);
+        if (override === 'callback') {
+            return this.authenticate(params, result);
+        }
+        return result;
+    }
+    async create(data, params) {
+        return this.handler('POST', params, data);
+    }
+}
+exports.OAuthService = OAuthService;
+//# sourceMappingURL=service.js.map

package/lib/service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"service.js","sourceRoot":"","sources":["../src/service.ts"],"names":[],"mappings":"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"}

package/lib/strategy.d.ts

@@ -1,4 +1,4 @@
-import { AuthenticationRequest, AuthenticationBaseStrategy, AuthenticationResult } from '@feathersjs/authentication';
+import { AuthenticationRequest, AuthenticationBaseStrategy, AuthenticationResult, AuthenticationParams } from '@feathersjs/authentication';
 import { Params } from '@feathersjs/feathers';
 export interface OAuthProfile {
     id?: string | number;
@@ -15,12 +15,13 @@ export declare class OAuthStrategy extends AuthenticationBaseStrategy {
     }>;
     getProfile(data: AuthenticationRequest, _params: Params): Promise<any>;
     getCurrentEntity(params: Params): Promise<any>;
-    getRedirect(data: AuthenticationResult | Error, params?: Params): Promise<string | null>;
+    getAllowedOrigin(params?: Params): Promise<any>;
+    getRedirect(data: AuthenticationResult | Error, params?: AuthenticationParams): Promise<string | null>;
     findEntity(profile: OAuthProfile, params: Params): Promise<any>;
     createEntity(profile: OAuthProfile, params: Params): Promise<any>;
     updateEntity(entity: any, profile: OAuthProfile, params: Params): Promise<any[]>;
     getEntity(result: any, params: Params): Promise<any>;
-    authenticate(authentication: AuthenticationRequest, originalParams: Params): Promise<{
+    authenticate(authentication: AuthenticationRequest, originalParams: AuthenticationParams): Promise<{
         [x: string]: any;
         authentication: {
             strategy: string;

package/lib/strategy.js

@@ -1,154 +1,130 @@
 "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;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OAuthStrategy = void 0;
-/* eslint-disable @typescript-eslint/no-unused-vars */
-// @ts-ignore
-const querystring_1 = __importDefault(require("querystring"));
 const authentication_1 = require("@feathersjs/authentication");
 const errors_1 = require("@feathersjs/errors");
 const commons_1 = require("@feathersjs/commons");
-const debug = commons_1.createDebug('@feathersjs/authentication-oauth/strategy');
+const qs_1 = __importDefault(require("qs"));
+const debug = (0, commons_1.createDebug)('@feathersjs/authentication-oauth/strategy');
 class OAuthStrategy extends authentication_1.AuthenticationBaseStrategy {
     get configuration() {
         const { entity, service, entityId, oauth } = this.authentication.configuration;
         const config = oauth[this.name];
-        return Object.assign({ entity,
+        return {
+            entity,
             service,
-            entityId }, config);
+            entityId,
+            ...config
+        };
     }
     get entityId() {
         const { entityService } = this;
         return this.configuration.entityId || (entityService && entityService.id);
     }
-    getEntityQuery(profile, _params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return {
-                [`${this.name}Id`]: profile.sub || profile.id
-            };
-        });
+    async getEntityQuery(profile, _params) {
+        return {
+            [`${this.name}Id`]: profile.sub || profile.id
+        };
     }
-    getEntityData(profile, _existingEntity, _params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return {
-                [`${this.name}Id`]: profile.sub || profile.id
-            };
-        });
+    async getEntityData(profile, _existingEntity, _params) {
+        return {
+            [`${this.name}Id`]: profile.sub || profile.id
+        };
     }
-    getProfile(data, _params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return data.profile;
-        });
+    async getProfile(data, _params) {
+        return data.profile;
     }
-    getCurrentEntity(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { authentication } = params;
-            const { entity } = this.configuration;
-            if (authentication && authentication.strategy) {
-                debug('getCurrentEntity with authentication', authentication);
-                const { strategy } = authentication;
-                const authResult = yield this.authentication
-                    .authenticate(authentication, params, strategy);
-                return authResult[entity];
-            }
-            return null;
-        });
+    async getCurrentEntity(params) {
+        const { authentication } = params;
+        const { entity } = this.configuration;
+        if (authentication && authentication.strategy) {
+            debug('getCurrentEntity with authentication', authentication);
+            const { strategy } = authentication;
+            const authResult = await this.authentication.authenticate(authentication, params, strategy);
+            return authResult[entity];
+        }
+        return null;
     }
-    getRedirect(data, params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const queryRedirect = (params && params.redirect) || '';
-            const { redirect } = this.authentication.configuration.oauth;
-            if (!redirect) {
-                return null;
+    async getAllowedOrigin(params) {
+        var _a;
+        const { redirect, origins = this.app.get('origins') } = this.authentication.configuration.oauth;
+        if (Array.isArray(origins)) {
+            const referer = ((_a = params === null || params === void 0 ? void 0 : params.headers) === null || _a === void 0 ? void 0 : _a.referer) || origins[0];
+            const allowedOrigin = origins.find((current) => referer.toLowerCase().startsWith(current.toLowerCase()));
+            if (!allowedOrigin) {
+                throw new errors_1.NotAuthenticated(`Referer "${referer}" is not allowed.`);
             }
-            const redirectUrl = `${redirect}${queryRedirect}`;
-            const separator = redirect.endsWith('?') ? '' :
-                (redirect.indexOf('#') !== -1 ? '?' : '#');
-            const authResult = data;
-            const query = authResult.accessToken ? {
-                access_token: authResult.accessToken
-            } : {
-                error: data.message || 'OAuth Authentication not successful'
-            };
-            return `${redirectUrl}${separator}${querystring_1.default.stringify(query)}`;
-        });
+            return allowedOrigin;
+        }
+        return redirect;
     }
-    findEntity(profile, params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const query = yield this.getEntityQuery(profile, params);
-            debug('findEntity with query', query);
-            const result = yield this.entityService.find(Object.assign(Object.assign({}, params), { query }));
-            const [entity = null] = result.data ? result.data : result;
-            debug('findEntity returning', entity);
-            return entity;
-        });
+    async getRedirect(data, params) {
+        const queryRedirect = (params && params.redirect) || '';
+        const redirect = await this.getAllowedOrigin(params);
+        if (!redirect) {
+            return null;
+        }
+        const redirectUrl = `${redirect}${queryRedirect}`;
+        const separator = redirect.endsWith('?') ? '' : redirect.indexOf('#') !== -1 ? '?' : '#';
+        const authResult = data;
+        const query = authResult.accessToken
+            ? { access_token: authResult.accessToken }
+            : { error: data.message || 'OAuth Authentication not successful' };
+        return `${redirectUrl}${separator}${qs_1.default.stringify(query)}`;
     }
-    createEntity(profile, params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const data = yield this.getEntityData(profile, null, params);
-            debug('createEntity with data', data);
-            return this.entityService.create(data, params);
+    async findEntity(profile, params) {
+        const query = await this.getEntityQuery(profile, params);
+        debug('findEntity with query', query);
+        const result = await this.entityService.find({
+            ...params,
+            query
         });
+        const [entity = null] = result.data ? result.data : result;
+        debug('findEntity returning', entity);
+        return entity;
     }
-    updateEntity(entity, profile, params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const id = entity[this.entityId];
-            const data = yield this.getEntityData(profile, entity, params);
-            debug(`updateEntity with id ${id} and data`, data);
-            return this.entityService.patch(id, data, params);
-        });
+    async createEntity(profile, params) {
+        const data = await this.getEntityData(profile, null, params);
+        debug('createEntity with data', data);
+        return this.entityService.create(data, commons_1._.omit(params, 'query'));
     }
-    getEntity(result, params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { entityService } = this;
-            const { entityId = entityService.id, entity } = this.configuration;
-            if (!entityId || result[entityId] === undefined) {
-                throw new errors_1.NotAuthenticated('Could not get oAuth entity');
-            }
-            if (!params.provider) {
-                return result;
-            }
-            return entityService.get(result[entityId], Object.assign(Object.assign({}, params), { [entity]: result }));
-        });
+    async updateEntity(entity, profile, params) {
+        const id = entity[this.entityId];
+        const data = await this.getEntityData(profile, entity, params);
+        debug(`updateEntity with id ${id} and data`, data);
+        return this.entityService.patch(id, data, commons_1._.omit(params, 'query'));
     }
-    authenticate(authentication, originalParams) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const entity = this.configuration.entity;
-            const { provider } = originalParams, params = __rest(originalParams, ["provider"]);
-            const profile = yield this.getProfile(authentication, params);
-            const existingEntity = (yield this.findEntity(profile, params))
-                || (yield this.getCurrentEntity(params));
-            debug('authenticate with (existing) entity', existingEntity);
-            const authEntity = !existingEntity ? yield this.createEntity(profile, params)
-                : yield this.updateEntity(existingEntity, profile, params);
-            return {
-                authentication: { strategy: this.name },
-                [entity]: yield this.getEntity(authEntity, originalParams)
-            };
+    async getEntity(result, params) {
+        const { entityService } = this;
+        const { entityId = entityService.id, entity } = this.configuration;
+        if (!entityId || result[entityId] === undefined) {
+            throw new errors_1.NotAuthenticated('Could not get oAuth entity');
+        }
+        if (!params.provider) {
+            return result;
+        }
+        return entityService.get(result[entityId], {
+            ...commons_1._.omit(params, 'query'),
+            [entity]: result
         });
     }
+    async authenticate(authentication, originalParams) {
+        const entity = this.configuration.entity;
+        const { provider, ...params } = originalParams;
+        const profile = await this.getProfile(authentication, params);
+        const existingEntity = (await this.findEntity(profile, params)) || (await this.getCurrentEntity(params));
+        debug('authenticate with (existing) entity', existingEntity);
+        const authEntity = !existingEntity
+            ? await this.createEntity(profile, params)
+            : await this.updateEntity(existingEntity, profile, params);
+        return {
+            authentication: { strategy: this.name },
+            [entity]: await this.getEntity(authEntity, originalParams)
+        };
+    }
 }
 exports.OAuthStrategy = OAuthStrategy;
 //# sourceMappingURL=strategy.js.map

package/lib/strategy.js.map

@@ -1 +1 @@
-{"version":3,"file":"strategy.js","sourceRoot":"","sources":["../src/strategy.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"strategy.js","sourceRoot":"","sources":["../src/strategy.ts"],"names":[],"mappings":"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"}

package/lib/utils.d.ts

@@ -1,8 +1,17 @@
-import { RequestHandler } from 'express';
-import { Application } from '@feathersjs/feathers';
+import type { RequestHandler } from 'express';
+import type { Middleware } from '@feathersjs/koa';
+import type { ServiceOptions } from '@feathersjs/feathers';
+import '@feathersjs/koa';
+import '@feathersjs/express';
+import { AuthenticationService } from '@feathersjs/authentication';
+import { GrantConfig } from 'grant';
 export interface OauthSetupSettings {
+    linkStrategy: string;
     authService?: string;
     expressSession?: RequestHandler;
-    linkStrategy: string;
+    koaSession?: Middleware;
 }
-export declare const getDefaultSettings: (_app: Application, other?: Partial<OauthSetupSettings>) => OauthSetupSettings;
+export declare const getGrantConfig: (service: AuthenticationService) => GrantConfig;
+export declare const setExpressParams: RequestHandler;
+export declare const setKoaParams: Middleware;
+export declare const getServiceOptions: (service: AuthenticationService, settings: OauthSetupSettings) => ServiceOptions;