some dependencies updated

cfg/oauth_samples/oauth.azuread.inc.php

@@ -1,62 +1,57 @@
-<?php
-//
-// filesource oauth.azuread.inc.php
-//
-// Azure AD 
-// Fill in CLIENT_ID,
-//         CLIENT_SECRET,
-//         YOURTESTLINKSERVER,
-//         TENANTID 
-// with your information
-// See this article for registering an application: https://docs.microsoft.com/en-us/azure/active-directory/develop/v1-protocols-oauth-code
-// Make sure, you grant admint consent for it: https://docs.microsoft.com/en-us/azure/active-directory/manage-apps/configure-user-consent
-
-// 
-// IMPORTANTE NOTICE
-// key in $tlCfg->OAuthServers[]
-// can be anything you want that make this configuration
-// does not overwrite other or will be overwritten
-//
-// HOW TO use this file ?
-// 1. copy this file to 
-//     [TESTLINK_INSTALL]/cfg/
-//
-// 2. configure according your application
-//
-// 3. add the following line to your custom_config.inc.php
-//    require('aouth.azuread.inc.php');
-//
-// ------------------------------------------------------------- 
-$tlCfg->OAuthServers['azuread'] = array();
-
-$tlCfg->OAuthServers['azuread']['redirect_uri'] = (empty($_SERVER['HTTPS']) ? 'http://' : 'https://') . $_SERVER['HTTP_HOST'] . '/login.php';
-
-
-$tlCfg->OAuthServers['azuread']['oauth_client_id'] = 'CHANGE_WITH_CLIENT_ID';
-$tlCfg->OAuthServers['azuread']['oauth_client_secret'] = 
-  'CHANGE_WITH_CLIENT_SECRET';
-
-// https://login.microsoftonline.com/YOUR_TENANT_ID/v2.0/.well-known/openid-configuration
-$azureADBaseURL = 'https://login.microsoftonline.com/CHANGE_WITH_TENANT_ID';
-$msGraphURL = 'https://graph.microsoft.com';
-$tlCfg->OAuthServers['azuread']['oauth_url'] = 
-  $azureADBaseURL . '/oauth2/v2.0/authorize';
-
-$tlCfg->OAuthServers['azuread']['token_url'] = 
-  $azureADBaseURL . '/oauth2/v2.0/token';
-
-$tlCfg->OAuthServers['azuread']['oauth_profile'] = 
-  $msGraphURL . '/oidc/userinfo';
-
-
-$tlCfg->OAuthServers['azuread']['oauth_enabled'] = true;
-$tlCfg->OAuthServers['azuread']['oauth_name'] = 'azuread'; //do not change this
-$tlCfg->OAuthServers['azuread']['oauth_force_single'] = true; 
-$tlCfg->OAuthServers['azuread']['oauth_grant_type'] = 'authorization_code';  
-
-// the domain you want to whitelist (email domains)
-$tlCfg->OAuthServers['azuread']['oauth_domain'] = 'autsoft.hu'; 
-
-
-$tlCfg->OAuthServers['azuread']['oauth_scope'] = 
-  'https://graph.microsoft.com/mail.read https://graph.microsoft.com/user.read openid profile email';
+<?php
+//
+// filesource oauth.azuread.inc.php
+//
+// Azure AD
+// Fill in CLIENT_ID,
+// CLIENT_SECRET,
+// YOURTESTLINKSERVER,
+// TENANTID
+// with your information
+// See this article for registering an application: https://docs.microsoft.com/en-us/azure/active-directory/develop/v1-protocols-oauth-code
+// Make sure, you grant admint consent for it: https://docs.microsoft.com/en-us/azure/active-directory/manage-apps/configure-user-consent
+
+//
+// IMPORTANTE NOTICE
+// key in $tlCfg->OAuthServers[]
+// can be anything you want that make this configuration
+// does not overwrite other or will be overwritten
+//
+// HOW TO use this file ?
+// 1. copy this file to
+// [TESTLINK_INSTALL]/cfg/
+//
+// 2. configure according your application
+//
+// 3. add the following line to your custom_config.inc.php
+// require('aouth.azuread.inc.php');
+//
+// -------------------------------------------------------------
+$tlCfg->OAuthServers['azuread'] = array();
+
+$tlCfg->OAuthServers['azuread']['redirect_uri'] = (empty($_SERVER['HTTPS']) ? 'http://' : 'https://') .
+    $_SERVER['HTTP_HOST'] . '/login.php';
+
+$tlCfg->OAuthServers['azuread']['oauth_client_id'] = 'CHANGE_WITH_CLIENT_ID';
+$tlCfg->OAuthServers['azuread']['oauth_client_secret'] = 'CHANGE_WITH_CLIENT_SECRET';
+
+// https://login.microsoftonline.com/YOUR_TENANT_ID/v2.0/.well-known/openid-configuration
+$azureADBaseURL = 'https://login.microsoftonline.com/CHANGE_WITH_TENANT_ID';
+$msGraphURL = 'https://graph.microsoft.com';
+$tlCfg->OAuthServers['azuread']['oauth_url'] = $azureADBaseURL .
+    '/oauth2/v2.0/authorize';
+
+$tlCfg->OAuthServers['azuread']['token_url'] = $azureADBaseURL .
+    '/oauth2/v2.0/token';
+
+$tlCfg->OAuthServers['azuread']['oauth_profile'] = $msGraphURL . '/oidc/userinfo';
+
+$tlCfg->OAuthServers['azuread']['oauth_enabled'] = true;
+$tlCfg->OAuthServers['azuread']['oauth_name'] = 'azuread'; // do not change this
+$tlCfg->OAuthServers['azuread']['oauth_force_single'] = true;
+$tlCfg->OAuthServers['azuread']['oauth_grant_type'] = 'authorization_code';
+
+// the domain you want to whitelist (email domains)
+$tlCfg->OAuthServers['azuread']['oauth_domain'] = 'autsoft.hu';
+
+$tlCfg->OAuthServers['azuread']['oauth_scope'] = 'https://graph.microsoft.com/mail.read https://graph.microsoft.com/user.read openid profile email';

