From 24f8b3b4185c35c7163af218795793904f0a2de5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20FAMIBELLE-PRONZOLA?= Date: Sat, 22 May 2021 23:28:30 +0200 Subject: [PATCH] Add user to awtis & teks --- api/awtis/documentation/1.0.0/awtis.json | 51 +++++++++ api/awtis/models/awtis.settings.json | 7 +- api/teks/documentation/1.0.0/teks.json | 51 +++++++++ api/teks/models/teks.settings.json | 7 +- .../1.0.0/full_documentation.json | 104 +++++++++++++++++- .../models/User.settings.json | 63 +++++++++++ 6 files changed, 280 insertions(+), 3 deletions(-) create mode 100644 extensions/users-permissions/models/User.settings.json diff --git a/api/awtis/documentation/1.0.0/awtis.json b/api/awtis/documentation/1.0.0/awtis.json index ae4d756..74b9db0 100644 --- a/api/awtis/documentation/1.0.0/awtis.json +++ b/api/awtis/documentation/1.0.0/awtis.json @@ -654,6 +654,9 @@ "okiMizikID": { "type": "integer" }, + "user": { + "type": "string" + }, "published_at": { "type": "string" }, @@ -666,6 +669,51 @@ } } }, + "user": { + "required": [ + "id", + "username", + "email" + ], + "properties": { + "id": { + "type": "string" + }, + "username": { + "type": "string" + }, + "email": { + "type": "string" + }, + "provider": { + "type": "string" + }, + "password": { + "type": "string" + }, + "resetPasswordToken": { + "type": "string" + }, + "confirmationToken": { + "type": "string" + }, + "confirmed": { + "type": "boolean" + }, + "blocked": { + "type": "boolean" + }, + "role": { + "type": "string" + }, + "created_by": { + "type": "string" + }, + "updated_by": { + "type": "string" + } + } + }, "published_at": { "type": "string", "format": "date-time" @@ -699,6 +747,9 @@ "type": "string" } }, + "user": { + "type": "string" + }, "published_at": { "type": "string", "format": "date-time" diff --git a/api/awtis/models/awtis.settings.json b/api/awtis/models/awtis.settings.json index 51b88b8..9ba5ba2 100644 --- a/api/awtis/models/awtis.settings.json +++ b/api/awtis/models/awtis.settings.json @@ -35,11 +35,16 @@ "images" ], "plugin": "upload", - "required": false + "required": false, + "pluginOptions": {} }, "teks": { "via": "awtis", "collection": "teks" + }, + "user": { + "plugin": "users-permissions", + "model": "user" } } } diff --git a/api/teks/documentation/1.0.0/teks.json b/api/teks/documentation/1.0.0/teks.json index 6e92391..3cbc536 100644 --- a/api/teks/documentation/1.0.0/teks.json +++ b/api/teks/documentation/1.0.0/teks.json @@ -620,6 +620,9 @@ "type": "string" } }, + "user": { + "type": "string" + }, "published_at": { "type": "string" }, @@ -736,6 +739,51 @@ "okiMizikID": { "type": "integer" }, + "user": { + "required": [ + "id", + "username", + "email" + ], + "properties": { + "id": { + "type": "string" + }, + "username": { + "type": "string" + }, + "email": { + "type": "string" + }, + "provider": { + "type": "string" + }, + "password": { + "type": "string" + }, + "resetPasswordToken": { + "type": "string" + }, + "confirmationToken": { + "type": "string" + }, + "confirmed": { + "type": "boolean" + }, + "blocked": { + "type": "boolean" + }, + "role": { + "type": "string" + }, + "created_by": { + "type": "string" + }, + "updated_by": { + "type": "string" + } + } + }, "published_at": { "type": "string", "format": "date-time" @@ -849,6 +897,9 @@ "okiMizikID": { "type": "integer" }, + "user": { + "type": "string" + }, "published_at": { "type": "string", "format": "date-time" diff --git a/api/teks/models/teks.settings.json b/api/teks/models/teks.settings.json index 504ccda..8f822bf 100644 --- a/api/teks/models/teks.settings.json +++ b/api/teks/models/teks.settings.json @@ -52,10 +52,15 @@ "images" ], "plugin": "upload", - "required": false + "required": false, + "pluginOptions": {} }, "okiMizikID": { "type": "integer" + }, + "user": { + "plugin": "users-permissions", + "model": "user" } } } diff --git a/extensions/documentation/documentation/1.0.0/full_documentation.json b/extensions/documentation/documentation/1.0.0/full_documentation.json index 4c4c6fc..63e8fee 100644 --- a/extensions/documentation/documentation/1.0.0/full_documentation.json +++ b/extensions/documentation/documentation/1.0.0/full_documentation.json @@ -11,7 +11,7 @@ "url": "https://o-k-i.net" }, "license": null, - "x-generation-date": "04/29/2021 8:08:20 PM" + "x-generation-date": "05/22/2021 11:23:50 PM" }, "x-strapi-config": { "path": "/dokiman", @@ -988,6 +988,9 @@ "okiMizikID": { "type": "integer" }, + "user": { + "type": "string" + }, "published_at": { "type": "string" }, @@ -1000,6 +1003,51 @@ } } }, + "user": { + "required": [ + "id", + "username", + "email" + ], + "properties": { + "id": { + "type": "string" + }, + "username": { + "type": "string" + }, + "email": { + "type": "string" + }, + "provider": { + "type": "string" + }, + "password": { + "type": "string" + }, + "resetPasswordToken": { + "type": "string" + }, + "confirmationToken": { + "type": "string" + }, + "confirmed": { + "type": "boolean" + }, + "blocked": { + "type": "boolean" + }, + "role": { + "type": "string" + }, + "created_by": { + "type": "string" + }, + "updated_by": { + "type": "string" + } + } + }, "published_at": { "type": "string", "format": "date-time" @@ -1033,6 +1081,9 @@ "type": "string" } }, + "user": { + "type": "string" + }, "published_at": { "type": "string", "format": "date-time" @@ -1151,6 +1202,9 @@ "type": "string" } }, + "user": { + "type": "string" + }, "published_at": { "type": "string" }, @@ -1267,6 +1321,51 @@ "okiMizikID": { "type": "integer" }, + "user": { + "required": [ + "id", + "username", + "email" + ], + "properties": { + "id": { + "type": "string" + }, + "username": { + "type": "string" + }, + "email": { + "type": "string" + }, + "provider": { + "type": "string" + }, + "password": { + "type": "string" + }, + "resetPasswordToken": { + "type": "string" + }, + "confirmationToken": { + "type": "string" + }, + "confirmed": { + "type": "boolean" + }, + "blocked": { + "type": "boolean" + }, + "role": { + "type": "string" + }, + "created_by": { + "type": "string" + }, + "updated_by": { + "type": "string" + } + } + }, "published_at": { "type": "string", "format": "date-time" @@ -1380,6 +1479,9 @@ "okiMizikID": { "type": "integer" }, + "user": { + "type": "string" + }, "published_at": { "type": "string", "format": "date-time" diff --git a/extensions/users-permissions/models/User.settings.json b/extensions/users-permissions/models/User.settings.json new file mode 100644 index 0000000..bc03646 --- /dev/null +++ b/extensions/users-permissions/models/User.settings.json @@ -0,0 +1,63 @@ +{ + "kind": "collectionType", + "collectionName": "users-permissions_user", + "info": { + "name": "user", + "description": "" + }, + "options": { + "draftAndPublish": false, + "timestamps": true + }, + "attributes": { + "username": { + "type": "string", + "minLength": 3, + "unique": true, + "configurable": false, + "required": true + }, + "email": { + "type": "email", + "minLength": 6, + "configurable": false, + "required": true + }, + "provider": { + "type": "string", + "configurable": false + }, + "password": { + "type": "password", + "minLength": 6, + "configurable": false, + "private": true + }, + "resetPasswordToken": { + "type": "string", + "configurable": false, + "private": true + }, + "confirmationToken": { + "type": "string", + "configurable": false, + "private": true + }, + "confirmed": { + "type": "boolean", + "default": false, + "configurable": false + }, + "blocked": { + "type": "boolean", + "default": false, + "configurable": false + }, + "role": { + "model": "role", + "via": "users", + "plugin": "users-permissions", + "configurable": false + } + } +}