diff --git a/packages/@azure/graph/.npmignore b/packages/@azure/graph/.npmignore deleted file mode 100644 index 3b46bc6202d8..000000000000 --- a/packages/@azure/graph/.npmignore +++ /dev/null @@ -1,35 +0,0 @@ -#git -.git -.gitignore -#gulp -gulpfile.js -#documentation -doc/ -docs/ -#dependencies -node_modules/ -#samples -sample/ -samples/ -#tests -test/ -tests/ -coverage/ -#tools and scripts -tools/ -scripts/ -#IDE settings -*.sln -.vscode/ -.idea -.editorconfig -.ntvs_analysis.* -#build tools -.travis.yml -.jenkins.yml -.codeclimate.yml -appveyor.yml -# Nuget packages # -.nuget/ -packages/ -packages.config diff --git a/packages/@azure/graph/README.md b/packages/@azure/graph/README.md index 3fceeaa2479d..960e011a3112 100644 --- a/packages/@azure/graph/README.md +++ b/packages/@azure/graph/README.md @@ -62,7 +62,7 @@ See https://github.com/Azure/ms-rest-browserauth to learn how to authenticate to console.log("The result is:"); console.log(result); }).catch((err) => { - console.log('An error occurred:'); + console.log("An error occurred:"); console.error(err); }); }); diff --git a/packages/@azure/graph/lib/graphRbacManagementClientContext.ts b/packages/@azure/graph/lib/graphRbacManagementClientContext.ts index 2e08d61f79c7..1426fb2421ed 100644 --- a/packages/@azure/graph/lib/graphRbacManagementClientContext.ts +++ b/packages/@azure/graph/lib/graphRbacManagementClientContext.ts @@ -16,17 +16,10 @@ const packageName = "@azure/graph"; const packageVersion = "1.0.0"; export class GraphRbacManagementClientContext extends msRestAzure.AzureServiceClient { - credentials: msRest.ServiceClientCredentials; - - apiVersion: string; - + apiVersion?: string; tenantID: string; - acceptLanguage: string; - - longRunningOperationRetryTimeout: number; - /** * Initializes a new instance of the GraphRbacManagementClient class. * @param credentials Credentials needed for the client to connect to Azure. diff --git a/packages/@azure/graph/lib/models/deletedApplicationsMappers.ts b/packages/@azure/graph/lib/models/deletedApplicationsMappers.ts index 9c1e66573d1a..8f257066e9f6 100644 --- a/packages/@azure/graph/lib/models/deletedApplicationsMappers.ts +++ b/packages/@azure/graph/lib/models/deletedApplicationsMappers.ts @@ -13,6 +13,8 @@ export { Application, DirectoryObject, AppRole, + RequiredResourceAccess, + ResourceAccess, GraphError, ApplicationListResult, ADGroup, diff --git a/packages/@azure/graph/lib/models/groupsMappers.ts b/packages/@azure/graph/lib/models/groupsMappers.ts index 41148eb95f9a..3d00ed56ed4c 100644 --- a/packages/@azure/graph/lib/models/groupsMappers.ts +++ b/packages/@azure/graph/lib/models/groupsMappers.ts @@ -24,6 +24,8 @@ export { AddOwnerParameters, Application, AppRole, + RequiredResourceAccess, + ResourceAccess, ServicePrincipal, User, SignInName diff --git a/packages/@azure/graph/lib/models/index.ts b/packages/@azure/graph/lib/models/index.ts index 4dac26b305a9..0a272387705a 100644 --- a/packages/@azure/graph/lib/models/index.ts +++ b/packages/@azure/graph/lib/models/index.ts @@ -436,6 +436,14 @@ export interface Application { * grant flow for OAuth2 */ oauth2AllowImplicitFlow?: boolean; + /** + * @member {RequiredResourceAccess[]} [requiredResourceAccess] Specifies + * resources that this application requires access to and the set of OAuth + * permission scopes and application roles that it needs under each of those + * resources. This pre-configuration of required resource access drives the + * consent experience. + */ + requiredResourceAccess?: RequiredResourceAccess[]; } /** diff --git a/packages/@azure/graph/lib/models/mappers.ts b/packages/@azure/graph/lib/models/mappers.ts index 1e045553ec1f..d3c85f8f8f40 100644 --- a/packages/@azure/graph/lib/models/mappers.ts +++ b/packages/@azure/graph/lib/models/mappers.ts @@ -625,6 +625,23 @@ export const Application: msRest.CompositeMapper = { type: { name: "Boolean" } + }, + requiredResourceAccess: { + serializedName: "requiredResourceAccess", + type: { + name: "Sequence", + element: { + type: { + name: "Composite", + className: "RequiredResourceAccess", + additionalProperties: { + type: { + name: "Object" + } + } + } + } + } } }, additionalProperties: DirectoryObject.type.additionalProperties diff --git a/packages/@azure/graph/lib/models/objectsMappers.ts b/packages/@azure/graph/lib/models/objectsMappers.ts index 31053b267d56..48ec347b8ac6 100644 --- a/packages/@azure/graph/lib/models/objectsMappers.ts +++ b/packages/@azure/graph/lib/models/objectsMappers.ts @@ -16,6 +16,8 @@ export { CloudError, Application, AppRole, + RequiredResourceAccess, + ResourceAccess, ADGroup, ServicePrincipal, User, diff --git a/packages/@azure/graph/lib/models/servicePrincipalsMappers.ts b/packages/@azure/graph/lib/models/servicePrincipalsMappers.ts index 25e5110eed1b..8d81554f24cd 100644 --- a/packages/@azure/graph/lib/models/servicePrincipalsMappers.ts +++ b/packages/@azure/graph/lib/models/servicePrincipalsMappers.ts @@ -25,6 +25,8 @@ export { PasswordCredentialListResult, PasswordCredentialsUpdateParameters, Application, + RequiredResourceAccess, + ResourceAccess, ADGroup, User, SignInName diff --git a/packages/@azure/graph/lib/models/signedInUserMappers.ts b/packages/@azure/graph/lib/models/signedInUserMappers.ts index 46091acfb367..8b06f0505013 100644 --- a/packages/@azure/graph/lib/models/signedInUserMappers.ts +++ b/packages/@azure/graph/lib/models/signedInUserMappers.ts @@ -17,6 +17,8 @@ export { DirectoryObjectListResult, Application, AppRole, + RequiredResourceAccess, + ResourceAccess, ADGroup, ServicePrincipal } from "../models/mappers"; diff --git a/packages/@azure/graph/lib/models/usersMappers.ts b/packages/@azure/graph/lib/models/usersMappers.ts index e5dc4c474429..b5a83a95b4c9 100644 --- a/packages/@azure/graph/lib/models/usersMappers.ts +++ b/packages/@azure/graph/lib/models/usersMappers.ts @@ -23,6 +23,8 @@ export { UserGetMemberGroupsResult, Application, AppRole, + RequiredResourceAccess, + ResourceAccess, ADGroup, ServicePrincipal } from "../models/mappers"; diff --git a/packages/@azure/graph/package.json b/packages/@azure/graph/package.json index 87a6895793ff..301cc12f396a 100644 --- a/packages/@azure/graph/package.json +++ b/packages/@azure/graph/package.json @@ -33,10 +33,23 @@ "bugs": { "url": "https://github.com/azure/azure-sdk-for-js/issues" }, + "files": [ + "dist/**/*.js", + "dist/**/*.js.map", + "dist/**/*.d.ts", + "dist/**/*.d.ts.map", + "esm/**/*.js", + "esm/**/*.js.map", + "esm/**/*.d.ts", + "esm/**/*.d.ts.map", + "lib/**/*.ts", + "rollup.config.js", + "tsconfig.json" + ], "scripts": { "build": "tsc && rollup -c rollup.config.js && npm run minify", "minify": "uglifyjs -c -m --comments --source-map \"content='./dist/graph.js.map'\" -o ./dist/graph.min.js ./dist/graph.js", - "prepare": "npm run build" + "prepack": "npm install && npm run build" }, "sideEffects": false }