Skip to content

Commit 516b1f4

Browse files
authored
resources supportidentity (Azure#15689)
1 parent cf3c7af commit 516b1f4

File tree

4 files changed

+82
-67
lines changed

4 files changed

+82
-67
lines changed
Lines changed: 59 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,98 +1,100 @@
11
## Azure ResourceManagementClient SDK for JavaScript
22

3-
This package contains an isomorphic SDK for ResourceManagementClient.
3+
This package contains an isomorphic SDK (runs both in Node.js and in browsers) for ResourceManagementClient.
44

55
### Currently supported environments
66

7-
- Node.js version 6.x.x or higher
8-
- Browser JavaScript
7+
- [LTS versions of Node.js](https://nodejs.org/about/releases/)
8+
- Latest versions of Safari, Chrome, Edge, and Firefox.
99

10-
### How to Install
10+
### Prerequisites
1111

12+
You must have an [Azure subscription](https://azure.microsoft.com/free/).
13+
14+
### How to install
15+
16+
To use this SDK in your project, you will need to install two packages.
17+
- `@azure/arm-resources` that contains the client.
18+
- `@azure/identity` that provides different mechanisms for the client to authenticate your requests using Azure Active Directory.
19+
20+
Install both packages using the below command:
1221
```bash
13-
npm install @azure/arm-resources
22+
npm install --save @azure/arm-resources @azure/identity
1423
```
1524

16-
### How to use
25+
> **Note**: You may have used either `@azure/ms-rest-nodeauth` or `@azure/ms-rest-browserauth` in the past. These packages are in maintenance mode receiving critical bug fixes, but no new features.
26+
If you are on a [Node.js that has LTS status](https://nodejs.org/about/releases/), or are writing a client side browser application, we strongly encourage you to upgrade to `@azure/identity` which uses the latest versions of Azure Active Directory and MSAL APIs and provides more authentication options.
1727

18-
#### nodejs - client creation and list operations as an example written in TypeScript.
28+
### How to use
1929

20-
##### Install @azure/ms-rest-nodeauth
30+
- If you are writing a client side browser application,
31+
- Follow the instructions in the section on Authenticating client side browser applications in [Azure Identity examples](https://aka.ms/azsdk/js/identity/examples) to register your application in the Microsoft identity platform and set the right permissions.
32+
- Copy the client ID and tenant ID from the Overview section of your app registration in Azure portal and use it in the browser sample below.
33+
- If you are writing a server side application,
34+
- [Select a credential from `@azure/identity` based on the authentication method of your choice](https://aka.ms/azsdk/js/identity/examples)
35+
- Complete the set up steps required by the credential if any.
36+
- Use the credential you picked in the place of `DefaultAzureCredential` in the Node.js sample below.
2137

22-
- Please install minimum version of `"@azure/ms-rest-nodeauth": "^3.0.0"`.
38+
In the below samples, we pass the credential and the Azure subscription id to instantiate the client.
39+
Once the client is created, explore the operations on it either in your favorite editor or in our [API reference documentation](https://docs.microsoft.com/javascript/api) to get started.
2340

24-
```bash
25-
npm install @azure/ms-rest-nodeauth@"^3.0.0"
26-
```
41+
#### nodejs - Authentication, client creation, and list operations as an example written in JavaScript.
2742

2843
##### Sample code
2944

30-
While the below sample uses the interactive login, other authentication options can be found in the [README.md file of @azure/ms-rest-nodeauth](https://www.npmjs.com/package/@azure/ms-rest-nodeauth) package
31-
32-
```typescript
33-
const msRestNodeAuth = require("@azure/ms-rest-nodeauth");
45+
```javascript
46+
const { DefaultAzureCredential } = require("@azure/identity");
3447
const { ResourceManagementClient } = require("@azure/arm-resources");
3548
const subscriptionId = process.env["AZURE_SUBSCRIPTION_ID"];
3649

37-
msRestNodeAuth
38-
.interactiveLogin()
39-
.then((creds) => {
40-
const client = new ResourceManagementClient(creds, subscriptionId);
41-
client.operations.list().then((result) => {
42-
console.log("The result is:");
43-
console.log(result);
44-
});
45-
})
46-
.catch((err) => {
47-
console.error(err);
48-
});
50+
// Use `DefaultAzureCredential` or any other credential of your choice based on https://aka.ms/azsdk/js/identity/examples
51+
// Please note that you can also use credentials from the `@azure/ms-rest-nodeauth` package instead.
52+
const creds = new DefaultAzureCredential();
53+
const client = new ResourceManagementClient(creds, subscriptionId);
54+
55+
client.operations.list().then((result) => {
56+
console.log("The result is:");
57+
console.log(result);
58+
}).catch((err) => {
59+
console.log("An error occurred:");
60+
console.error(err);
61+
});
4962
```
5063

51-
#### browser - Authentication, client creation and list operations as an example written in JavaScript.
52-
53-
##### Install @azure/ms-rest-browserauth
64+
#### browser - Authentication, client creation, and list operations as an example written in JavaScript.
5465

55-
```bash
56-
npm install @azure/ms-rest-browserauth
57-
```
66+
In browser applications, we recommend using the `InteractiveBrowserCredential` that interactively authenticates using the default system browser.
67+
- See [Single-page application: App registration guide](https://docs.microsoft.com/azure/active-directory/develop/scenario-spa-app-registration) to configure your app registration for the browser.
68+
- Note down the client Id from the previous step and use it in the browser sample below.
5869

5970
##### Sample code
6071

61-
See https://github.com/Azure/ms-rest-browserauth to learn how to authenticate to Azure in the browser.
62-
6372
- index.html
6473

6574
```html
6675
<!DOCTYPE html>
6776
<html lang="en">
6877
<head>
6978
<title>@azure/arm-resources sample</title>
70-
<script src="node_modules/@azure/ms-rest-js/dist/msRest.browser.js"></script>
7179
<script src="node_modules/@azure/ms-rest-azure-js/dist/msRestAzure.js"></script>
72-
<script src="node_modules/@azure/ms-rest-browserauth/dist/msAuth.js"></script>
80+
<script src="node_modules/@azure/identity/dist/index.js"></script>
7381
<script src="node_modules/@azure/arm-resources/dist/arm-resources.js"></script>
7482
<script type="text/javascript">
7583
const subscriptionId = "<Subscription_Id>";
76-
const authManager = new msAuth.AuthManager({
84+
// Create credentials using the `@azure/identity` package.
85+
// Please note that you can also use credentials from the `@azure/ms-rest-browserauth` package instead.
86+
const credential = new InteractiveBrowserCredential(
87+
{
7788
clientId: "<client id for your Azure AD app>",
78-
tenant: "<optional tenant for your organization>"
89+
tenantId: "<optional tenant for your organization>"
7990
});
80-
authManager.finalizeLogin().then((res) => {
81-
if (!res.isLoggedIn) {
82-
// may cause redirects
83-
authManager.login();
84-
}
85-
const client = new Azure.ArmResources.ResourceManagementClient(res.creds, subscriptionId);
86-
client.operations
87-
.list()
88-
.then((result) => {
89-
console.log("The result is:");
90-
console.log(result);
91-
})
92-
.catch((err) => {
93-
console.log("An error occurred:");
94-
console.error(err);
95-
});
91+
const client = new Azure.ArmResources.ResourceManagementClient(creds, subscriptionId);
92+
client.operations.list().then((result) => {
93+
console.log("The result is:");
94+
console.log(result);
95+
}).catch((err) => {
96+
console.log("An error occurred:");
97+
console.error(err);
9698
});
9799
</script>
98100
</head>
@@ -104,4 +106,4 @@ See https://github.com/Azure/ms-rest-browserauth to learn how to authenticate to
104106

105107
- [Microsoft Azure SDK for Javascript](https://github.com/Azure/azure-sdk-for-js)
106108

107-
![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-js/sdk/resources/arm-resources/README.png)
109+
![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-js/.\sdk\resources\arm-resources\/README.png)

sdk/resources/arm-resources/package.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22
"name": "@azure/arm-resources",
33
"author": "Microsoft Corporation",
44
"description": "ResourceManagementClient Library with typescript type definitions for node.js and browser.",
5-
"version": "4.1.0",
5+
"version": "4.2.0",
66
"dependencies": {
7-
"@azure/ms-rest-azure-js": "^2.0.1",
8-
"@azure/ms-rest-js": "^2.0.4",
7+
"@azure/ms-rest-azure-js": "^2.1.0",
8+
"@azure/ms-rest-js": "^2.2.0",
9+
"@azure/core-auth": "^1.1.4",
910
"tslib": "^1.10.0"
1011
},
1112
"keywords": [
@@ -20,7 +21,7 @@
2021
"module": "./esm/resourceManagementClient.js",
2122
"types": "./esm/resourceManagementClient.d.ts",
2223
"devDependencies": {
23-
"typescript": "^3.5.3",
24+
"typescript": "^3.6.0",
2425
"rollup": "^1.18.0",
2526
"rollup-plugin-node-resolve": "^5.2.0",
2627
"rollup-plugin-sourcemaps": "^0.4.2",

sdk/resources/arm-resources/src/resourceManagementClient.ts

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
*/
99

1010
import * as msRest from "@azure/ms-rest-js";
11+
import { TokenCredential } from "@azure/core-auth";
1112
import * as Models from "./models";
1213
import * as Mappers from "./models/mappers";
1314
import * as operations from "./operations";
@@ -26,12 +27,17 @@ class ResourceManagementClient extends ResourceManagementClientContext {
2627

2728
/**
2829
* Initializes a new instance of the ResourceManagementClient class.
29-
* @param credentials Credentials needed for the client to connect to Azure.
30+
* @param credentials Credentials needed for the client to connect to Azure. Credentials
31+
* implementing the TokenCredential interface from the @azure/identity package are recommended. For
32+
* more information about these credentials, see
33+
* {@link https://www.npmjs.com/package/@azure/identity}. Credentials implementing the
34+
* ServiceClientCredentials interface from the older packages @azure/ms-rest-nodeauth and
35+
* @azure/ms-rest-browserauth are also supported.
3036
* @param subscriptionId The ID of the target subscription.
3137
* @param [options] The parameter options
3238
*/
3339
constructor(
34-
credentials: msRest.ServiceClientCredentials,
40+
credentials: msRest.ServiceClientCredentials | TokenCredential,
3541
subscriptionId: string,
3642
options?: Models.ResourceManagementClientOptions
3743
) {

sdk/resources/arm-resources/src/resourceManagementClientContext.ts

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,30 @@
99

1010
import * as Models from "./models";
1111
import * as msRest from "@azure/ms-rest-js";
12+
import { TokenCredential } from "@azure/core-auth";
1213
import * as msRestAzure from "@azure/ms-rest-azure-js";
1314

1415
const packageName = "@azure/arm-resources";
15-
const packageVersion = "4.1.0";
16+
const packageVersion = "4.2.0";
1617

1718
export class ResourceManagementClientContext extends msRestAzure.AzureServiceClient {
18-
credentials: msRest.ServiceClientCredentials;
19+
credentials: msRest.ServiceClientCredentials | TokenCredential;
1920
subscriptionId: string;
2021
apiVersion?: string;
2122

2223
/**
2324
* Initializes a new instance of the ResourceManagementClient class.
24-
* @param credentials Credentials needed for the client to connect to Azure.
25+
* @param credentials Credentials needed for the client to connect to Azure. Credentials
26+
* implementing the TokenCredential interface from the @azure/identity package are recommended. For
27+
* more information about these credentials, see
28+
* {@link https://www.npmjs.com/package/@azure/identity}. Credentials implementing the
29+
* ServiceClientCredentials interface from the older packages @azure/ms-rest-nodeauth and
30+
* @azure/ms-rest-browserauth are also supported.
2531
* @param subscriptionId The ID of the target subscription.
2632
* @param [options] The parameter options
2733
*/
2834
constructor(
29-
credentials: msRest.ServiceClientCredentials,
35+
credentials: msRest.ServiceClientCredentials | TokenCredential,
3036
subscriptionId: string,
3137
options?: Models.ResourceManagementClientOptions
3238
) {

0 commit comments

Comments
 (0)