Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
4 changes: 2 additions & 2 deletions .azdo/ci-pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,11 @@ steps:

- script: |
python -m pip install ./dist/microsoft_agents_core*.whl
python -m pip install ./dist/microsoft_agents_authentication*.whl
python -m pip install ./dist/microsoft_agents_authorization*.whl
python -m pip install ./dist/microsoft_agents_connector*.whl
python -m pip install ./dist/microsoft_agents_client*.whl
python -m pip install ./dist/microsoft_agents_builder*.whl
python -m pip install ./dist/microsoft_agents_authorization_msal*.whl
python -m pip install ./dist/microsoft_agents_authentication_msal*.whl
python -m pip install ./dist/microsoft_agents_copilotstudio_client*.whl
python -m pip install ./dist/microsoft_agents_hosting_aiohttp*.whl
python -m pip install ./dist/microsoft_agents_storage*.whl
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/python-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,11 @@ jobs:
- name: Install wheels
run: |
python -m pip install ./dist/microsoft_agents_core*.whl
python -m pip install ./dist/microsoft_agents_authentication*.whl
python -m pip install ./dist/microsoft_agents_authorization*.whl
python -m pip install ./dist/microsoft_agents_connector*.whl
python -m pip install ./dist/microsoft_agents_client*.whl
python -m pip install ./dist/microsoft_agents_builder*.whl
python -m pip install ./dist/microsoft_agents_authorization_msal*.whl
python -m pip install ./dist/microsoft_agents_authentication_msal*.whl
python -m pip install ./dist/microsoft_agents_copilotstudio_client*.whl
python -m pip install ./dist/microsoft_agents_hosting_aiohttp*.whl
python -m pip install ./dist/microsoft_agents_storage*.whl
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
from cryptography.hazmat.backends import default_backend
from cryptography.hazmat.primitives import hashes

from microsoft.agents.authentication import AccessTokenProviderBase
from microsoft.agents.authorization import AccessTokenProviderBase

from .auth_types import AuthTypes
from .msal_auth_configuration import MsalAuthConfiguration
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from typing import Protocol, Optional

from microsoft.agents.authentication import AgentAuthConfiguration
from microsoft.agents.authorization import AgentAuthConfiguration

from .auth_types import AuthTypes

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ requires = ["setuptools"]
build-backend = "setuptools.build_meta"

[project]
name = "microsoft-agents-authorization-msal"
name = "microsoft-agents-authentication-msal"
version = "0.0.0a1"
description = "A msal-based authentication library for Microsoft Agents"
authors = [{name = "Microsoft Corporation"}]
Expand All @@ -14,7 +14,7 @@ classifiers = [
"Operating System :: OS Independent",
]
dependencies = [
"microsoft-agents-authentication",
"microsoft-agents-authorization",
"msal>=1.31.1",
"requests>=2.32.3",
"cryptography>=44.0.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from abc import ABC, abstractmethod
from collections.abc import Callable
from typing import List, Awaitable
from microsoft.agents.authentication import ClaimsIdentity
from microsoft.agents.authorization import ClaimsIdentity
from microsoft.agents.core import ChannelAdapterProtocol
from microsoft.agents.core.models import (
Activity,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
Transcript,
)

from microsoft.agents.authentication import ClaimsIdentity
from microsoft.agents.authorization import ClaimsIdentity


class ChannelApiHandlerProtocol(Protocol):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
ConnectorClient,
UserTokenClient,
)
from microsoft.agents.authentication import AuthenticationConstants, ClaimsIdentity
from microsoft.agents.authorization import AuthenticationConstants, ClaimsIdentity
from .channel_service_client_factory_base import ChannelServiceClientFactoryBase
from .channel_adapter import ChannelAdapter
from .turn_context import TurnContext
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from typing import Protocol, Optional
from abc import abstractmethod

from microsoft.agents.authentication import ClaimsIdentity
from microsoft.agents.authorization import ClaimsIdentity
from microsoft.agents.connector import ConnectorClientBase, UserTokenClientBase


Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from typing import Any, Optional