cfg/oauth_samples/oauth.github.inc.php

@@ -1,46 +1,44 @@
-<?php
-#
-# @filename oauth.github.inc.php
-#
-# 20200522 - tested OK
-# Application is registered for github user testlinkOAuth
-# this user is owned by TestLink Development Team.
-#
-#
-# Client implemented using 
-# https://github.com/thephpleague/oauth2-github
-#
-# 
-# IMPORTANT NOTICE
-# key in $tlCfg->OAuthServers[]
-# can be anything you want that make this configuration
-# does not overwrite other or will be overwritten
-#
-# HOW TO use this file ?
-# 1. copy this file to 
-#     [TESTLINK_INSTALL]/cfg/
-#
-# 2. configure according your application
-#
-# 3. add the following line to your custom_config.inc.php
-#   require('aouth.github.inc.php');
-#
-# ###########################################################
-# This is a working example for test site
-# http://fman.hopto.org/
-#
-# You need to create the configuration for your site
-# This is only a working example that is useful
-# for the TestLink Development Team
-#
-$tlCfg->OAuthServers['github'] = array();
-$tlCfg->OAuthServers['github']['redirect_uri'] = 
-  'http://fman.hopto.org/login.php?oauth=github';
-
-$tlCfg->OAuthServers['github']['oauth_client_id'] ='aa5f70a8de342fb95043';
-$tlCfg->OAuthServers['github']['oauth_client_secret'] = 
-  'c8d61d5ec4ed4eb2ac81064c27043ddef351107e';
-
-$tlCfg->OAuthServers['github']['oauth_enabled'] = true;
+<?php
+#
+# @filename oauth.github.inc.php
+#
+# 20200522 - tested OK
+# Application is registered for github user testlinkOAuth
+# this user is owned by TestLink Development Team.
+#
+#
+# Client implemented using
+# https://github.com/thephpleague/oauth2-github
+#
+#
+# IMPORTANT NOTICE
+# key in $tlCfg->OAuthServers[]
+# can be anything you want that make this configuration
+# does not overwrite other or will be overwritten
+#
+# HOW TO use this file ?
+# 1. copy this file to
+# [TESTLINK_INSTALL]/cfg/
+#
+# 2. configure according your application
+#
+# 3. add the following line to your custom_config.inc.php
+# require('aouth.github.inc.php');
+#
+# ###########################################################
+# This is a working example for test site
+# http://fman.hopto.org/
+#
+# You need to create the configuration for your site
+# This is only a working example that is useful
+# for the TestLink Development Team
+#
+$tlCfg->OAuthServers['github'] = array();
+$tlCfg->OAuthServers['github']['redirect_uri'] = 'http://fman.hopto.org/login.php?oauth=github';
+
+$tlCfg->OAuthServers['github']['oauth_client_id'] = 'aa5f70a8de342fb95043';
+$tlCfg->OAuthServers['github']['oauth_client_secret'] = 'c8d61d5ec4ed4eb2ac81064c27043ddef351107e';
+
+$tlCfg->OAuthServers['github']['oauth_enabled'] = true;
 $tlCfg->OAuthServers['github']['oauth_name'] = 'github';
