OAuth: Allow setting a unique provider ID when specifying a custom pa…

…rameters
os-autoinst · Apr 12, 2021 · 3895b26 · 3895b26
1 parent 2877eeb
commit 3895b26
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/lib/OpenQA/Setup.pm b/lib/OpenQA/Setup.pm
@@ -86,6 +86,7 @@ sub read_config {
             token_scope   => '',
             token_label   => '',
             nickname_from => '',
+            unique_name   => '',
         },
         hypnotoad => {
             listen => ['http://localhost:9526/'],

diff --git a/lib/OpenQA/WebAPI/Auth/OAuth2.pm b/lib/OpenQA/WebAPI/Auth/OAuth2.pm
@@ -54,6 +54,7 @@ sub auth_setup ($server) {
                 token_scope   => $config->{token_scope},
                 token_label   => $config->{token_label},
                 nickname_from => $config->{nickname_from},
+                unique_name   => $config->{unique_name},
             },
         },
     );
@@ -85,10 +86,12 @@ sub auth_login ($controller) {
                 # Note: Using 403 for consistency
                 return $controller->render(text => "$err->{code}: $err->{message}", status => 403);
             }
-            my $details = $res->json;
-            my $user    = $controller->schema->resultset('Users')->create_user(
+            my $details       = $res->json;
+            my $provider_name = $main_config->{provider};
+            $provider_name = $provider_config->{unique_name} || $provider_name if $provider_name eq 'custom';
+            my $user = $controller->schema->resultset('Users')->create_user(
                 $details->{id},
-                provider => "oauth2\@$main_config->{provider}",
+                provider => "oauth2\@$provider_name",
                 nickname => $details->{$provider_config->{nickname_from}},
                 fullname => $details->{name},
                 email    => $details->{email});

diff --git a/t/config.t b/t/config.t
@@ -85,6 +85,7 @@ subtest 'Test configuration default modes' => sub {
             token_scope   => '',
             token_label   => '',
             nickname_from => '',
+            unique_name   => '',
         },
         hypnotoad => {
             listen => ['http://localhost:9526/'],