Merge pull request #51 from catalyst/update

Update plugin for the latest Moodle

Author: dmitriim

.travis.yml

@@ -1,68 +1,64 @@
 language: php
 
-addons:
-  firefox: "47.0.1"
-  postgresql: "9.4"
+notifications:
+  email:
+    recipients:
+      - dmitriim@catalyst-au.net
+
+sudo: false
 
 cache:
   directories:
     - $HOME/.composer/cache
-    - $HOME/.npm
 
-dist: trusty
+addons:
+  postgresql: "9.6"
+
+php:
+  - 7.1
+  - 7.2
+  - 7.3
+
+env:
+  global:
+    - DB=pgsql
+  matrix:
+    - MOODLE_BRANCH=MOODLE_33_STABLE
+    - MOODLE_BRANCH=MOODLE_34_STABLE
+    - MOODLE_BRANCH=MOODLE_35_STABLE
+    - MOODLE_BRANCH=MOODLE_36_STABLE
+    - MOODLE_BRANCH=MOODLE_37_STABLE
+    - MOODLE_BRANCH=MOODLE_38_STABLE
+    - MOODLE_BRANCH=master
 
 matrix:
-  include:
-    - php: 7.0
-      env: DB=mysqli MOODLE_BRANCH=MOODLE_33_STABLE
-    - php: 7.0
-      env: DB=pgsql  MOODLE_BRANCH=MOODLE_33_STABLE
-    - php: 7.0
-      env: DB=mysqli MOODLE_BRANCH=MOODLE_34_STABLE
-    - php: 7.0
-      env: DB=pgsql  MOODLE_BRANCH=MOODLE_34_STABLE
-    - php: 7.1
-      env: DB=mysqli MOODLE_BRANCH=MOODLE_33_STABLE
-    - php: 7.1
-      env: DB=pgsql  MOODLE_BRANCH=MOODLE_33_STABLE
-    - php: 7.1
-      env: DB=mysqli MOODLE_BRANCH=MOODLE_34_STABLE
+  exclude:
     - php: 7.1
-      env: DB=pgsql  MOODLE_BRANCH=MOODLE_34_STABLE
-    - php: 7.1
-      env: DB=mysqli MOODLE_BRANCH=MOODLE_35_STABLE
-    - php: 7.1
-      env: DB=pgsql  MOODLE_BRANCH=MOODLE_35_STABLE
-    - php: 7.1
-      env: DB=mysqli MOODLE_BRANCH=MOODLE_36_STABLE
-    - php: 7.1
-      env: DB=pgsql  MOODLE_BRANCH=MOODLE_36_STABLE
-    - php: 7.2
-      env: DB=mysqli MOODLE_BRANCH=MOODLE_37_STABLE
-    - php: 7.2
-      env: DB=pgsql  MOODLE_BRANCH=MOODLE_37_STABLE
-    - php: 7.2
-      env: DB=mysqli MOODLE_BRANCH=master
+      env: MOODLE_BRANCH=master
     - php: 7.2
-      env: DB=pgsql  MOODLE_BRANCH=master
+      env: MOODLE_BRANCH=MOODLE_33_STABLE
+    - php: 7.3
+      env: MOODLE_BRANCH=MOODLE_33_STABLE
+    - php: 7.3
+      env: MOODLE_BRANCH=MOODLE_34_STABLE
+    - php: 7.3
+      env: MOODLE_BRANCH=MOODLE_35_STABLE
 
 before_install:
-  - phpenv config-rm xdebug.ini
-  - nvm install 8.9
-  - nvm use 8.9
   - cd ../..
-  - composer create-project -n --no-dev --prefer-dist moodlerooms/moodle-plugin-ci ci ^2
+  - composer selfupdate
+  - composer create-project -n --no-dev moodlerooms/moodle-plugin-ci ci ^1
   - export PATH="$(cd ci/bin; pwd):$(cd ci/vendor/bin; pwd):$PATH"
 
 install:
-  - moodle-plugin-ci install
+  - moodle-plugin-ci install -vvv
 
 script:
   - moodle-plugin-ci phplint
+  - moodle-plugin-ci phpmd
   - moodle-plugin-ci codechecker
-  - moodle-plugin-ci validate
-  - moodle-plugin-ci savepoints
-  - moodle-plugin-ci mustache
-  - moodle-plugin-ci grunt
+  - moodle-plugin-ci csslint
+  - moodle-plugin-ci shifter
+  - moodle-plugin-ci jshint
   - moodle-plugin-ci phpunit
   - moodle-plugin-ci behat

README.md

@@ -163,4 +163,24 @@ echo getloginurl('barrywhite@googlemail.com', 'barry', 'white', 'barrywhite', 2,
 
 TODO:
 -----
-1. Implement logout webservice to be able to call it from external application.
+1. Implement logout webservice to be able to call it from external application.
+
+
+# Crafted by Catalyst IT
+
+This plugin was developed by Catalyst IT Australia:
+
+https://www.catalyst-au.net/
+
+![Catalyst IT](/pix/catalyst-logo.png?raw=true)
+
+# Contributing and Support
+
+Issues, and pull requests using github are welcome and encouraged! 
+
+https://github.com/catalyst/moodle-auth_userkey/issues
+
+If you would like commercial support or would like to sponsor additional improvements
+to this plugin please contact us:
+
+https://www.catalyst-au.net/contact-us

classes/privacy/provider.php

@@ -0,0 +1,53 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Privacy provider.
+ *
+ * @package   auth_userkey
+ * @author    Dmitrii Metelkin (dmitriim@catalyst-au.net)
+ * @copyright 2020 Catalyst IT
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+namespace auth_userkey\privacy;
+
+defined('MOODLE_INTERNAL') || die;
+
+use core_privacy\local\metadata\null_provider;
+use core_privacy\local\legacy_polyfill;
+
+/**
+ * Privacy provider.
+ *
+ * @copyright  2020 Catalyst IT
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class provider implements null_provider {
+
+    use legacy_polyfill;
+
+    /**
+     * Get the language string identifier with the component's language
+     * file to explain why this plugin stores no data.
+     *
+     * @return  string
+     */
+    public static function _get_reason() {
+        return 'privacy:metadata';
+    }
+
+}

lang/en/auth_userkey.php

@@ -52,3 +52,4 @@
 $string['ssourl_desc'] = 'URL of the SSO host to redirect users to. If defined users will be redirected here on login instead of the Moodle Login page';
 $string['redirecterrordetected'] = 'Unsupported redirect to {$a} detected, execution terminated.';
 $string['noip'] = 'Unable to fetch IP address of client.';
+$string['privacy:metadata'] = 'User key authentication plugin does not store any personal data.';