Compare commits
3 Commits
97f7011f97
...
d69402a33d
| Author | SHA1 | Date | |
|---|---|---|---|
| d69402a33d | |||
| 2fa8fcfc3c | |||
| 059fc3c1da |
4
package-lock.json
generated
4
package-lock.json
generated
@@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "@slawek/sk-az-tools",
|
"name": "@slawek/sk-az-tools",
|
||||||
"version": "0.7.2",
|
"version": "0.7.3",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "@slawek/sk-az-tools",
|
"name": "@slawek/sk-az-tools",
|
||||||
"version": "0.7.2",
|
"version": "0.7.3",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@azure/identity": "^4.13.0",
|
"@azure/identity": "^4.13.0",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@slawek/sk-az-tools",
|
"name": "@slawek/sk-az-tools",
|
||||||
"version": "0.7.2",
|
"version": "0.7.3",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"files": [
|
"files": [
|
||||||
"dist",
|
"dist",
|
||||||
|
|||||||
@@ -32,14 +32,15 @@ export function getMsalAuthProvider(
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
export function getAzureIdentityAuthProvider(
|
export function getAzureIdentityAuthProvider(tenantId?: string, clientId?: string) : GraphAuthProvider {
|
||||||
tenantId: string,
|
const credentialOptions =
|
||||||
clientId: string,
|
tenantId && clientId
|
||||||
) {
|
? { tenantId, managedIdentityClientId: clientId }
|
||||||
const credential = new DefaultAzureCredential({
|
: undefined;
|
||||||
tenantId,
|
|
||||||
managedIdentityClientId: clientId,
|
const credential = credentialOptions
|
||||||
});
|
? new DefaultAzureCredential(credentialOptions)
|
||||||
|
: new DefaultAzureCredential();
|
||||||
|
|
||||||
const getBearerToken = getBearerTokenProvider(
|
const getBearerToken = getBearerTokenProvider(
|
||||||
credential,
|
credential,
|
||||||
|
|||||||
@@ -5,18 +5,21 @@ export * from "./app.ts";
|
|||||||
export * from "./sp.ts";
|
export * from "./sp.ts";
|
||||||
|
|
||||||
import { loadAuthConfig, loadConfig } from "../index.ts";
|
import { loadAuthConfig, loadConfig } from "../index.ts";
|
||||||
import { Client } from "@microsoft/microsoft-graph-client";
|
import { Client, AuthProvider } from "@microsoft/microsoft-graph-client";
|
||||||
|
|
||||||
import { getMsalAuthProvider, getAzureIdentityAuthProvider } from "./auth.ts";
|
import { getMsalAuthProvider, getAzureIdentityAuthProvider } from "./auth.ts";
|
||||||
|
|
||||||
export async function getGraphClient(): Promise<Client> {
|
export async function getGraphClient(): Promise<Client> {
|
||||||
const config = await loadConfig();
|
const config = await loadConfig();
|
||||||
|
|
||||||
|
let authProvider: AuthProvider;
|
||||||
|
|
||||||
|
if (config.authMode === "azure-identity") {
|
||||||
|
authProvider = getAzureIdentityAuthProvider();
|
||||||
|
} else {
|
||||||
const authConfig = await loadAuthConfig("public-config");
|
const authConfig = await loadAuthConfig("public-config");
|
||||||
const authProvider =
|
authProvider = getMsalAuthProvider(authConfig.tenantId, authConfig.clientId);
|
||||||
config.authMode === "azure-identity"
|
}
|
||||||
? getAzureIdentityAuthProvider(authConfig.tenantId, authConfig.clientId)
|
|
||||||
: getMsalAuthProvider(authConfig.tenantId, authConfig.clientId);
|
|
||||||
|
|
||||||
return Client.init({
|
return Client.init({
|
||||||
authProvider: authProvider,
|
authProvider: authProvider,
|
||||||
|
|||||||
Reference in New Issue
Block a user