Merge branch 'main' into remove_experiment_cache

openfga · Dec 1, 2023 · 5a23f6f · 5a23f6f
2 parents ee027db + d3d28d4
commit 5a23f6f
Show file tree

Hide file tree

Showing 11 changed files with 473 additions and 368 deletions.
diff --git a/docs/content/modeling/advanced/entitlements.mdx b/docs/content/modeling/advanced/entitlements.mdx
@@ -325,7 +325,6 @@ Add it now. Like so:
 
 <AuthzModelSnippetViewer
   configuration={{
-    schema_version: '1.1',
     type: 'feature',
     relations: {
       associated_plan: {
@@ -433,24 +432,19 @@ If you have already completed some of the other tutorials you might have encount
 
 <AuthzModelSnippetViewer
   configuration={{
-    schema_version: '1.1',
-    type_definitions: [
-      {
-        type: 'object',
-        relations: {
-          viewer: {
-            tupleToUserset: {
-              tupleset: {
-                relation: 'parent',
-              },
-              computedUserset: {
-                relation: 'all_objects_viewer',
-              },
-            },
+    type: 'resource',
+    relations: {
+      viewer: {
+        tupleToUserset: {
+          tupleset: {
+            relation: 'parent',
+          },
+          computedUserset: {
+            relation: 'all_objects_viewer',
           },
         },
       },
-    ],
+    },
   }}
   skipVersion={true}
 />
@@ -469,7 +463,6 @@ If you want to give all subscribers on a plan access to a feature, you can do it
 
 <AuthzModelSnippetViewer
   configuration={{
-    schema_version: '1.1',
     type: 'feature',
     relations: {
       associated_plan: {
@@ -728,7 +721,6 @@ To disallow a direct relationship, you need to remove the direct relationship ty
 
 <AuthzModelSnippetViewer
   configuration={{
-    schema_version: '1.1',
     type: 'feature',
     relations: {
       associated_plan: {
@@ -770,7 +762,6 @@ becomes
 
 <AuthzModelSnippetViewer
   configuration={{
-    schema_version: '1.1',
     type: 'feature',
     relations: {
       associated_plan: {
@@ -812,7 +803,6 @@ Ensure that your authorization model matches the one below
 
 <AuthzModelSnippetViewer
   configuration={{
-    schema_version: '1.1',
     type_definitions: [
       {
         type: 'user',

diff --git a/docs/content/modeling/advanced/gdrive.mdx b/docs/content/modeling/advanced/gdrive.mdx
@@ -582,48 +582,43 @@ We express it like this:
 
 <AuthzModelSnippetViewer
   configuration={{
-    schema_version: '1.1',
-    type_definitions: [
-      {
-        type: 'document',
-        relations: {
-          viewer: {
-            union: {
-              child: [
-                {
-                  this: {},
-                },
-                {
-                  computedUserset: {
-                    relation: 'commenter',
-                  },
-                },
-                {
-                  tupleToUserset: {
-                    tupleset: {
-                      // read all relationship tuples related to document:2021-budget as parent
-                      // which returns [{ "object": "document:2021-budget", "relation": "parent", "user": "document:2021-planning"}]
-                      relation: 'parent',
-                    },
-                    computedUserset: {
-                      // and for each relationship tuple return all usersets that match the following, replacing $TUPLE_USERSET_OBJECT with document:2021-planning
-                      // this will return relationship tuples of shape { "object": "document:2021-planning", "viewer", "user": ??? }
-                      // including { "object": "document:2021-planning", "viewer", "user": "user:diane" }
-                      relation: 'viewer',
-                    },
-                  },
-                },
-              ],
+    type: 'document',
+    relations: {
+      viewer: {
+        union: {
+          child: [
+            {
+              this: {},
             },
-          },
-        },
-        metadata: {
-          relations: {
-            viewer: { directly_related_user_types: [{ type: 'user' }, { type: 'domain', relation: 'member' }] },
-          },
+            {
+              computedUserset: {
+                relation: 'commenter',
+              },
+            },
+            {
+              tupleToUserset: {
+                tupleset: {
+                  // read all relationship tuples related to document:2021-budget as parent
+                  // which returns [{ "object": "document:2021-budget", "relation": "parent", "user": "document:2021-planning"}]
+                  relation: 'parent',
+                },
+                computedUserset: {
+                  // and for each relationship tuple return all usersets that match the following, replacing $TUPLE_USERSET_OBJECT with document:2021-planning
+                  // this will return relationship tuples of shape { "object": "document:2021-planning", "viewer", "user": ??? }
+                  // including { "object": "document:2021-planning", "viewer", "user": "user:diane" }
+                  relation: 'viewer',
+                },
+              },
+            },
+          ],
         },
       },
-    ],
+    },
+    metadata: {
+      relations: {
+        viewer: { directly_related_user_types: [{ type: 'user' }, { type: 'domain', relation: 'member' }] },
+      },
+    },
   }}
   skipVersion={true}
 />

diff --git a/docs/content/modeling/getting-started.mdx b/docs/content/modeling/getting-started.mdx
@@ -795,9 +795,7 @@ When a document is created a relationship tuple will be stored in <ProductName f
 
 <AuthzModelSnippetViewer
   onlyShow={SyntaxFormat.Friendly2}
-  configuration={{
-    schema_version: '1.1',
-    type_definitions: [
+  configuration={
       {
         type: 'document',
         relations: {
@@ -808,8 +806,6 @@ When a document is created a relationship tuple will be stored in <ProductName f
             parent: { directly_related_user_types: [{ type: 'folder' }, { type: 'drive' }] },
           },
         },
-      },
-    ],
   }}
   skipVersion={true}
 />
@@ -839,10 +835,10 @@ We can achieve that with the following definition using <UpdateProductNameInLink
 <AuthzModelSnippetViewer
   onlyShow={SyntaxFormat.Friendly2}
   skipVersion={true}
-  configuration={{
-    schema_version: '1.1',
-    type_definitions: [
-      {
+  configuration={
+    {
+      type: 'document',
+      relations: {
         can_share: {
           union: {
             child: [
@@ -873,8 +869,7 @@ We can achieve that with the following definition using <UpdateProductNameInLink
             ],
           },
         },
-      },
-    ],
+      }
   }}
 />
 
@@ -900,8 +895,8 @@ Similar to the [can_share relation](#relation-can_share), we can achieve that wi
   onlyShow={SyntaxFormat.Friendly2}
   skipVersion={true}
   configuration={{
-    schema_version: '1.1',
-    type_definitions: [
+    type: 'document',
+    relations:
       {
         can_view: {
           union: {
@@ -952,7 +947,6 @@ Similar to the [can_share relation](#relation-can_share), we can achieve that wi
           },
         },
       },
-    ],
   }}
 />
 
@@ -968,8 +962,8 @@ Similar to the [can_share relation](#relation-can_share), we can achieve that wi
   onlyShow={SyntaxFormat.Friendly2}
   skipVersion={true}
   configuration={{
-    schema_version: '1.1',
-    type_definitions: [
+    type: 'document',
+    relations:
       {
         can_write: {
           union: {
@@ -1002,7 +996,6 @@ Similar to the [can_share relation](#relation-can_share), we can achieve that wi
           },
         },
       },
-    ],
   }}
 />
 
@@ -1018,8 +1011,8 @@ Similar to the [can_share relation](#relation-can_share), we can achieve that wi
   onlyShow={SyntaxFormat.Friendly2}
   skipVersion={true}
   configuration={{
-    schema_version: '1.1',
-    type_definitions: [
+    type: 'document',
+    relations:
       {
         can_change_owner: {
           computedUserset: {
@@ -1028,7 +1021,6 @@ Similar to the [can_share relation](#relation-can_share), we can achieve that wi
           },
         },
       },
-    ],
   }}
 />
 
@@ -1453,7 +1445,7 @@ Because anne is the owner of document:1:
 
 Because beth is a member of organization:fabrikam and members of organization:fabrikam are writer of document:1:
 
-- user **beth** does not have relation **can_share** with document:1
+- user **beth** has relation **can_share** with document:1
 - user **beth** has relation **can_write** with document:1
 - user **beth** has relation **can_view** with document:1
 - user **beth** does not have relation **can_change_owner** with document:1

diff --git a/docusaurus.config.js b/docusaurus.config.js
@@ -98,7 +98,7 @@ using OpenFga.Sdk.Model;`,
       python: {
         importStatement: `import os
 import json
-import openfga_sdk
+from openfga_sdk.client import ClientConfiguration
 from openfga_sdk.client import OpenFgaClient`,
         apiName: `OpenFgaClient`,
         setupNote: `# ApiTokenIssuer, ApiAudience, ClientId and ClientSecret are optional.\n`,