From 5483446dffe85478c089fdcb27a37da36b1ecf06 Mon Sep 17 00:00:00 2001
From: getlarge <ed@getlarge.eu>
Date: Thu, 4 Apr 2024 13:58:45 +0200
Subject: [PATCH] fix(keto-cli): make option casing uniform

---
 .../src/app/check-permission.command.ts       |  3 +--
 .../app/expand-permissions.command.spec.ts    | 27 ++++++++++++++++++-
 .../src/app/expand-permissions.command.ts     |  2 +-
 .../keto-cli/src/app/get-relations.command.ts |  6 ++---
 4 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/packages/keto-cli/src/app/check-permission.command.ts b/packages/keto-cli/src/app/check-permission.command.ts
index 7afe494..d7efe44 100644
--- a/packages/keto-cli/src/app/check-permission.command.ts
+++ b/packages/keto-cli/src/app/check-permission.command.ts
@@ -10,8 +10,7 @@ import {
 } from '@ory/client';
 import { Command, CommandRunner, Option } from 'nest-commander';
 
-interface CommandOptions
-  extends Pick<Configuration, 'basePath' | 'accessToken'> {
+interface CommandOptions extends Pick<Configuration, 'basePath'> {
   tuple: PermissionApiCheckPermissionRequest;
 }
 
diff --git a/packages/keto-cli/src/app/expand-permissions.command.spec.ts b/packages/keto-cli/src/app/expand-permissions.command.spec.ts
index 5f25691..0abeb38 100644
--- a/packages/keto-cli/src/app/expand-permissions.command.spec.ts
+++ b/packages/keto-cli/src/app/expand-permissions.command.spec.ts
@@ -39,7 +39,7 @@ describe('ExpandPermissionsCommand', () => {
   });
 
   describe('run', () => {
-    it('should process tuple and check permission', async () => {
+    it('should process tuple and expand permission', async () => {
       const tuple = {
         namespace: 'Group',
         object: 'admin',
@@ -49,6 +49,31 @@ describe('ExpandPermissionsCommand', () => {
       oryPermissionsService.expandPermissions = jest.fn().mockResolvedValue({
         data: {
           type: 'union',
+          children: [
+            {
+              type: 'leaf',
+              tuple: {
+                namespace: '',
+                object: '',
+                relation: '',
+                subject_set: {
+                  namespace: 'User',
+                  object: '1',
+                  relation: '',
+                },
+              },
+            },
+          ],
+          tuple: {
+            namespace: '',
+            object: '',
+            relation: '',
+            subject_set: {
+              namespace: 'Group',
+              object: 'admin',
+              relation: 'members',
+            },
+          },
         },
       });
 
diff --git a/packages/keto-cli/src/app/expand-permissions.command.ts b/packages/keto-cli/src/app/expand-permissions.command.ts
index 717a82c..46cb2da 100644
--- a/packages/keto-cli/src/app/expand-permissions.command.ts
+++ b/packages/keto-cli/src/app/expand-permissions.command.ts
@@ -32,7 +32,7 @@ export class ExpandPermissionsCommand extends CommandRunner {
         ...options,
       });
     }
-    const tree = await this.oryPermissionsService.expandPermissions({
+    const { data: tree } = await this.oryPermissionsService.expandPermissions({
       ...tuple,
       maxDepth: depth,
     });
diff --git a/packages/keto-cli/src/app/get-relations.command.ts b/packages/keto-cli/src/app/get-relations.command.ts
index a9af3dd..874b93b 100644
--- a/packages/keto-cli/src/app/get-relations.command.ts
+++ b/packages/keto-cli/src/app/get-relations.command.ts
@@ -117,7 +117,7 @@ export class GetRelationsCommand extends CommandRunner {
   }
 
   @Option({
-    flags: '-sn, --subject-namespace [string]',
+    flags: '-sn, --subjectNamespace [string]',
     description:
       'namespace of the subject of the relationship tuple to get relations from',
     required: false,
@@ -127,7 +127,7 @@ export class GetRelationsCommand extends CommandRunner {
   }
 
   @Option({
-    flags: '-so, --subject-object [string]',
+    flags: '-so, --subjectObject [string]',
     description:
       'object of the subject of the relationship tuple to get relations from',
     required: false,
@@ -137,7 +137,7 @@ export class GetRelationsCommand extends CommandRunner {
   }
 
   @Option({
-    flags: '-sr, --subject-relation [string]',
+    flags: '-sr, --subjectRelation [string]',
     description:
       'relation of the subject of the relationship tuple to get relations from',
     required: false,