-# End Of File
+

cfg/oauth_samples/oauth.gitlab.inc.php

@@ -1,46 +1,44 @@
-<?php
-# filesource oauth.gitlab.inc.php
-#
-# Some useful examples/documentation
-# https://docs.gitlab.com/ce/api/oauth2.html
-# https://grafana.com/docs/grafana/latest/auth/gitlab/
-
-# Libraries used to create client
-# https://github.com/thephpleague/oauth2-client
-# https://github.com/omines/oauth2-gitlab
-#
-# IMPORTANT NOTICE
-# key in $tlCfg->OAuthServers[]
-# can be anything you want that make this configuration
-# does not overwrite other or will be overwritten
-#
-# HOW TO use this file ?
-# 1. copy this file to 
-#     [TESTLINK_INSTALL]/cfg/
-#
-# 2. configure according your application
-#
-# 3. add the following line to your custom_config.inc.php
-#    require('aouth.gitlab.inc.php');
-#
-# ##############################################################
-#
-# This is a working example for test site
-# http://fman.hopto.org/
-#
-# You need to create the configuration for your site
-# This is only a working example that is useful
-# for the TestLink Development Team
-#
-$tlCfg->OAuthServers['gitlab'] = array();
-
-$tlCfg->OAuthServers['gitlab']['redirect_uri'] = 
-   'http://fman.hopto.org/login.php?oauth=gitlab';
-
-$tlCfg->OAuthServers['gitlab']['oauth_enabled'] = true;
-$tlCfg->OAuthServers['gitlab']['oauth_name'] = 'gitlab';
-
-$tlCfg->OAuthServers['gitlab']['oauth_client_id'] = 
-'27a03c93d60b5ddb4e0cef92149678fbe37c099733605e046a5428a9da4177ba';
-
+<?php
+# filesource oauth.gitlab.inc.php
+#
+# Some useful examples/documentation
+# https://docs.gitlab.com/ce/api/oauth2.html
+# https://grafana.com/docs/grafana/latest/auth/gitlab/
+
+# Libraries used to create client
+# https://github.com/thephpleague/oauth2-client
+# https://github.com/omines/oauth2-gitlab
+#
+# IMPORTANT NOTICE
+# key in $tlCfg->OAuthServers[]
+# can be anything you want that make this configuration
+# does not overwrite other or will be overwritten
+#
+# HOW TO use this file ?
+# 1. copy this file to
+# [TESTLINK_INSTALL]/cfg/
+#
+# 2. configure according your application
+#
+# 3. add the following line to your custom_config.inc.php
+# require('aouth.gitlab.inc.php');
+#
+# ##############################################################
+#
+# This is a working example for test site
+# http://fman.hopto.org/
+#
+# You need to create the configuration for your site
+# This is only a working example that is useful
+# for the TestLink Development Team
+#
+$tlCfg->OAuthServers['gitlab'] = array();
+
+$tlCfg->OAuthServers['gitlab']['redirect_uri'] = 'http://fman.hopto.org/login.php?oauth=gitlab';
+
+$tlCfg->OAuthServers['gitlab']['oauth_enabled'] = true;
+$tlCfg->OAuthServers['gitlab']['oauth_name'] = 'gitlab';
+
+$tlCfg->OAuthServers['gitlab']['oauth_client_id'] = '27a03c93d60b5ddb4e0cef92149678fbe37c099733605e046a5428a9da4177ba';
+
 $tlCfg->OAuthServers['gitlab']['oauth_client_secret'] = 'c157df291b81dbfd8084d38b155029baded3cf76c7449670bd2da889fe8b99eb';

cfg/oauth_samples/oauth.google.inc.php

