Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Next Next commit
[AutoPR graphrbac/data-plane] add customKeyIdentifier to password cre…
…dential (#530)

* Generated from 2d1a131d6bc24477750e780c70ad4384e6e5927d

add customKeyIdentifier to password credential

* Generated from 1c42b12d70502f95d2f42f1d421ce53f425e7ef6

add creds in app object

* Generated from 74a0ba38241f5574f515beb159638e286b44bd6f

custom id(thumbprint) for cert creds should be string type
  • Loading branch information
AutorestCI authored Nov 27, 2018
commit 7a6a505e5d1b0ae7f371e1b98a03e544461ff442
42 changes: 21 additions & 21 deletions packages/@azure/graph/LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
The MIT License (MIT)

Copyright (c) 2018 Microsoft

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
The MIT License (MIT)
Copyright (c) 2018 Microsoft
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
173 changes: 77 additions & 96 deletions packages/@azure/graph/README.md
Original file line number Diff line number Diff line change
@@ -1,96 +1,77 @@
## Azure GraphRbacManagementClient SDK for JavaScript

This package contains an isomorphic SDK for GraphRbacManagementClient.

### Currently supported environments

- Node.js version 6.x.x or higher
- Browser JavaScript

### How to Install

```
npm install @azure/graph
```

### How to use

#### nodejs - Authentication, client creation and get signedInUser as an example written in TypeScript.

##### Install @azure/ms-rest-nodeauth

```
npm install @azure/ms-rest-nodeauth
```

##### Sample code

```ts
import * as msRest from "@azure/ms-rest-js";
import * as msRestAzure from "@azure/ms-rest-azure-js";
import * as msRestNodeAuth from "@azure/ms-rest-nodeauth";
import { GraphRbacManagementClient, GraphRbacManagementModels, GraphRbacManagementMappers } from "@azure/graph";
const subscriptionId = process.env["AZURE_SUBSCRIPTION_ID"];

msRestNodeAuth.interactiveLogin().then((creds) => {
const client = new GraphRbacManagementClient(creds, subscriptionId);
client.signedInUser.get().then((result) => {
console.log("The result is:");
console.log(result);
});
}).catch((err) => {
console.error(err);
});
```

#### browser - Authentication, client creation and get signedInUser as an example written in JavaScript.

##### Install @azure/ms-rest-browserauth

```
npm install @azure/ms-rest-browserauth
```

##### Sample code

See https://github.com/Azure/ms-rest-browserauth to learn how to authenticate to Azure in the browser.

- index.html
```html
<!DOCTYPE html>
<html lang="en">
<head>
<title>@azure/graph sample</title>
<script src="node_modules/@azure/ms-rest-js/dist/msRest.browser.js"></script>
<script src="node_modules/@azure/ms-rest-azure-js/dist/msRestAzure.js"></script>
<script src="node_modules/@azure/ms-rest-browserauth/dist/msAuth.js"></script>
<script src="node_modules/@azure/graph/dist/graph.js"></script>
<script type="text/javascript">
const subscriptionId = "<Subscription_Id>";
const authManager = new msAuth.AuthManager({
clientId: "<client id for your Azure AD app>",
tenant: "<optional tenant for your organization>"
});
authManager.finalizeLogin().then((res) => {
if (!res.isLoggedIn) {
// may cause redirects
authManager.login();
}
const client = new Azure.Graph.GraphRbacManagementClient(res.creds, subscriptionId);
client.signedInUser.get().then((result) => {
console.log("The result is:");
console.log(result);
}).catch((err) => {
console.log("An error occurred:");
console.error(err);
});
});
</script>
</head>
<body></body>
</html>
```

## Related projects

- [Microsoft Azure SDK for Javascript](https://github.com/Azure/azure-sdk-for-js)
# Azure GraphRbacManagementClient SDK for JavaScript
This package contains an isomorphic SDK for GraphRbacManagementClient.

## Currently supported environments
- Node.js version 6.x.x or higher
- Browser JavaScript

## How to Install
```
npm install @azure/graph
```


## How to use

### nodejs - Authentication, client creation and get signedInUser as an example written in TypeScript.

```ts
import * as msRest from "ms-rest-js";
import * as msRestAzure from "ms-rest-azure-js";
import * as msRestNodeAuth from "ms-rest-nodeauth";
import { GraphRbacManagementClient, GraphRbacManagementModels, GraphRbacManagementMappers } from "@azure/graph";
const subscriptionId = process.env["AZURE_SUBSCRIPTION_ID"];

msRestNodeAuth.interactiveLogin().then((creds) => {
const client = new GraphRbacManagementClient(creds, subscriptionId);
client.signedInUser.get().then((result) => {
console.log("The result is:");
console.log(result);
});
}).catch((err) => {
console.error(err);
});
```

### browser - Authentication, client creation and get signedInUser as an example written in JavaScript.
See https://github.com/Azure/ms-rest-browserauth to learn how to authenticate to Azure in the browser.

- index.html
```html
<!DOCTYPE html>
<html lang="en">
<head>
<title>@azure/graph sample</title>
<script src="node_modules/ms-rest-js/dist/msRest.browser.js"></script>
<script src="node_modules/ms-rest-azure-js/dist/msRestAzure.js"></script>
<script src="node_modules/ms-rest-browserauth/dist/msAuth.js"></script>
<script src="node_modules/@azure/graph/dist/graph.js"></script>
<script>
const subscriptionId = "<Subscription_Id>";
const authManager = new msAuth.AuthManager({
clientId: "<client id for your Azure AD app>",
tenant: "<optional tenant for your organization>"
});
authManager.finalizeLogin().then((res) => {
if (!res.isLoggedIn) {
// may cause redirects
authManager.login();
}
const client = new Azure.Graph.GraphRbacManagementClient(res.creds, subscriptionId);
client.signedInUser.get().then((result) => {
console.log("The result is:");
console.log(result);
}).catch((err) => {
console.log("An error occurred:");
console.error(err);
});
});
</script>
</head>
<body>
</body>
</html>
```

# Related projects
- [Microsoft Azure SDK for Javascript](https://github.com/Azure/azure-sdk-for-js)
2 changes: 1 addition & 1 deletion packages/@azure/graph/lib/graphRbacManagementClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* regenerated.
*/

import * as msRest from "@azure/ms-rest-js";
import * as msRest from "ms-rest-js";
import * as Models from "./models";
import * as Mappers from "./models/mappers";
import * as operations from "./operations";
Expand Down
4 changes: 2 additions & 2 deletions packages/@azure/graph/lib/graphRbacManagementClientContext.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
*/

import * as Models from "./models";
import * as msRest from "@azure/ms-rest-js";
import * as msRestAzure from "@azure/ms-rest-azure-js";
import * as msRest from "ms-rest-js";
import * as msRestAzure from "ms-rest-azure-js";

const packageName = "@azure/graph";
const packageVersion = "0.1.0";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ export {
AppRole,
RequiredResourceAccess,
ResourceAccess,
KeyCredential,
PasswordCredential,
GraphError,
ApplicationListResult,
ADGroup,
Expand Down
2 changes: 2 additions & 0 deletions packages/@azure/graph/lib/models/groupsMappers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ export {
AppRole,
RequiredResourceAccess,
ResourceAccess,
KeyCredential,
PasswordCredential,
ServicePrincipal,
User,
SignInName
Expand Down
22 changes: 18 additions & 4 deletions packages/@azure/graph/lib/models/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
* regenerated.
*/

import { BaseResource, CloudError, AzureServiceClientOptions } from "@azure/ms-rest-azure-js";
import * as msRest from "@azure/ms-rest-js";
import { BaseResource, CloudError, AzureServiceClientOptions } from "ms-rest-azure-js";
import * as msRest from "ms-rest-js";

export { BaseResource, CloudError };

Expand Down Expand Up @@ -100,9 +100,9 @@ export interface KeyCredential {
*/
type?: string;
/**
* @member {Uint8Array} [customKeyIdentifier] Custom Key Identifier
* @member {string} [customKeyIdentifier] Custom Key Identifier
*/
customKeyIdentifier?: Uint8Array;
customKeyIdentifier?: string;
/**
* @property Describes unknown properties. The value of an unknown property
* can be of "any" type.
Expand Down Expand Up @@ -133,6 +133,10 @@ export interface PasswordCredential {
* @member {string} [value] Key value.
*/
value?: string;
/**
* @member {Uint8Array} [customKeyIdentifier] Custom Key Identifier
*/
customKeyIdentifier?: Uint8Array;
/**
* @property Describes unknown properties. The value of an unknown property
* can be of "any" type.
Expand Down Expand Up @@ -444,6 +448,16 @@ export interface Application {
* consent experience.
*/
requiredResourceAccess?: RequiredResourceAccess[];
/**
* @member {KeyCredential[]} [keyCredentials] A collection of KeyCredential
* objects.
*/
keyCredentials?: KeyCredential[];
/**
* @member {PasswordCredential[]} [passwordCredentials] A collection of
* PasswordCredential objects
*/
passwordCredentials?: PasswordCredential[];
}

/**
Expand Down
Loading