Skip to content

Commit

Permalink
Merge branch 'wip-MSFTMPP-147-m27' into MOODLE_27_STABLE
Browse files Browse the repository at this point in the history
  • Loading branch information
jamesmcq committed Mar 27, 2015
2 parents 49b6130 + 64400f7 commit f200162
Showing 1 changed file with 0 additions and 7 deletions.
7 changes: 0 additions & 7 deletions local/o365/classes/adminsetting/permissions.php
Original file line number Diff line number Diff line change
Expand Up @@ -76,13 +76,6 @@ public function output_html($data, $query = '') {
$settinghtml = '';
if ($clientcredspresent === true && $endpointspresent === true) {

$oidcconfig = get_config('auth_oidc');
$httpclient = new \local_o365\httpclient();
$clientdata = new \local_o365\oauth2\clientdata($oidcconfig->clientid, $oidcconfig->clientsecret,
$oidcconfig->authendpoint, $oidcconfig->tokenendpoint);
$resource = \local_o365\rest\azuread::get_resource();
$token = \local_o365\oauth2\systemtoken::instance($resource, $clientdata, $httpclient);
$apiclient = new \local_o365\rest\azuread($token, $httpclient);
$existingsetting = $this->config_read($this->name);

if (!empty($existingsetting)) {
Expand Down

0 comments on commit f200162

Please sign in to comment.