@@ -1,55 +1,52 @@
-<?php
-# filesource oauth.google.inc.php
-#
-# IMPORTANT NOTICE
-# key in $tlCfg->OAuthServers[]
-# can be anything you want that make this configuration
-# does not overwrite other or will be overwritten
-#
-# HOW TO use this file ?
-# 1. copy this file to 
-#     [TESTLINK_INSTALL]/cfg/
-#
-# 2. configure according your application
-#
-# 3. add the following line to your custom_config.inc.php
-#    require('aouth.google.inc.php');
-#
-# #############################################################
-# Client implemented using 
-# https://github.com/thephpleague/oauth2-google
-##
-# This is a working example for test site
-# http://fman.hopto.org/
-#
-# You need to create the configuration for your site
-# This is only a working example that is useful
-# for the TestLink Development Team
-#
-$tlCfg->OAuthServers['google'] = array();
-$tlCfg->OAuthServers['google']['redirect_uri'] = 
-  'http://fman.hopto.org/login.php?oauth=google';
-
-$tlCfg->OAuthServers['google']['oauth_enabled'] = true;
-$tlCfg->OAuthServers['google']['oauth_name'] = 'google';
-
-// Get from /gui/themes/default/images
-$tlCfg->OAuthServers['google']['oauth_client_id'] = 
-  '860603525614-fscj9cgr2dvks51uh6odl67skec536fd.apps.googleusercontent.com';
-
-$tlCfg->OAuthServers['google']['oauth_client_secret'] = 
-  '_YOKquNTa4Fux-OMJoxDBuov';
+<?php
+# filesource oauth.google.inc.php
+#
+# IMPORTANT NOTICE
+# key in $tlCfg->OAuthServers[]
+# can be anything you want that make this configuration
+# does not overwrite other or will be overwritten
+#
+# HOW TO use this file ?
+# 1. copy this file to
+# [TESTLINK_INSTALL]/cfg/
+#
+# 2. configure according your application
+#
+# 3. add the following line to your custom_config.inc.php
+# require('aouth.google.inc.php');
+#
+# #############################################################
+# Client implemented using
+# https://github.com/thephpleague/oauth2-google
+# #
+# This is a working example for test site
+# http://fman.hopto.org/
+#
+# You need to create the configuration for your site
+# This is only a working example that is useful
+# for the TestLink Development Team
+#
+$tlCfg->OAuthServers['google'] = array();
+$tlCfg->OAuthServers['google']['redirect_uri'] = 'http://fman.hopto.org/login.php?oauth=google';
+
+$tlCfg->OAuthServers['google']['oauth_enabled'] = true;
+$tlCfg->OAuthServers['google']['oauth_name'] = 'google';
+
+// Get from /gui/themes/default/images
+$tlCfg->OAuthServers['google']['oauth_client_id'] = '860603525614-fscj9cgr2dvks51uh6odl67skec536fd.apps.googleusercontent.com';
+
+$tlCfg->OAuthServers['google']['oauth_client_secret'] = '_YOKquNTa4Fux-OMJoxDBuov';
 
 // Needed when you use the cURL implementation
 // Can be authorization_code (by default), client_credentials or password
-// $tlCfg->OAuthServers['google']['oauth_grant_type'] = 'authorization_code';  
+// $tlCfg->OAuthServers['google']['oauth_grant_type'] = 'authorization_code';
 //$tlCfg->OAuthServers['google']['oauth_url'] = 'https://accounts.google.com/o/oauth2/auth';
 //$tlCfg->OAuthServers['google']['token_url'] = 'https://accounts.google.com/o/oauth2/token';
 
 // false => then the only user will be selected automatically (applied for google)
-//$tlCfg->OAuthServers['google']['oauth_force_single'] = false; 
+//$tlCfg->OAuthServers['google']['oauth_force_single'] = false;
 
 // the domain you want to whitelist
-//$tlCfg->OAuthServers['google']['oauth_domain'] = 'google.com'; 
+//$tlCfg->OAuthServers['google']['oauth_domain'] = 'google.com';
 //$tlCfg->OAuthServers['google']['oauth_profile'] = 'https://www.googleapis.com/oauth2/v1/userinfo';
 //$tlCfg->OAuthServers['google']['oauth_scope'] = 'https://www.googleapis.com/auth/userinfo.email https://www.googleapis.com/auth/userinfo.profile';