aboutsummaryrefslogtreecommitdiff
path: root/zenserver/auth
diff options
context:
space:
mode:
authorPer Larsson <[email protected]>2022-11-14 09:44:02 +0100
committerGitHub <[email protected]>2022-11-14 09:44:02 +0100
commit4f1b2bf3100b1e054fd0caa49eae5d0b8dff3131 (patch)
tree65dae0a5c9b270aa80e9a02129d28d0bc673220b /zenserver/auth
parentInclude zen cmd in release (#188) (diff)
downloadzen-4f1b2bf3100b1e054fd0caa49eae5d0b8dff3131.tar.xz
zen-4f1b2bf3100b1e054fd0caa49eae5d0b8dff3131.zip
Configure OpenID providers from cmd line and Lua cfg. (#189)
Diffstat (limited to 'zenserver/auth')
-rw-r--r--zenserver/auth/authmgr.cpp7
-rw-r--r--zenserver/auth/authservice.cpp12
2 files changed, 16 insertions, 3 deletions
diff --git a/zenserver/auth/authmgr.cpp b/zenserver/auth/authmgr.cpp
index 95ce32bc7..4cd6b3362 100644
--- a/zenserver/auth/authmgr.cpp
+++ b/zenserver/auth/authmgr.cpp
@@ -101,6 +101,13 @@ public:
{
if (OpenIdProviderExist(Params.Name))
{
+ ZEN_DEBUG("OpenID provider '{}' already exist", Params.Name);
+ return;
+ }
+
+ if (Params.Name.empty())
+ {
+ ZEN_WARN("add OpenID provider FAILED, reason 'invalid name'");
return;
}
diff --git a/zenserver/auth/authservice.cpp b/zenserver/auth/authservice.cpp
index ac77b237f..761c087f4 100644
--- a/zenserver/auth/authservice.cpp
+++ b/zenserver/auth/authservice.cpp
@@ -43,10 +43,16 @@ HttpAuthService::HttpAuthService(AuthMgr& AuthMgr) : m_AuthMgr(AuthMgr)
return ServerRequest.WriteResponse(HttpResponseCode::BadRequest, Response.Save());
}
- const std::string IdentityToken = TokenInfo["IdentityToken"].string_value();
- const std::string RefreshToken = TokenInfo["RefreshToken"].string_value();
+ const std::string RefreshToken = TokenInfo["RefreshToken"].string_value();
+ std::string ProviderName = TokenInfo["ProviderName"].string_value();
- const bool Ok = m_AuthMgr.AddOpenIdToken(AuthMgr::AddOpenIdTokenParams{.ProviderName = "Okta"sv, .RefreshToken = RefreshToken});
+ if (ProviderName.empty())
+ {
+ ProviderName = "Default"sv;
+ }
+
+ const bool Ok =
+ m_AuthMgr.AddOpenIdToken(AuthMgr::AddOpenIdTokenParams{.ProviderName = ProviderName, .RefreshToken = RefreshToken});
if (Ok)
{