diff options
Diffstat (limited to 'spec/fixtures/api/schemas/public_api/v4/user')
3 files changed, 254 insertions, 65 deletions
diff --git a/spec/fixtures/api/schemas/public_api/v4/user/admin.json b/spec/fixtures/api/schemas/public_api/v4/user/admin.json index f0d3cf3ba0e..7b46cbf5a36 100644 --- a/spec/fixtures/api/schemas/public_api/v4/user/admin.json +++ b/spec/fixtures/api/schemas/public_api/v4/user/admin.json @@ -32,6 +32,148 @@ "namespace_id" ], "properties": { - "$ref": "full.json" + "id": { + "type": "integer" + }, + "username": { + "type": "string" + }, + "email": { + "type": "string", + "pattern": "^[^@]+@[^@]+$" + }, + "commit_email": { + "type": "string", + "pattern": "^[^@]+@[^@]+$" + }, + "name": { + "type": "string" + }, + "state": { + "type": "string", + "enum": [ + "active", + "blocked" + ] + }, + "avatar_url": { + "type": [ + "string", + "null" + ], + "format": "uri" + }, + "web_url": { + "type": "string", + "format": "uri" + }, + "is_admin": { + "type": "boolean" + }, + "created_at": { + "type": "string", + "format": "date-time" + }, + "bio": { + "type": [ + "string", + "null" + ] + }, + "location": { + "type": [ + "string", + "null" + ] + }, + "pronouns": { + "type": [ + "string", + "null" + ] + }, + "skype": { + "type": "string" + }, + "linkedin": { + "type": "string" + }, + "twitter": { + "type": "string" + }, + "website_url": { + "type": "string" + }, + "organization": { + "type": [ + "string", + "null" + ] + }, + "last_sign_in_at": { + "type": [ + "string", + "null" + ], + "format": "date-time" + }, + "confirmed_at": { + "type": [ + "string", + "null" + ], + "format": "date-time" + }, + "color_scheme_id": { + "type": "integer" + }, + "projects_limit": { + "type": "integer" + }, + "current_sign_in_at": { + "type": [ + "string", + "null" + ], + "format": "date-time" + }, + "identities": { + "type": "array", + "items": { + "type": "object", + "properties": { + "provider": { + "type": "string", + "enum": [ + "github", + "bitbucket", + "google_oauth2", + "twitter" + ] + }, + "extern_uid": { + "type": [ + "number", + "string" + ] + } + } + } + }, + "can_create_group": { + "type": "boolean" + }, + "can_create_project": { + "type": "boolean" + }, + "two_factor_enabled": { + "type": "boolean" + }, + "external": { + "type": "boolean" + }, + "namespace_id": { + "type": "integer" + } } -} +}
\ No newline at end of file diff --git a/spec/fixtures/api/schemas/public_api/v4/user/login.json b/spec/fixtures/api/schemas/public_api/v4/user/login.json deleted file mode 100644 index aa066883c47..00000000000 --- a/spec/fixtures/api/schemas/public_api/v4/user/login.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "type": "object", - "required": [ - "id", - "username", - "email", - "name", - "state", - "avatar_url", - "web_url", - "created_at", - "is_admin", - "bio", - "location", - "skype", - "linkedin", - "twitter", - "website_url", - "organization", - "last_sign_in_at", - "confirmed_at", - "theme_id", - "color_scheme_id", - "projects_limit", - "current_sign_in_at", - "identities", - "can_create_group", - "can_create_project", - "two_factor_enabled", - "external" - ], - "properties": { - "$ref": "full.json" - } -} diff --git a/spec/fixtures/api/schemas/public_api/v4/user/public.json b/spec/fixtures/api/schemas/public_api/v4/user/public.json index c4549e3ef63..53d67e041a1 100644 --- a/spec/fixtures/api/schemas/public_api/v4/user/public.json +++ b/spec/fixtures/api/schemas/public_api/v4/user/public.json @@ -28,32 +28,95 @@ "external" ], "properties": { - "id": { "type": "integer" }, - "username": { "type": "string" }, + "id": { + "type": "integer" + }, + "username": { + "type": "string" + }, "email": { "type": "string", "pattern": "^[^@]+@[^@]+$" }, - "name": { "type": "string" }, + "name": { + "type": "string" + }, "state": { "type": "string", - "enum": ["active", "blocked"] - }, - "avatar_url": { "type": [ "string", "null" ] }, - "web_url": { "type": "string" }, - "created_at": { "type": "string", "format": "date-time" }, - "bio": { "type": ["string", "null"] }, - "location": { "type": ["string", "null"] }, - "skype": { "type": "string" }, - "linkedin": { "type": "string" }, - "twitter": { "type": "string "}, - "website_url": { "type": "string" }, - "organization": { "type": ["string", "null"] }, - "last_sign_in_at": { "type": ["string", "null"], "format": "date-time" }, - "confirmed_at": { "type": ["string", "null"] }, - "color_scheme_id": { "type": "integer" }, - "projects_limit": { "type": "integer" }, - "current_sign_in_at": { "type": ["string", "null"], "format": "date-time" }, + "enum": [ + "active", + "blocked" + ] + }, + "avatar_url": { + "type": [ + "string", + "null" + ] + }, + "web_url": { + "type": "string" + }, + "created_at": { + "type": "string", + "format": "date-time" + }, + "bio": { + "type": [ + "string", + "null" + ] + }, + "location": { + "type": [ + "string", + "null" + ] + }, + "skype": { + "type": "string" + }, + "linkedin": { + "type": "string" + }, + "twitter": { + "type": "string" + }, + "website_url": { + "type": "string" + }, + "organization": { + "type": [ + "string", + "null" + ] + }, + "last_sign_in_at": { + "type": [ + "string", + "null" + ], + "format": "date-time" + }, + "confirmed_at": { + "type": [ + "string", + "null" + ] + }, + "color_scheme_id": { + "type": "integer" + }, + "projects_limit": { + "type": "integer" + }, + "current_sign_in_at": { + "type": [ + "string", + "null" + ], + "format": "date-time" + }, "identities": { "type": "array", "items": { @@ -61,16 +124,35 @@ "properties": { "provider": { "type": "string", - "enum": ["github", "bitbucket", "google_oauth2"] + "enum": [ + "github", + "bitbucket", + "google_oauth2" + ] }, - "extern_uid": { "type": ["number", "string"] } + "extern_uid": { + "type": [ + "number", + "string" + ] + } } } }, - "can_create_group": { "type": "boolean" }, - "can_create_project": { "type": "boolean" }, - "two_factor_enabled": { "type": "boolean" }, - "external": { "type": "boolean" }, - "commit_email": { "type": "string" } + "can_create_group": { + "type": "boolean" + }, + "can_create_project": { + "type": "boolean" + }, + "two_factor_enabled": { + "type": "boolean" + }, + "external": { + "type": "boolean" + }, + "commit_email": { + "type": "string" + } } -} +}
\ No newline at end of file |