@flink-app/generic-auth-plugin 0.11.9 → 0.11.11

package/.flink/generatedHandlers.ts

@@ -1,4 +1,4 @@
-// Generated Wed Feb 05 2025 22:45:07 GMT+0100 (Central European Standard Time)
+// Generated Thu Feb 13 2025 14:49:55 GMT+0100 (Central European Standard Time)
 import { autoRegisteredHandlers, HttpMethod } from "@flink-app/flink";
 import * as UserCreate_0 from "../src/handlers/UserCreate";
 import * as UserLogin_0 from "../src/handlers/UserLogin";

package/.flink/generatedJobs.ts

@@ -1,4 +1,4 @@
-// Generated Wed Feb 05 2025 22:45:08 GMT+0100 (Central European Standard Time)
+// Generated Thu Feb 13 2025 14:49:56 GMT+0100 (Central European Standard Time)
 import { autoRegisteredJobs } from "@flink-app/flink";
 export const jobs = [];
 autoRegisteredJobs.push(...jobs);

package/.flink/generatedRepos.ts

@@ -1,4 +1,4 @@
-// Generated Wed Feb 05 2025 22:45:07 GMT+0100 (Central European Standard Time)
+// Generated Thu Feb 13 2025 14:49:55 GMT+0100 (Central European Standard Time)
   import { autoRegisteredRepos } from "@flink-app/flink";
   export const repos = [];
   autoRegisteredRepos.push(...repos);

package/.flink/schemas/schemas.json

@@ -345,6 +345,14 @@
             "android",
             "web"
           ]
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "firebase",
+            "apn-voip"
+          ],
+          "description": "The type of the token. This is used to determine which push notification service to use. Default is \"firebase\""
         }
       },
       "required": [
@@ -389,6 +397,14 @@
             "android",
             "web"
           ]
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "firebase",
+            "apn-voip"
+          ],
+          "description": "The type of the token. This is used to determine which push notification service to use. Default is \"firebase\""
         }
       },
       "required": [

package/.flink/schemas/schemas.ts

@@ -29,7 +29,7 @@ import { PutManagementUserRolesByUseridRes } from "../../src/schemas/Management/
 import { PutManagementUserUsernameByUseridReq } from "../../src/schemas/Management/PutUserUsernameByUseridReq";
 import { PutManagementUserUsernameByUseridRes } from "../../src/schemas/Management/PutUserUsernameByUseridRes";
 
-// Generated Wed Feb 05 2025 22:45:09 GMT+0100 (Central European Standard Time)
+// Generated Thu Feb 13 2025 14:49:56 GMT+0100 (Central European Standard Time)
 export interface UserCreate_7_ReqSchema extends UserCreateReq {}
 
 export interface UserCreate_7_ResSchema extends UserCreateRes {}

package/.flink/start.ts

@@ -1,4 +1,4 @@
-// Generated Wed Feb 05 2025 22:45:08 GMT+0100 (Central European Standard Time)
+// Generated Thu Feb 13 2025 14:49:56 GMT+0100 (Central European Standard Time)
 import "./generatedHandlers";
 import "./generatedRepos";
 import "./generatedJobs";

package/dist/.flink/generatedHandlers.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handlers = void 0;
-// Generated Wed Feb 05 2025 22:45:07 GMT+0100 (Central European Standard Time)
+// Generated Thu Feb 13 2025 14:49:55 GMT+0100 (Central European Standard Time)
 var flink_1 = require("@flink-app/flink");
 exports.handlers = [];
 flink_1.autoRegisteredHandlers.push.apply(flink_1.autoRegisteredHandlers, exports.handlers);

package/dist/.flink/generatedJobs.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.jobs = void 0;
-// Generated Wed Feb 05 2025 22:45:08 GMT+0100 (Central European Standard Time)
+// Generated Thu Feb 13 2025 14:49:56 GMT+0100 (Central European Standard Time)
 var flink_1 = require("@flink-app/flink");
 exports.jobs = [];
 flink_1.autoRegisteredJobs.push.apply(flink_1.autoRegisteredJobs, exports.jobs);

package/dist/.flink/generatedRepos.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.repos = void 0;
-// Generated Wed Feb 05 2025 22:45:07 GMT+0100 (Central European Standard Time)
+// Generated Thu Feb 13 2025 14:49:55 GMT+0100 (Central European Standard Time)
 var flink_1 = require("@flink-app/flink");
 exports.repos = [];
 flink_1.autoRegisteredRepos.push.apply(flink_1.autoRegisteredRepos, exports.repos);

package/dist/.flink/schemas/schemas.json

@@ -345,6 +345,14 @@
                         "android",
                         "web"
                     ]
