feat: accept no node owner (directory).

logion-network · Apr 12, 2024 · 844719a · 844719a
1 parent fcf65ac
commit 844719a
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 9 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@logion/authenticator",
-  "version": "0.5.6-5",
+  "version": "0.5.6-6",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/logion-network/logion-authenticator.git"

diff --git a/src/AuthenticatedUser.ts b/src/AuthenticatedUser.ts
@@ -6,7 +6,7 @@ export class AuthenticatedUser implements AccountId {
 
     constructor(
         accountId: AccountId,
-        nodeOwner: ValidAccountId,
+        nodeOwner: ValidAccountId | undefined,
         authorityService: AuthorityService,
         errorFactory: ErrorFactory,
     ) {
@@ -21,7 +21,7 @@ export class AuthenticatedUser implements AccountId {
     }
 
     isNodeOwner(): boolean {
-        return this.isPolkadot() && this.nodeOwner.equals(this);
+        return this.isPolkadot() && this.nodeOwner?.equals(this) || false;
     }
 
     async isLegalOfficer(): Promise<boolean> {
@@ -59,7 +59,7 @@ export class AuthenticatedUser implements AccountId {
     }
 
     readonly validAccountId: ValidAccountId;
-    private readonly nodeOwner: ValidAccountId;
+    private readonly nodeOwner?: ValidAccountId;
     private readonly authorityService: AuthorityService;
     private readonly errorFactory: ErrorFactory;
 }
diff --git a/src/Config.ts b/src/Config.ts
@@ -14,7 +14,7 @@ import {
 } from "./Signature.js";
 
 export interface TokenConfig {
-    readonly nodeOwner: ValidAccountId;
+    readonly nodeOwner?: ValidAccountId;
     readonly nodePeerId: PeerId;
     readonly nodeKey: Buffer;
     readonly jwtTimeToLive: Duration;

diff --git a/test/AuthenticatedUser.spec.ts b/test/AuthenticatedUser.spec.ts
@@ -13,6 +13,7 @@ describe('AuthenticatedUser', () => {
         const authenticatedUser = buildAuthenticatedUser({
             address: USER_POLKADOT_ADDRESS,
             isWellKnownNode: true,
+            nodeOwner: ALICE,
         });
         expect(authenticatedUser.is(newValidAccountId(SOME_OTHER_USER))).toBe(false);
     })
@@ -21,6 +22,7 @@ describe('AuthenticatedUser', () => {
         const authenticatedUser = buildAuthenticatedUser({
             address: USER_POLKADOT_ADDRESS,
             isWellKnownNode: true,
+            nodeOwner: ALICE,
         });
         expect(authenticatedUser.is(null)).toBe(false);
     })
@@ -29,6 +31,7 @@ describe('AuthenticatedUser', () => {
         const authenticatedUser = buildAuthenticatedUser({
             address: USER_POLKADOT_ADDRESS,
             isWellKnownNode: true,
+            nodeOwner: ALICE,
         });
         expect(authenticatedUser.is(undefined)).toBe(false);
     })
@@ -37,6 +40,7 @@ describe('AuthenticatedUser', () => {
         const authenticatedUser = buildAuthenticatedUser({
             address: USER_POLKADOT_ADDRESS,
             isWellKnownNode: true,
+            nodeOwner: ALICE,
         });
         expect(authenticatedUser.isOneOf([ newValidAccountId(SOME_OTHER_USER) ])).toBe(false);
     })
@@ -45,6 +49,7 @@ describe('AuthenticatedUser', () => {
         const authenticatedUser = buildAuthenticatedUser({
             address: USER_POLKADOT_ADDRESS,
             isWellKnownNode: true,
+            nodeOwner: ALICE,
         });
         expect(authenticatedUser.isOneOf([ newValidAccountId(USER_POLKADOT_ADDRESS) ])).toBe(true);
         expect(authenticatedUser.isPolkadot()).toBe(true);
@@ -54,6 +59,7 @@ describe('AuthenticatedUser', () => {
         const authenticatedUser = buildAuthenticatedUser({
             address: ALICE.address,
             isWellKnownNode: true,
+            nodeOwner: ALICE,
         });
         expect(authenticatedUser.isNodeOwner()).toBe(true);
     })
@@ -62,7 +68,8 @@ describe('AuthenticatedUser', () => {
         const authenticatedUser = buildAuthenticatedUser({
             address: USER_ETHEREUM_ADDRESS,
             isWellKnownNode: true,
-            addressType: "Ethereum"
+            addressType: "Ethereum",
+            nodeOwner: ALICE,
         });
         expect(authenticatedUser.isOneOf([ newValidAccountId(USER_ETHEREUM_ADDRESS, "Ethereum") ])).toBe(true);
         expect(authenticatedUser.isPolkadot()).toBe(false);
@@ -74,7 +81,8 @@ describe('AuthenticatedUser', () => {
         const authenticatedUser = buildAuthenticatedUser({
             address: USER_ETHEREUM_ADDRESS,
             isWellKnownNode: true,
-            addressType: "Ethereum"
+            addressType: "Ethereum",
+            nodeOwner: ALICE,
         });
         expect(authenticatedUser.validAccountId.type).toEqual("Ethereum");
         expect(authenticatedUser.validAccountId.address).toEqual(USER_ETHEREUM_ADDRESS);
@@ -84,21 +92,31 @@ describe('AuthenticatedUser', () => {
         const authenticatedUser = buildAuthenticatedUser({
             address: USER_POLKADOT_ADDRESS,
             isWellKnownNode: true,
+            nodeOwner: ALICE,
         });
         expect(authenticatedUser.validAccountId.type).toEqual("Polkadot");
         expect(authenticatedUser.validAccountId.address).toEqual(USER_POLKADOT_ADDRESS);
     })
+
+    it('handles no node owner', async () => {
+        const authenticatedUser = buildAuthenticatedUser({
+            address: ALICE.address,
+            isWellKnownNode: true,
+        });
+        expect(authenticatedUser.isNodeOwner()).toBe(false);
+    })
 })
 
 function buildAuthenticatedUser(args: {
     address: string,
     isWellKnownNode?: boolean,
     addressType?: AccountType,
+    nodeOwner?: ValidAccountId,
 }): AuthenticatedUser {
-    const { address, isWellKnownNode, addressType } = args;
+    const { address, isWellKnownNode, addressType, nodeOwner } = args;
     return new AuthenticatedUser(
         newValidAccountId(address, addressType),
-        ALICE,
+        nodeOwner,
         mockAuthorityService(false, isWellKnownNode),
         {
             unauthorized: (message: string) => new Error(message),