Merge pull request #32 from thathoff/kirby-4

Kirby 4 support

README.md

@@ -1,14 +1,20 @@
-# Kirby OAuth 2 Plugin
+# Kirby OAuth 2.0 Plugin
 
-This plugin is an interface to use  [OAuth 2.0](http://oauth.net/2/) providers for user authentication in [Kirby 3](https://getkirby.com). It uses the [PHP League’s OAuth 2 Client](https://oauth2-client.thephpleague.com/), so all [official](https://oauth2-client.thephpleague.com/providers/league/) and [third-party providers](https://oauth2-client.thephpleague.com/providers/thirdparty/) are supported. It’s even possible to [implement your own](https://oauth2-client.thephpleague.com/providers/implementing/).
+![Screnshot of Kirby’s Login Screen with OAuth](/.github/screenshot.png?raw=true)
 
-⚠️ For Kirby 3.5.0 support please use version 1 of this plugin. Version 2 only works with Kirby >= 3.6.0
+This plugin is an plugin to provide [OAuth 2.0](http://oauth.net/2/) support for panel authentication in [Kirby](https://getkirby.com). It uses the [PHP League’s OAuth 2 Client](https://oauth2-client.thephpleague.com/), so all [official](https://oauth2-client.thephpleague.com/providers/league/) and [third-party providers](https://oauth2-client.thephpleague.com/providers/thirdparty/) are supported. It’s even possible to [implement your own](https://oauth2-client.thephpleague.com/providers/implementing/).
+
+## Kirby Compatibility
+
+- For **Kirby 4** use version 3.0.0 or higher
+- For **Kirby 3.6 - 3.9** use version 2 or higher
+- For **Kirby 3.0 - 3.6** use version 1 (not maintained anymore)
 
 ---
 
 ## Installation with Composer
 
-Because of secondary dependencies for providers, installation via composer is the only currently supported method.
+Because of secondary dependencies for providers, **installation via composer is the only currently supported method**.
 
 ### Install the Plugin
 ```

composer.json

@@ -3,11 +3,16 @@
     "description": "Kirby OAuth 2 Plugin",
     "type": "kirby-plugin",
     "license": "MIT",
-    "version": "2.0.2",
+    "version": "3.0.0",
     "authors": [
         {
             "name": "Markus Denhoff",
             "email": "markus@denhoff.com"
+        },
+        {
+            "name": "reinorange GmbH",
+            "email": "info@reinorange.com",
+            "homepage": "https://reinorange.com"
         }
     ],
     "require": {

index.php

@@ -11,5 +11,6 @@
 Kirby::plugin('thathoff/oauth', [
     'routes' => include(__DIR__ . '/plugin/routes.php'),
     'options' => include(__DIR__ . '/plugin/options.php'),
-    'api' => include(__DIR__ . '/plugin/api.php')
+    'api' => include(__DIR__ . '/plugin/api.php'),
+    'translations' => include(__DIR__ . '/plugin/translations.php'),
 ]);

package.json

@@ -9,6 +9,8 @@
   "devDependencies": {
     "@vue/component-compiler-utils": "^3.2.0",
     "parcel-bundler": "^1.12.4",
-    "vue-template-compiler": "^2.6.12"
+    "vue-template-compiler": "^2.6.12",
+    "vue": "^2.7.14",
+    "vue-hot-reload-api": "^2.3.4"
   }
 }

plugin/translations.php

@@ -0,0 +1,10 @@
+<?php
+
+return [
+    'de' => [
+        'thathoff.oauth.signInWith' => 'Anmelden mit…',
+    ],
+    'en' => [
+        'thathoff.oauth.signInWith' => 'Sign in with…',
+    ]
+];