+                },
+                "type": {
+                    "type": "string",
+                    "enum": [
+                        "firebase",
+                        "apn-voip"
+                    ],
+                    "description": "The type of the token. This is used to determine which push notification service to use. Default is \"firebase\""
                 }
             },
             "required": [
@@ -389,6 +397,14 @@
                         "android",
                         "web"
                     ]
+                },
+                "type": {
+                    "type": "string",
+                    "enum": [
+                        "firebase",
+                        "apn-voip"
+                    ],
+                    "description": "The type of the token. This is used to determine which push notification service to use. Default is \"firebase\""
                 }
             },
             "required": [

package/dist/.flink/start.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-// Generated Wed Feb 05 2025 22:45:08 GMT+0100 (Central European Standard Time)
+// Generated Thu Feb 13 2025 14:49:56 GMT+0100 (Central European Standard Time)
 require("./generatedHandlers");
 require("./generatedRepos");
 require("./generatedJobs");

package/dist/src/handlers/UserPushRegisterToken.js

@@ -1,4 +1,15 @@
 "use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 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) {
@@ -41,7 +52,7 @@ var flink_1 = require("@flink-app/flink");
 var postUserPushRegisterTokenHandler = function (_a) {
     var ctx = _a.ctx, req = _a.req, origin = _a.origin;
     return __awaiter(void 0, void 0, void 0, function () {
-        var pluginName, pluginOptions, repo, deregisterOtherDevices, allowMultipleDevices, user, exToken, otherRegistrations, _i, otherRegistrations_1, other, e_1;
+        var pluginName, pluginOptions, repo, deregisterOtherDevices, allowMultipleDevices, user, exToken, otherRegistrations, _i, otherRegistrations_1, other, lengthBefore, e_1;
         var _b;
         return __generator(this, function (_c) {
             switch (_c.label) {
@@ -62,7 +73,7 @@ var postUserPushRegisterTokenHandler = function (_a) {
                         exToken.token = req.body.token;
                     }
                     else {
-                        user.pushNotificationTokens.push(req.body);
+                        user.pushNotificationTokens.push(__assign(__assign({}, req.body), { type: req.body.type || "firebase" }));
                     }
                     if (!allowMultipleDevices) {
                         // Filter out all other devices except the newly registered one
@@ -80,6 +91,7 @@ var postUserPushRegisterTokenHandler = function (_a) {
                         })];
                 case 3:
                     otherRegistrations = _c.sent();
+                    flink_1.log.debug("Found " + otherRegistrations.length + " other registrations for device " + req.body.deviceId + " or token " + req.body.token);
                     _i = 0, otherRegistrations_1 = otherRegistrations;
                     _c.label = 4;
                 case 4:
@@ -88,7 +100,9 @@ var postUserPushRegisterTokenHandler = function (_a) {
                     _c.label = 5;
                 case 5:
                     _c.trys.push([5, 7, , 8]);
+                    lengthBefore = other.pushNotificationTokens.length;
                     other.pushNotificationTokens = other.pushNotificationTokens.filter(function (t) { return t.deviceId !== req.body.deviceId && t.token !== req.body.token; });
+                    flink_1.log.debug("Deregistering " + (lengthBefore - other.pushNotificationTokens.length) + " devices for user " + other._id + " as other user " + user._id + " claimed this device");
                     return [4 /*yield*/, repo.updateOne(other._id, {
                             pushNotificationTokens: other.pushNotificationTokens,
                         })];
@@ -109,4 +123,4 @@ var postUserPushRegisterTokenHandler = function (_a) {
 };
 exports.default = postUserPushRegisterTokenHandler;
 exports.__assumedHttpMethod = "", exports.__file = "UserPushRegisterToken.ts", exports.__query = [], exports.__params = [];
-exports.__schemas = { reqSchema: { "$schema": "http://json-schema.org/draft-07/schema#", "type": "object", "additionalProperties": false, "properties": { "deviceId": { "type": "string" }, "token": { "type": "string" }, "platform": { "type": "string", "enum": ["ios", "android", "web"] } }, "required": ["deviceId", "token"], "definitions": {} }, resSchema: { "$schema": "http://json-schema.org/draft-07/schema#", "type": "object", "additionalProperties": false, "properties": { "status": { "type": "string", "enum": ["success", "failed"] } }, "required": ["status"], "definitions": {} } };
+exports.__schemas = { reqSchema: { "$schema": "http://json-schema.org/draft-07/schema#", "type": "object", "additionalProperties": false, "properties": { "deviceId": { "type": "string" }, "token": { "type": "string" }, "platform": { "type": "string", "enum": ["ios", "android", "web"] }, "type": { "type": "string", "enum": ["firebase", "apn-voip"], "description": "The type of the token. This is used to determine which push notification service to use. Default is \"firebase\"" } }, "required": ["deviceId", "token"], "definitions": {} }, resSchema: { "$schema": "http://json-schema.org/draft-07/schema#", "type": "object", "additionalProperties": false, "properties": { "status": { "type": "string", "enum": ["success", "failed"] } }, "required": ["status"], "definitions": {} } };

package/dist/src/handlers/UserPushRemoveToken.js

@@ -66,4 +66,4 @@ var postUserRemoveTokenHandler = function (_a) {
 };
 exports.default = postUserRemoveTokenHandler;
 exports.__assumedHttpMethod = "", exports.__file = "UserPushRemoveToken.ts", exports.__query = [], exports.__params = [];
-exports.__schemas = { reqSchema: { "$schema": "http://json-schema.org/draft-07/schema#", "type": "object", "additionalProperties": false, "properties": { "deviceId": { "type": "string" }, "token": { "type": "string" }, "platform": { "type": "string", "enum": ["ios", "android", "web"] } }, "required": ["deviceId", "token"], "definitions": {} }, resSchema: { "$schema": "http://json-schema.org/draft-07/schema#", "type": "object", "additionalProperties": false, "properties": { "status": { "type": "string", "enum": ["success", "failed"] } }, "required": ["status"], "definitions": {} } };
+exports.__schemas = { reqSchema: { "$schema": "http://json-schema.org/draft-07/schema#", "type": "object", "additionalProperties": false, "properties": { "deviceId": { "type": "string" }, "token": { "type": "string" }, "platform": { "type": "string", "enum": ["ios", "android", "web"] }, "type": { "type": "string", "enum": ["firebase", "apn-voip"], "description": "The type of the token. This is used to determine which push notification service to use. Default is \"firebase\"" } }, "required": ["deviceId", "token"], "definitions": {} }, resSchema: { "$schema": "http://json-schema.org/draft-07/schema#", "type": "object", "additionalProperties": false, "properties": { "status": { "type": "string", "enum": ["success", "failed"] } }, "required": ["status"], "definitions": {} } };

package/dist/src/index.js

@@ -1,4 +1,15 @@
 "use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
@@ -9,6 +20,17 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
+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.genericAuthPlugin = void 0;
 var coreFunctions_1 = require("./coreFunctions");
@@ -21,24 +43,16 @@ __exportStar(require("./management"), exports);
 var genericAuthPlugin = function (options) {
     if (options.pluginId == null)
         options.pluginId = "genericAuthPlugin";
+    var sms = options.sms, usernameFormat = options.usernameFormat, restOptions = __rest(options, ["sms", "usernameFormat"]);
     return {
         id: options.pluginId,
         init: function (app) { return init_1.init(app, options); },
-        ctx: {
-            loginUser: coreFunctions_1.loginUser,
+        ctx: __assign(__assign({}, restOptions), { loginUser: coreFunctions_1.loginUser,
             loginByToken: coreFunctions_1.loginByToken,
             createUser: coreFunctions_1.createUser,
             changePassword: coreFunctions_1.changePassword,
             passwordResetStart: coreFunctions_1.passwordResetStart,
-            passwordResetComplete: coreFunctions_1.passwordResetComplete,
-            repoName: options.repoName,
-            passwordResetSettings: options.passwordResetSettings,
-            createPasswordHashAndSaltMethod: options.createPasswordHashAndSaltMethod,
-            validatePasswordMethod: options.validatePasswordMethod,
-            usernameFormat: options.usernameFormat || /.{1,}$/,
-            onSuccessfulLogin: options.onSuccessfulLogin,
-            smsOptions: options.sms
-        },
+            passwordResetComplete: coreFunctions_1.passwordResetComplete, usernameFormat: usernameFormat || /.{1,}$/, smsOptions: sms }),
     };
 };
 exports.genericAuthPlugin = genericAuthPlugin;

package/dist/src/schemas/PushNotificationToken.d.ts

@@ -2,4 +2,9 @@ export interface PushNotificationToken {
     deviceId: string;
     token: string;
     platform?: "ios" | "android" | "web";
+    /**
+     * The type of the token. This is used to determine which push notification service to use.
+     * Default is "firebase"
+     */
+    type?: "firebase" | "apn-voip";
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flink-app/generic-auth-plugin",
-  "version": "0.11.9",
+  "version": "0.11.11",
   "description": "Flink plugin that provides a generic user authentification solution.",
   "scripts": {
     "test": "echo \"Error: no test specified\"",
@@ -30,5 +30,5 @@
     "ts-node": "^9.1.1",
     "typescript": "^4.2.4"
   },
-  "gitHead": "cc04e10ae82ed022031ef8bcfaafa9beb1d6564f"
+  "gitHead": "0eb9b8d88342ba6c868ba70eed1dddb818d1f6dc"
 }

package/src/handlers/UserPushRegisterToken.ts

@@ -1,4 +1,4 @@
-import { FlinkContext, Handler, notFound } from "@flink-app/flink";
+import { FlinkContext, Handler, log, notFound } from "@flink-app/flink";
 import { genericAuthContext } from "../genericAuthContext";
 import { PushNotificationToken } from "../schemas/PushNotificationToken";
 import { PushNotificatioNTokenRes } from "../schemas/PushNotificationTokenRes";
@@ -27,7 +27,7 @@ const postUserPushRegisterTokenHandler: Handler<FlinkContext<genericAuthContext>
     if (exToken != null) {
         exToken.token = req.body.token;
     } else {
-        user.pushNotificationTokens.push(req.body);
+        user.pushNotificationTokens.push({ ...req.body, type: req.body.type || "firebase" });
     }
 
     if (!allowMultipleDevices) {
@@ -45,9 +45,20 @@ const postUserPushRegisterTokenHandler: Handler<FlinkContext<genericAuthContext>
             _id: { $ne: user._id },
         });
 
+        log.debug(`Found ${otherRegistrations.length} other registrations for device ${req.body.deviceId} or token ${req.body.token}`);
+
         for (let other of otherRegistrations) {
             try {
+                let lengthBefore = other.pushNotificationTokens.length;
+
                 other.pushNotificationTokens = other.pushNotificationTokens.filter((t) => t.deviceId !== req.body.deviceId && t.token !== req.body.token);
+
+                log.debug(
+                    `Deregistering ${lengthBefore - other.pushNotificationTokens.length} devices for user ${other._id} as other user ${
+                        user._id
+                    } claimed this device`
+                );
+
                 await repo.updateOne(other._id, {
                     pushNotificationTokens: other.pushNotificationTokens,
                 });

package/src/index.ts

@@ -1,12 +1,5 @@
 import { FlinkPlugin } from "@flink-app/flink";
-import {
-  loginUser,
-  createUser,
-  changePassword,
-  passwordResetComplete,
-  passwordResetStart,
-  loginByToken
-} from "./coreFunctions";
+import { loginUser, createUser, changePassword, passwordResetComplete, passwordResetStart, loginByToken } from "./coreFunctions";
 import { init } from "./init";
 import { GenericAuthPluginOptions } from "./genericAuthPluginOptions";
 
@@ -16,27 +9,24 @@ export * from "./schemas/User";
 export * from "./genericAuthPluginOptions";
 export * from "./management";
 
-export const genericAuthPlugin = (
-  options: GenericAuthPluginOptions
-): FlinkPlugin => {
-  if (options.pluginId == null) options.pluginId = "genericAuthPlugin";
-  return {
-    id: options.pluginId,
-    init: (app) => init(app, options),
-    ctx: {
-      loginUser,
-      loginByToken,
-      createUser,
-      changePassword,
-      passwordResetStart,
-      passwordResetComplete,
-      repoName: options.repoName,
-      passwordResetSettings: options.passwordResetSettings,
-      createPasswordHashAndSaltMethod: options.createPasswordHashAndSaltMethod,
-      validatePasswordMethod: options.validatePasswordMethod,
-      usernameFormat: options.usernameFormat || /.{1,}$/,
-      onSuccessfulLogin: options.onSuccessfulLogin,
-      smsOptions : options.sms
-    },
-  };
+export const genericAuthPlugin = (options: GenericAuthPluginOptions): FlinkPlugin => {
+    if (options.pluginId == null) options.pluginId = "genericAuthPlugin";
+
+    const { sms, usernameFormat, ...restOptions } = options;
+
+    return {
+        id: options.pluginId,
+        init: (app) => init(app, options),
+        ctx: {
+            ...restOptions,
+            loginUser,
+            loginByToken,
+            createUser,
+            changePassword,
+            passwordResetStart,
+            passwordResetComplete,
+            usernameFormat: usernameFormat || /.{1,}$/,
+            smsOptions: sms,
+        },
+    };
 };

package/src/schemas/PushNotificationToken.ts

@@ -2,4 +2,10 @@ export interface PushNotificationToken {
     deviceId: string;
     token: string;
     platform?: "ios" | "android" | "web";
+
+    /**
+     * The type of the token. This is used to determine which push notification service to use.
+     * Default is "firebase"
+     */
+    type?: "firebase" | "apn-voip";
 }