Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature: Define security in autorest #4018

Merged
merged 25 commits into from
Apr 21, 2021
Merged

Feature: Define security in autorest #4018

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
d10fce0
Update codemodel
timotheeguerin Mar 25, 2021
9f569a1
.
timotheeguerin Mar 25, 2021
0605a86
Process security
timotheeguerin Mar 25, 2021
8ddb3b9
remove
timotheeguerin Mar 25, 2021
f9ef00e
Add changes
timotheeguerin Mar 25, 2021
91d1e78
Add changes
timotheeguerin Mar 25, 2021
a10c751
Wip
timotheeguerin Mar 25, 2021
46d8223
fix
timotheeguerin Mar 26, 2021
b76c742
..
timotheeguerin Mar 26, 2021
4b20cca
Add first version of docs
timotheeguerin Mar 26, 2021
61ab16a
Default
timotheeguerin Mar 26, 2021
f408e8c
Default
timotheeguerin Mar 26, 2021
9589aeb
Default
timotheeguerin Mar 26, 2021
c58ea00
Default
timotheeguerin Mar 26, 2021
d3205d2
Fix swagger oauth2 scehema
timotheeguerin Mar 26, 2021
842382b
fix
timotheeguerin Mar 26, 2021
f235526
Improve error
timotheeguerin Mar 26, 2021
e8ac65d
Merge branch 'master' of https://github.com/Azure/autorest into featu…
timotheeguerin Apr 1, 2021
a1227e7
Security
timotheeguerin Apr 1, 2021
efe4f8f
fix
timotheeguerin Apr 1, 2021
0f763fb
Fix
timotheeguerin Apr 1, 2021
9c43995
Use actual types
timotheeguerin Apr 5, 2021
8592a89
Merge branch 'master' of https://github.com/Azure/autorest into featu…
timotheeguerin Apr 6, 2021
b5950b4
update
timotheeguerin Apr 6, 2021
e008739
Merge branch 'master' of https://github.com/Azure/autorest into featu…
timotheeguerin Apr 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
update
  • Loading branch information
@timotheeguerin
timotheeguerin committed Apr 6, 2021
commit b5950b43bb258f1a33e39d5506c8a449ddaf5e89
24 changes: 13 additions & 11 deletions packages/libs/codemodel/.resources/all-in-one/json/code-model.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2211,15 +2211,6 @@
"properties": {
"type": {
"type": "string"
},
"scopes": {
"type": "array",
"items": {
"type": "string"
}
},
"headerName": {
"type": "string"
}
},
"defaultProperties": [],
Expand All @@ -2230,7 +2221,14 @@
},
"AADTokenSecurityScheme": {
"type": "object",
"properties": {},
"properties": {
"scopes": {
"type": "array",
"items": {
"type": "string"
}
}
},
"defaultProperties": [],
"additionalProperties": false,
"required": [
Expand All @@ -2245,7 +2243,11 @@
},
"AzureKeySecurityScheme": {
"type": "object",
"properties": {},
"properties": {
"headerName": {
"type": "string"
}
},
"defaultProperties": [],
"additionalProperties": false,
"required": [
Expand Down
14 changes: 8 additions & 6 deletions packages/libs/codemodel/.resources/all-in-one/yaml/code-model.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@ definitions:
additionalProperties: false
allOf:
- $ref: '#/definitions/SecurityScheme'
properties:
scopes:
type: array
items:
type: string
required:
- scopes
- type
Expand Down Expand Up @@ -160,6 +165,9 @@ definitions:
additionalProperties: false
allOf:
- $ref: '#/definitions/SecurityScheme'
properties:
headerName:
type: string
required:
- headerName
- type
Expand Down Expand Up @@ -1886,12 +1894,6 @@ definitions:
properties:
type:
type: string
headerName:
type: string
scopes:
type: array
items:
type: string
required:
- type
SecurityType:
Expand Down
9 changes: 0 additions & 9 deletions packages/libs/codemodel/.resources/model/json/http.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,6 @@
"properties": {
"type": {
"type": "string"
},
"scopes": {
"type": "array",
"items": {
"type": "string"
}
},
"headerName": {
"type": "string"
}
},
"defaultProperties": [],
Expand Down
15 changes: 13 additions & 2 deletions packages/libs/codemodel/.resources/model/json/master.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -931,7 +931,14 @@
},
"AADTokenSecurityScheme": {
"type": "object",
"properties": {},
"properties": {
"scopes": {
"type": "array",
"items": {
"type": "string"
}
}
},
"defaultProperties": [],
"additionalProperties": false,
"required": [
Expand All @@ -946,7 +953,11 @@
},
"AzureKeySecurityScheme": {
"type": "object",
"properties": {},
"properties": {
"headerName": {
"type": "string"
}
},
"defaultProperties": [],
"additionalProperties": false,
"required": [
Expand Down
6 changes: 0 additions & 6 deletions packages/libs/codemodel/.resources/model/yaml/http.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,11 +447,5 @@ definitions:
properties:
type:
type: string
headerName:
type: string
scopes:
type: array
items:
type: string
required:
- type
8 changes: 8 additions & 0 deletions packages/libs/codemodel/.resources/model/yaml/master.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@ definitions:
additionalProperties: false
allOf:
- $ref: ./http.yaml#/definitions/SecurityScheme
properties:
scopes:
type: array
items:
type: string
required:
- scopes
- type
Expand Down Expand Up @@ -47,6 +52,9 @@ definitions:
additionalProperties: false
allOf:
- $ref: ./http.yaml#/definitions/SecurityScheme
properties:
headerName:
type: string
required:
- headerName
- type
Expand Down
2 changes: 0 additions & 2 deletions packages/libs/codemodel/src/model/common/security.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ export class Security extends Initializer implements Security {

export interface SecurityScheme {
type: string;
scopes?: string[];
headerName?: string;
}

export interface AADTokenSecurityScheme extends SecurityScheme {
Expand Down