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
6 changes: 6 additions & 0 deletions src/authsome/cli/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,12 @@ async def revoke(self, provider: str) -> None:
async def set_default_connection(self, provider: str, connection_name: str) -> None:
await self._post(f"{API_PREFIX}/connections/{provider}/{connection_name}/default")

async def set_global_connection(self, provider: str, connection_name: str) -> dict[str, Any]:
return await self._post(f"{API_PREFIX}/connections/{provider}/{connection_name}/global")

async def unset_global_connection(self, provider: str) -> dict[str, Any]:
return await self._delete(f"{API_PREFIX}/connections/{provider}/global")

async def get_provider(self, provider: str) -> dict[str, Any]:
return await self._get(f"{API_PREFIX}/providers/{provider}")

Expand Down
21 changes: 21 additions & 0 deletions src/authsome/cli/commands/connections.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,27 @@ async def set_default_connection(ctx_obj: ContextObj, provider: str, connection:
ctx_obj.print_json({"status": "ok", "provider": provider, "default_connection": connection})


@connections.command(name="set-global")
@click.argument("provider")
@click.argument("connection")
@auth_command
async def set_global_connection(ctx_obj: ContextObj, provider: str, connection: str) -> None:
"""Make CONNECTION the global fallback for PROVIDER."""
actx = await ctx_obj.initialize()
result = await actx.runtime_client.set_global_connection(provider, connection)
ctx_obj.print_json(result)


@connections.command(name="unset-global")
@click.argument("provider")
@auth_command
async def unset_global_connection(ctx_obj: ContextObj, provider: str) -> None:
"""Remove PROVIDER's global fallback connection."""
actx = await ctx_obj.initialize()
result = await actx.runtime_client.unset_global_connection(provider)
ctx_obj.print_json(result)


@connections.command(name="inspect")
@click.argument("provider")
@click.option("--connection", default="default", metavar="NAME", help="Connection name.")
Expand Down
9 changes: 9 additions & 0 deletions src/authsome/cli/commands/provider.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,15 @@ async def list_cmd(ctx_obj: ContextObj) -> None:
actx = await ctx_obj.initialize()
data = await actx.runtime_client.list_connections()
raw_list = data["connections"]
global_list = data.get("global_connections", [])
by_source = data["by_source"]

connected: dict[str, list[dict]] = {}
for provider_group in raw_list:
connected[provider_group["name"]] = provider_group["connections"]
global_connected: dict[str, list[dict]] = {}
for conn in global_list:
global_connected.setdefault(conn["provider"], []).append(conn)

def build_provider_entry(provider_data, source: str) -> dict:
provider_definition = ProviderDefinition.model_validate(provider_data)
Expand All @@ -53,6 +57,7 @@ def build_provider_entry(provider_data, source: str) -> dict:
"auth_type": provider_definition.auth_type.value,
"source": source,
"connections": connections_out,
"global_connections": global_connected.get(provider_definition.name, []),
}

bundled_out = [build_provider_entry(p, "bundled") for p in by_source["bundled"]]
Expand Down Expand Up @@ -93,11 +98,15 @@ async def inspect_provider(ctx_obj: ContextObj, provider: str) -> None:
definition_dict = await actx.runtime_client.get_provider(provider)
data = definition_dict
data["connections"] = []
data["global_connections"] = []
connections_data = await actx.runtime_client.list_connections()
for provider_group in connections_data["connections"]:
if provider_group["name"] == provider:
data["connections"] = provider_group["connections"]
break
data["global_connections"] = [
conn for conn in connections_data.get("global_connections", []) if conn["provider"] == provider
]

data.pop("schema_version", None)
ctx_obj.print_json(data)
Expand Down
8 changes: 8 additions & 0 deletions src/authsome/server/credential_repository.py
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,14 @@ def vault(self) -> Vault:
def vault_id(self) -> str:
return self._vault_id

@property
def identity(self) -> str | None:
return self._identity

@property
def principal_id(self) -> str | None:
return self._principal_id

@property
def collection(self) -> str:
return f"vault:{self._vault_id}"
Expand Down
Loading
Loading