from microsoft.agents.authentication import (
from microsoft.agents.authorization import (
AuthenticationConstants,
ClaimsIdentity,
Connections,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from typing import Protocol

from microsoft.agents.authentication import AccessTokenProviderBase
from microsoft.agents.authorization import AccessTokenProviderBase

from .channel_protocol import ChannelProtocol

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from copy import copy

from microsoft.agents.authentication import Connections
from microsoft.agents.authorization import Connections

from .channels_configuration import ChannelsConfiguration
from .channel_factory_protocol import ChannelFactoryProtocol
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from copy import deepcopy, copy

from aiohttp import ClientSession
from microsoft.agents.authentication import AccessTokenProviderBase
from microsoft.agents.authorization import AccessTokenProviderBase
from microsoft.agents.core.models import (
AgentsModel,
Activity,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from microsoft.agents.authentication import AccessTokenProviderBase
from microsoft.agents.authorization import AccessTokenProviderBase

from .channel_factory_protocol import ChannelFactoryProtocol
from .channel_protocol import ChannelProtocol
Expand Down
2 changes: 1 addition & 1 deletion libraries/Client/microsoft-agents-client/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ classifiers = [
]
dependencies = [
"microsoft-agents-core",
"microsoft-agents-authentication"
"microsoft-agents-authorization",
]

[project.urls]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

from azure.core.credentials import AccessToken
from azure.core.credentials_async import AsyncTokenCredential
from microsoft.agents.authentication import AccessTokenProviderBase
from microsoft.agents.authorization import AccessTokenProviderBase


class AgentsTokenCredentialAdapter(AsyncTokenCredential):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
from azure.core.credentials_async import AsyncTokenCredential
from azure.core.pipeline import policies
from azure.core.rest import AsyncHttpResponse, HttpRequest
from microsoft.agents.authentication import AccessTokenProviderBase
from microsoft.agents.authorization import AccessTokenProviderBase

from ._serialization import Deserializer, Serializer
from ._connector_client_configuration import ConnectorConfiguration
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ dependencies = [
"isodate>=0.6.1",
"azure-core>=1.30.0",
"microsoft-agents-core",
"microsoft-agents-authentication",
"microsoft-agents-authorization",
]

[project.urls]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ requires = ["setuptools"]
build-backend = "setuptools.build_meta"

[project]
name = "microsoft-agents-authentication"
name = "microsoft-agents-authorization"
version = "0.0.0a1"
description = "An authentication library for Microsoft Agents"
description = "An authorization library for Microsoft Agents"
authors = [{name = "Microsoft Corporation"}]
requires-python = ">=3.9"
classifiers = [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
HTTPUnauthorized,
HTTPUnsupportedMediaType,
)
from microsoft.agents.authentication import ClaimsIdentity
from microsoft.agents.authorization import ClaimsIdentity
from microsoft.agents.core.models import (
Activity,
DeliveryModes,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from aiohttp.web import Request, middleware, json_response

from microsoft.agents.authentication import AgentAuthConfiguration, JwtTokenValidator
from microsoft.agents.authorization import AgentAuthConfiguration, JwtTokenValidator


@middleware
Expand Down
2 changes: 1 addition & 1 deletion test_samples/agent_to_agent/agent_1/agent1.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
ConversationResourceResponse,
ConversationsResult,
)
from microsoft.agents.authentication import ClaimsIdentity
from microsoft.agents.authorization import ClaimsIdentity
from microsoft.agents.client import (
ChannelHostProtocol,
ChannelInfoProtocol,
Expand Down
4 changes: 2 additions & 2 deletions test_samples/agent_to_agent/agent_1/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
jwt_authorization_middleware,
channel_service_route_table,
)
from microsoft.agents.authentication import (
from microsoft.agents.authorization import (
Connections,
AccessTokenProviderBase,
ClaimsIdentity,
)
from microsoft.agents.authorization.msal import MsalAuth
from microsoft.agents.authentication.msal import MsalAuth
from microsoft.agents.client import (
ConfigurationChannelHost,
ConversationIdFactory,
Expand Down
2 changes: 1 addition & 1 deletion test_samples/agent_to_agent/agent_1/config.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from microsoft.agents.authorization.msal import AuthTypes, MsalAuthConfiguration
from microsoft.agents.authentication.msal import AuthTypes, MsalAuthConfiguration
from microsoft.agents.client import (
ChannelHostConfiguration,
ChannelsConfiguration,
Expand Down
2 changes: 1 addition & 1 deletion test_samples/agent_to_agent/agent_2/agent2.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from microsoft.agents.builder import ActivityHandler, MessageFactory, TurnContext
from microsoft.agents.builder import ActivityHandler, TurnContext
from microsoft.agents.core.models import (
ChannelAccount,
Activity,
Expand Down
4 changes: 2 additions & 2 deletions test_samples/agent_to_agent/agent_2/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@

from microsoft.agents.builder import RestChannelServiceClientFactory
from microsoft.agents.hosting.aiohttp import CloudAdapter, jwt_authorization_middleware
from microsoft.agents.authentication import (
from microsoft.agents.authorization import (
Connections,
AccessTokenProviderBase,
ClaimsIdentity,
)
from microsoft.agents.authorization.msal import MsalAuth
from microsoft.agents.authentication.msal import MsalAuth

from agent2 import Agent2
from config import DefaultConfig
Expand Down
2 changes: 1 addition & 1 deletion test_samples/agent_to_agent/agent_2/config.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from microsoft.agents.authorization.msal import AuthTypes, MsalAuthConfiguration
from microsoft.agents.authentication.msal import AuthTypes, MsalAuthConfiguration


class DefaultConfig(MsalAuthConfiguration):
Expand Down
4 changes: 2 additions & 2 deletions test_samples/echo_agent/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@

from microsoft.agents.builder import RestChannelServiceClientFactory
from microsoft.agents.hosting.aiohttp import CloudAdapter, jwt_authorization_middleware
from microsoft.agents.authentication import (
from microsoft.agents.authorization import (
Connections,
AccessTokenProviderBase,
ClaimsIdentity,
)
from microsoft.agents.authorization.msal import MsalAuth
from microsoft.agents.authentication.msal import MsalAuth

from echo_agent import EchoAgent
from config import DefaultConfig
Expand Down
2 changes: 1 addition & 1 deletion test_samples/echo_agent/config.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from microsoft.agents.authorization.msal import AuthTypes, MsalAuthConfiguration
from microsoft.agents.authentication.msal import AuthTypes, MsalAuthConfiguration


class DefaultConfig(MsalAuthConfiguration):
Expand Down