Skip to content

Commit

Permalink
Merge branch 'main' into refactor/oauth2-connection
Browse files Browse the repository at this point in the history
  • Loading branch information
JohnNiang authored Sep 29, 2024
2 parents 7a7d7f1 + 1947a54 commit aaa9fc4
Show file tree
Hide file tree
Showing 46 changed files with 358 additions and 1,426 deletions.
222 changes: 13 additions & 209 deletions api-docs/openapi/v3_0/aggregated.json
Original file line number Diff line number Diff line change
Expand Up @@ -6512,123 +6512,6 @@
]
}
},
"/apis/api.halo.run/v1alpha1/users/-/send-password-reset-email": {
"post": {
"description": "Send password reset email when forgot password",
"operationId": "SendPasswordResetEmail",
"requestBody": {
"content": {
"*/*": {
"schema": {
"$ref": "#/components/schemas/PasswordResetEmailRequest"
}
}
},
"required": true
},
"responses": {
"204 NO_CONTENT": {
"content": {},
"description": "default response"
}
},
"tags": [
"UserV1alpha1Public"
]
}
},
"/apis/api.halo.run/v1alpha1/users/-/send-register-verify-email": {
"post": {
"description": "Send registration verification email, which can be called when mustVerifyEmailOnRegistration in user settings is true",
"operationId": "SendRegisterVerifyEmail",
"requestBody": {
"content": {
"*/*": {
"schema": {
"$ref": "#/components/schemas/RegisterVerifyEmailRequest"
}
}
},
"required": true
},
"responses": {
"204 NO_CONTENT": {
"content": {},
"description": "default response"
}
},
"tags": [
"UserV1alpha1Public"
]
}
},
"/apis/api.halo.run/v1alpha1/users/-/signup": {
"post": {
"description": "Sign up a new user",
"operationId": "SignUp",
"requestBody": {
"content": {
"*/*": {
"schema": {
"$ref": "#/components/schemas/SignUpRequest"
}
}
},
"required": true
},
"responses": {
"default": {
"content": {
"*/*": {
"schema": {
"$ref": "#/components/schemas/User"
}
}
},
"description": "default response"
}
},
"tags": [
"UserV1alpha1Public"
]
}
},
"/apis/api.halo.run/v1alpha1/users/{name}/reset-password": {
"put": {
"description": "Reset password by token",
"operationId": "ResetPasswordByToken",
"parameters": [
{
"description": "The name of the user",
"in": "path",
"name": "name",
"required": true,
"schema": {
"type": "string"
}
}
],
"requestBody": {
"content": {
"*/*": {
"schema": {
"$ref": "#/components/schemas/ResetPasswordRequest"
}
}
},
"required": true
},
"responses": {
"204 NO_CONTENT": {
"content": {},
"description": "default response"
}
},
"tags": [
"UserV1alpha1Public"
]
}
},
"/apis/api.notification.halo.run/v1alpha1/notifiers/{name}/receiver-config": {
"get": {
"description": "Fetch receiver config of notifier",
Expand Down Expand Up @@ -15655,27 +15538,6 @@
"PersonalAccessTokenV1alpha1Uc"
]
}
},
"/login/public-key": {
"get": {
"description": "Read public key for encrypting password.",
"operationId": "GetPublicKey",
"responses": {
"default": {
"content": {
"*/*": {
"schema": {
"$ref": "#/components/schemas/PublicKeyResponse"
}
}
},
"description": "default response"
}
},
"tags": [
"Login"
]
}
}
},
"components": {
Expand Down Expand Up @@ -16036,6 +15898,13 @@
],
"type": "object",
"properties": {
"authType": {
"type": "string",
"enum": [
"FORM",
"OAUTH2"
]
},
"authenticationUrl": {
"type": "string",
"description": "Authentication url of the auth provider"
Expand All @@ -16059,10 +15928,16 @@
"logo": {
"type": "string"
},
"method": {
"type": "string"
},
"priority": {
"type": "integer",
"format": "int32"
},
"rememberMeSupport": {
"type": "boolean"
},
"settingRef": {
"$ref": "#/components/schemas/SettingRef"
},
Expand Down Expand Up @@ -19844,21 +19719,6 @@
}
}
},
"PasswordResetEmailRequest": {
"required": [
"email",
"username"
],
"type": "object",
"properties": {
"email": {
"type": "string"
},
"username": {
"type": "string"
}
}
},
"PatSpec": {
"required": [
"name",
Expand Down Expand Up @@ -20792,14 +20652,6 @@
}
}
},
"PublicKeyResponse": {
"type": "object",
"properties": {
"base64Format": {
"type": "string"
}
}
},
"Reason": {
"required": [
"apiVersion",
Expand Down Expand Up @@ -21184,17 +21036,6 @@
},
"description": "Extension reference object. The name is mandatory"
},
"RegisterVerifyEmailRequest": {
"required": [
"email"
],
"type": "object",
"properties": {
"email": {
"type": "string"
}
}
},
"RememberMeToken": {
"required": [
"apiVersion",
Expand Down Expand Up @@ -21623,22 +21464,6 @@
}
}
},
"ResetPasswordRequest": {
"required": [
"newPassword",
"token"
],
"type": "object",
"properties": {
"newPassword": {
"minLength": 6,
"type": "string"
},
"token": {
"type": "string"
}
}
},
"RestoreRequest": {
"type": "object",
"properties": {
Expand Down Expand Up @@ -22391,27 +22216,6 @@
}
}
},
"SignUpRequest": {
"required": [
"password",
"user"
],
"type": "object",
"properties": {
"password": {
"minLength": 6,
"type": "string"
},
"user": {
"$ref": "#/components/schemas/User"
},
"verifyCode": {
"maxLength": 6,
"minLength": 6,
"type": "string"
}
}
},
"SinglePage": {
"required": [
"apiVersion",
Expand Down
13 changes: 13 additions & 0 deletions api-docs/openapi/v3_0/apis_console.api_v1alpha1.json
Original file line number Diff line number Diff line change
Expand Up @@ -3629,6 +3629,13 @@
],
"type": "object",
"properties": {
"authType": {
"type": "string",
"enum": [
"FORM",
"OAUTH2"
]
},
"authenticationUrl": {
"type": "string",
"description": "Authentication url of the auth provider"
Expand All @@ -3652,10 +3659,16 @@
"logo": {
"type": "string"
},
"method": {
"type": "string"
},
"priority": {
"type": "integer",
"format": "int32"
},
"rememberMeSupport": {
"type": "boolean"
},
"settingRef": {
"$ref": "#/components/schemas/SettingRef"
},
Expand Down
13 changes: 13 additions & 0 deletions api-docs/openapi/v3_0/apis_extension.api_v1alpha1.json
Original file line number Diff line number Diff line change
Expand Up @@ -8671,6 +8671,13 @@
],
"type": "object",
"properties": {
"authType": {
"type": "string",
"enum": [
"FORM",
"OAUTH2"
]
},
"authenticationUrl": {
"type": "string",
"description": "Authentication url of the auth provider"
Expand All @@ -8694,10 +8701,16 @@
"logo": {
"type": "string"
},
"method": {
"type": "string"
},
"priority": {
"type": "integer",
"format": "int32"
},
"rememberMeSupport": {
"type": "boolean"
},
"settingRef": {
"$ref": "#/components/schemas/SettingRef"
},
Expand Down
Loading

0 comments on commit aaa9fc4

Please sign in to comment.