Use "checkAllowedScope" instead of "login"

diff --git a/src/Module/Api/Friendica/Events/Index.php b/src/Module/Api/Friendica/Events/Index.php
index c52d1581e72261f3829fab9817a70c110f1d155c..d53273ef66f3fff262a65024d8865a79283d68f8 100644 (file)
--- a/src/Module/Api/Friendica/Events/Index.php
+++ b/src/Module/Api/Friendica/Events/Index.php
@@ -35,7 +35,7 @@ class Index extends BaseApi
 {
        public static function rawContent(array $parameters = [])
        {
-               self::login(self::SCOPE_READ);
+               self::checkAllowedScope(self::SCOPE_READ);
                $uid = self::getCurrentUserID();
 
                $request = self::getRequest([

diff --git a/src/Module/Api/Friendica/Profile/Show.php b/src/Module/Api/Friendica/Profile/Show.php
index 0e38bb02e56d3a8ca011c0c5359d98f52a5e4237..9058ba5214121c0e02127fa0f57ffe8753b34f59 100644 (file)
--- a/src/Module/Api/Friendica/Profile/Show.php
+++ b/src/Module/Api/Friendica/Profile/Show.php
@@ -37,7 +37,7 @@ class Show extends BaseApi
 {
        public static function rawContent(array $parameters = [])
        {
-               self::login(self::SCOPE_READ);
+               self::checkAllowedScope(self::SCOPE_READ);
                $uid = self::getCurrentUserID();
 
                // retrieve general information about profiles for user

diff --git a/src/Module/Api/Mastodon/Accounts/Block.php b/src/Module/Api/Mastodon/Accounts/Block.php
index fa12daaf4ff830e97d733e83701fd1de7392cb39..21114804962771c848592845861de2b7645c94d7 100644 (file)
--- a/src/Module/Api/Mastodon/Accounts/Block.php
+++ b/src/Module/Api/Mastodon/Accounts/Block.php
@@ -33,7 +33,7 @@ class Block extends BaseApi
 {
        public static function post(array $parameters = [])
        {
-               self::login(self::SCOPE_FOLLOW);
+               self::checkAllowedScope(self::SCOPE_FOLLOW);
                $uid = self::getCurrentUserID();
 
                if (empty($parameters['id'])) {

diff --git a/src/Module/Api/Mastodon/Accounts/Follow.php b/src/Module/Api/Mastodon/Accounts/Follow.php
index d877629fb5f6ae8f202cf068dacb1ed20d7c036b..ab7038e979af932927ffefcee91b69092172a891 100644 (file)
--- a/src/Module/Api/Mastodon/Accounts/Follow.php
+++ b/src/Module/Api/Mastodon/Accounts/Follow.php
@@ -33,7 +33,7 @@ class Follow extends BaseApi
 {
        public static function post(array $parameters = [])
        {
-               self::login(self::SCOPE_FOLLOW);
+               self::checkAllowedScope(self::SCOPE_FOLLOW);
                $uid = self::getCurrentUserID();
 
                if (empty($parameters['id'])) {

diff --git a/src/Module/Api/Mastodon/Accounts/Followers.php b/src/Module/Api/Mastodon/Accounts/Followers.php
index c311b693e45d69d07726c88475f60b91c5ff0677..666cafc4205f84c946db666ce63e95dee7e633b9 100644 (file)
--- a/src/Module/Api/Mastodon/Accounts/Followers.php
+++ b/src/Module/Api/Mastodon/Accounts/Followers.php
@@ -37,7 +37,7 @@ class Followers extends BaseApi
         */
        public static function rawContent(array $parameters = [])
        {
-               self::login(self::SCOPE_READ);
+               self::checkAllowedScope(self::SCOPE_READ);
                $uid = self::getCurrentUserID();
 
                if (empty($parameters['id'])) {

diff --git a/src/Module/Api/Mastodon/Accounts/Following.php b/src/Module/Api/Mastodon/Accounts/Following.php
index 53908b36bffb8c5dcad6bca831d9e79a9847e161..c967715dfcd0fc17ffd9945168fcd0551ef54b61 100644 (file)
--- a/src/Module/Api/Mastodon/Accounts/Following.php
+++ b/src/Module/Api/Mastodon/Accounts/Following.php
@@ -37,7 +37,7 @@ class Following extends BaseApi
         */
        public static function rawContent(array $parameters = [])
        {
-               self::login(self::SCOPE_READ);
+               self::checkAllowedScope(self::SCOPE_READ);
                $uid = self::getCurrentUserID();
 
                if (empty($parameters['id'])) {

diff --git a/src/Module/Api/Mastodon/Accounts/IdentityProofs.php b/src/Module/Api/Mastodon/Accounts/IdentityProofs.php
index f92de6cada18f3255bae148226a4e3351da74408..6abb416d1db3729b1aed2f496c12e3c26a039d24 100644 (file)
--- a/src/Module/Api/Mastodon/Accounts/IdentityProofs.php
+++ b/src/Module/Api/Mastodon/Accounts/IdentityProofs.php
@@ -35,7 +35,7 @@ class IdentityProofs extends BaseApi
         */
        public static function rawContent(array $parameters = [])
        {
-               self::login(self::SCOPE_READ);
+               self::checkAllowedScope(self::SCOPE_READ);
 
                System::jsonExit([]);
        }

diff --git a/src/Module/Api/Mastodon/Accounts/Lists.php b/src/Module/Api/Mastodon/Accounts/Lists.php
index 6a3e87b42608021ab46f4704451e3995716cbfe1..b962594ff7874786d4be2cd512302d56f3fa7cd1 100644 (file)
--- a/src/Module/Api/Mastodon/Accounts/Lists.php
+++ b/src/Module/Api/Mastodon/Accounts/Lists.php
@@ -38,7 +38,7 @@ class Lists extends BaseApi
         */
        public static function rawContent(array $parameters = [])
        {
-               self::login(self::SCOPE_READ);
+               self::checkAllowedScope(self::SCOPE_READ);
                $uid = self::getCurrentUserID();
 
                if (empty($parameters['id'])) {

diff --git a/src/Module/Api/Mastodon/Accounts/Mute.php b/src/Module/Api/Mastodon/Accounts/Mute.php
index 19413bacfc200f31d6594e36184738660067aee7..1d878269dcfffe43a442c24720bdf740ac318662 100644 (file)
--- a/src/Module/Api/Mastodon/Accounts/Mute.php
+++ b/src/Module/Api/Mastodon/Accounts/Mute.php
@@ -33,7 +33,7 @@ class Mute extends BaseApi
 {
        public static function post(array $parameters = [])
        {
-               self::login(self::SCOPE_FOLLOW);
+               self::checkAllowedScope(self::SCOPE_FOLLOW);
                $uid = self::getCurrentUserID();
 
                if (empty($parameters['id'])) {

diff --git a/src/Module/Api/Mastodon/Accounts/Note.php b/src/Module/Api/Mastodon/Accounts/Note.php
index 477bcb824618b69796a98623252093eb4e0e7833..f78d58bac5a95493549ad054d41e5e27459bf681 100644 (file)
--- a/src/Module/Api/Mastodon/Accounts/Note.php
+++ b/src/Module/Api/Mastodon/Accounts/Note.php
@@ -34,7 +34,7 @@ class Note extends BaseApi
 {
        public static function post(array $parameters = [])
        {
-               self::login(self::SCOPE_WRITE);
+               self::checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();
 
                if (empty($parameters['id'])) {

diff --git a/src/Module/Api/Mastodon/Accounts/Relationships.php b/src/Module/Api/Mastodon/Accounts/Relationships.php
index 9e966d2152bd36d1afec641b47ff2ca470f07984..12d5f2e660be71f53f87ffa081ec45e3511cf6a9 100644 (file)
--- a/src/Module/Api/Mastodon/Accounts/Relationships.php
+++ b/src/Module/Api/Mastodon/Accounts/Relationships.php
@@ -37,7 +37,7 @@ class Relationships extends BaseApi
         */
        public static function rawContent(array $parameters = [])
        {
-               self::login(self::SCOPE_READ);
+               self::checkAllowedScope(self::SCOPE_READ);
                $uid = self::getCurrentUserID();
 
                $request = self::getRequest([

diff --git a/src/Module/Api/Mastodon/Accounts/Search.php b/src/Module/Api/Mastodon/Accounts/Search.php
index cb565ef73417a0cbc7e55fe65860fc849e0ab16e..c31189a4244f20c8e0dec88a57dc15acbba126f3 100644 (file)
--- a/src/Module/Api/Mastodon/Accounts/Search.php
+++ b/src/Module/Api/Mastodon/Accounts/Search.php
@@ -40,7 +40,7 @@ class Search extends BaseApi
         */
        public static function rawContent(array $parameters = [])
        {
-               self::login(self::SCOPE_READ);
+               self::checkAllowedScope(self::SCOPE_READ);
                $uid = self::getCurrentUserID();
 
                $request = self::getRequest([

diff --git a/src/Module/Api/Mastodon/Accounts/Unblock.php b/src/Module/Api/Mastodon/Accounts/Unblock.php
index 14152c458f51947a7033f989a64471cbfe860116..b1c93ea3622c5b8f2c4cba454d318e046e4315e3 100644 (file)
--- a/src/Module/Api/Mastodon/Accounts/Unblock.php
+++ b/src/Module/Api/Mastodon/Accounts/Unblock.php
@@ -33,7 +33,7 @@ class Unblock extends BaseApi
 {
        public static function post(array $parameters = [])
        {
-               self::login(self::SCOPE_FOLLOW);
+               self::checkAllowedScope(self::SCOPE_FOLLOW);
                $uid = self::getCurrentUserID();
 
                if (empty($parameters['id'])) {

diff --git a/src/Module/Api/Mastodon/Accounts/Unfollow.php b/src/Module/Api/Mastodon/Accounts/Unfollow.php
index 2d00ea45531539571a25456600da0f12a58d7cb1..447b1cd652de9b5b0f2148b3f9bd644e66b42ec4 100644 (file)
--- a/src/Module/Api/Mastodon/Accounts/Unfollow.php
+++ b/src/Module/Api/Mastodon/Accounts/Unfollow.php
@@ -33,7 +33,7 @@ class Unfollow extends BaseApi
 {
        public static function post(array $parameters = [])
        {
-               self::login(self::SCOPE_FOLLOW);
+               self::checkAllowedScope(self::SCOPE_FOLLOW);
                $uid = self::getCurrentUserID();
 
                if (empty($parameters['id'])) {

diff --git a/src/Module/Api/Mastodon/Accounts/Unmute.php b/src/Module/Api/Mastodon/Accounts/Unmute.php
index 4b8111956ed4d1dca2ecceea98306407ceb307a3..bc2e50be9145c4ed117521e7040b4add9c74c7db 100644 (file)
--- a/src/Module/Api/Mastodon/Accounts/Unmute.php
+++ b/src/Module/Api/Mastodon/Accounts/Unmute.php
@@ -33,7 +33,7 @@ class Unmute extends BaseApi
 {
        public static function post(array $parameters = [])
        {
-               self::login(self::SCOPE_FOLLOW);
+               self::checkAllowedScope(self::SCOPE_FOLLOW);
                $uid = self::getCurrentUserID();
 
                if (empty($parameters['id'])) {

diff --git a/src/Module/Api/Mastodon/Accounts/UpdateCredentials.php b/src/Module/Api/Mastodon/Accounts/UpdateCredentials.php
index b2a23cf424bd0b0a12ef97dbac5397c0e71a891a..d609cdaaebc0faf9a73c13cae98ba242d71e25fe 100644 (file)
--- a/src/Module/Api/Mastodon/Accounts/UpdateCredentials.php
+++ b/src/Module/Api/Mastodon/Accounts/UpdateCredentials.php
@@ -32,7 +32,7 @@ class UpdateCredentials extends BaseApi
 {
        public static function patch(array $parameters = [])
        {
-               self::login(self::SCOPE_WRITE);
+               self::checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();
 
                $data = HTTPInputData::process();

diff --git a/src/Module/Api/Mastodon/Accounts/VerifyCredentials.php b/src/Module/Api/Mastodon/Accounts/VerifyCredentials.php
index 84945e1e2f0bd5fcfe26bd9c59bcac1b6a01f8a4..295cbf2afe9090a82319d061d9223734d1dea3f4 100644 (file)
--- a/src/Module/Api/Mastodon/Accounts/VerifyCredentials.php
+++ b/src/Module/Api/Mastodon/Accounts/VerifyCredentials.php
@@ -38,7 +38,7 @@ class VerifyCredentials extends BaseApi
         */
        public static function rawContent(array $parameters = [])
        {
-               self::login(self::SCOPE_READ);
+               self::checkAllowedScope(self::SCOPE_READ);
                $uid = self::getCurrentUserID();
 
                $self = User::getOwnerDataById($uid);

diff --git a/src/Module/Api/Mastodon/Announcements.php b/src/Module/Api/Mastodon/Announcements.php
index e9445c12761581f40eba8a2ebeccff5489d61f79..5a414fda10f2309ca69c15421f55832b71a9df3e 100644 (file)
--- a/src/Module/Api/Mastodon/Announcements.php
+++ b/src/Module/Api/Mastodon/Announcements.php
@@ -35,7 +35,7 @@ class Announcements extends BaseApi
         */
        public static function rawContent(array $parameters = [])
        {
-               self::login(self::SCOPE_READ);
+               self::checkAllowedScope(self::SCOPE_READ);
 
                // @todo Possibly use the message from the pageheader addon for this
                System::jsonExit([]);

diff --git a/src/Module/Api/Mastodon/Apps/VerifyCredentials.php b/src/Module/Api/Mastodon/Apps/VerifyCredentials.php
index eff0b80b3dd484ecb472eb0758204db3a3a18299..eee15bc2abd043b85075d871bbcfaf4d5def41f9 100644 (file)
--- a/src/Module/Api/Mastodon/Apps/VerifyCredentials.php
+++ b/src/Module/Api/Mastodon/Apps/VerifyCredentials.php
@@ -32,7 +32,7 @@ class VerifyCredentials extends BaseApi
 {
        public static function rawContent(array $parameters = [])
        {
-               self::login(self::SCOPE_READ);
+               self::checkAllowedScope(self::SCOPE_READ);
                $application = self::getCurrentApplication();
 
                if (empty($application['id'])) {

diff --git a/src/Module/Api/Mastodon/Blocks.php b/src/Module/Api/Mastodon/Blocks.php
index 651589f649955d80fcf541419d77083225d0080f..d92b6059d3b3abd81a6dd55db0ca3a5dae54e11d 100644 (file)
--- a/src/Module/Api/Mastodon/Blocks.php
+++ b/src/Module/Api/Mastodon/Blocks.php
@@ -37,7 +37,7 @@ class Blocks extends BaseApi
         */
        public static function rawContent(array $parameters = [])
        {
-               self::login(self::SCOPE_READ);
+               self::checkAllowedScope(self::SCOPE_READ);
                $uid = self::getCurrentUserID();
 
                if (empty($parameters['id'])) {

diff --git a/src/Module/Api/Mastodon/Bookmarks.php b/src/Module/Api/Mastodon/Bookmarks.php
index d5e6b7af48d8a6d65085cc87894512461f7529f4..7e298d120fb18f2633a2aa02a462048f8d1ac45d 100644 (file)
--- a/src/Module/Api/Mastodon/Bookmarks.php
+++ b/src/Module/Api/Mastodon/Bookmarks.php
@@ -39,7 +39,7 @@ class Bookmarks extends BaseApi
         */
        public static function rawContent(array $parameters = [])
        {
-               self::login(self::SCOPE_READ);
+               self::checkAllowedScope(self::SCOPE_READ);
                $uid = self::getCurrentUserID();
 
                $request = self::getRequest([

diff --git a/src/Module/Api/Mastodon/Conversations.php b/src/Module/Api/Mastodon/Conversations.php
index 3b4496a01234cee08696c393a59b0a469eecc321..0340478c6b1ac07fe0658437e5ca86b36e1ad93a 100644 (file)
--- a/src/Module/Api/Mastodon/Conversations.php
+++ b/src/Module/Api/Mastodon/Conversations.php
@@ -33,7 +33,7 @@ class Conversations extends BaseApi
 {
        public static function delete(array $parameters = [])
        {
-               self::login(self::SCOPE_WRITE);
+               self::checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();
 
                if (!empty($parameters['id'])) {
@@ -52,7 +52,7 @@ class Conversations extends BaseApi
         */
        public static function rawContent(array $parameters = [])
        {
-               self::login(self::SCOPE_READ);
+               self::checkAllowedScope(self::SCOPE_READ);
                $uid = self::getCurrentUserID();
 
                $request = self::getRequest([

diff --git a/src/Module/Api/Mastodon/Conversations/Read.php b/src/Module/Api/Mastodon/Conversations/Read.php
index 955ca5c96f39fd0dc32f70a0c102389fb68c7e9d..c469eea3464dc3148cd2581c279cb15eabb80231 100644 (file)
--- a/src/Module/Api/Mastodon/Conversations/Read.php
+++ b/src/Module/Api/Mastodon/Conversations/Read.php
@@ -33,7 +33,7 @@ class Read extends BaseApi
 {
        public static function post(array $parameters = [])
        {
-               self::login(self::SCOPE_WRITE);
+               self::checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();
 
                if (!empty($parameters['id'])) {

diff --git a/src/Module/Api/Mastodon/Favourited.php b/src/Module/Api/Mastodon/Favourited.php
index 2b01c95fc9a4ac37719902f343e4f342b9a38766..69b102a276494bd2b71e6d0186add9d293e54be4 100644 (file)
--- a/src/Module/Api/Mastodon/Favourited.php
+++ b/src/Module/Api/Mastodon/Favourited.php
@@ -40,7 +40,7 @@ class Favourited extends BaseApi
         */
        public static function rawContent(array $parameters = [])
        {
-               self::login(self::SCOPE_READ);
+               self::checkAllowedScope(self::SCOPE_READ);
                $uid = self::getCurrentUserID();
 
                // @todo provide HTTP link header

diff --git a/src/Module/Api/Mastodon/Filters.php b/src/Module/Api/Mastodon/Filters.php
index 81794e679c2aca0b255327f551c4edf868586b4c..6c150664785014f7347748c7d8ae2ef32d744903 100644 (file)
--- a/src/Module/Api/Mastodon/Filters.php
+++ b/src/Module/Api/Mastodon/Filters.php
@@ -31,7 +31,7 @@ class Filters extends BaseApi
 {
        public static function post(array $parameters = [])
        {
-               self::login(self::SCOPE_WRITE);
+               self::checkAllowedScope(self::SCOPE_WRITE);
 
                self::unsupported('post');
        }
@@ -42,7 +42,7 @@ class Filters extends BaseApi
         */
        public static function rawContent(array $parameters = [])
        {
-               self::login(self::SCOPE_READ);
+               self::checkAllowedScope(self::SCOPE_READ);
 
                System::jsonExit([]);
        }

diff --git a/src/Module/Api/Mastodon/FollowRequests.php b/src/Module/Api/Mastodon/FollowRequests.php
index 5b8e9f092095bb4ebd6065d1b74e8345cc8087c8..4628738456cb1a3194f313941b8911160261837a 100644 (file)
--- a/src/Module/Api/Mastodon/FollowRequests.php
+++ b/src/Module/Api/Mastodon/FollowRequests.php
@@ -45,7 +45,7 @@ class FollowRequests extends BaseApi
         */
        public static function post(array $parameters = [])
        {
-               self::login(self::SCOPE_FOLLOW);
+               self::checkAllowedScope(self::SCOPE_FOLLOW);
                $uid = self::getCurrentUserID();
 
                $introduction = DI::intro()->selectFirst(['id' => $parameters['id'], 'uid' => $uid]);
@@ -83,7 +83,7 @@ class FollowRequests extends BaseApi
         */
        public static function rawContent(array $parameters = [])
        {
-               self::login(self::SCOPE_READ);
+               self::checkAllowedScope(self::SCOPE_READ);
                $uid = self::getCurrentUserID();
 
                $request = self::getRequest([

diff --git a/src/Module/Api/Mastodon/Lists.php b/src/Module/Api/Mastodon/Lists.php
index 2d7fea3dd5ae02fbdc5037454080e28915a0194e..8be4207eae5bd5c184c2671d9f02cd0936e7b159 100644 (file)
--- a/src/Module/Api/Mastodon/Lists.php
+++ b/src/Module/Api/Mastodon/Lists.php
@@ -33,7 +33,7 @@ class Lists extends BaseApi
 {
        public static function delete(array $parameters = [])
        {
-               self::login(self::SCOPE_WRITE);
+               self::checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();
 
                if (empty($parameters['id'])) {
@@ -53,7 +53,7 @@ class Lists extends BaseApi
 
        public static function post(array $parameters = [])
        {
-               self::login(self::SCOPE_WRITE);
+               self::checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();
 
                $request = self::getRequest([
@@ -94,7 +94,7 @@ class Lists extends BaseApi
         */
        public static function rawContent(array $parameters = [])
        {
-               self::login(self::SCOPE_READ);
+               self::checkAllowedScope(self::SCOPE_READ);
                $uid = self::getCurrentUserID();
 
                if (empty($parameters['id'])) {

diff --git a/src/Module/Api/Mastodon/Lists/Accounts.php b/src/Module/Api/Mastodon/Lists/Accounts.php
index 924f114af9686565de0a4af87b7d4f9706ef5a10..21f85f316006838bcdb7391ec2820b12f33df4f6 100644 (file)
--- a/src/Module/Api/Mastodon/Lists/Accounts.php
+++ b/src/Module/Api/Mastodon/Lists/Accounts.php
@@ -49,7 +49,7 @@ class Accounts extends BaseApi
         */
        public static function rawContent(array $parameters = [])
        {
-               self::login(self::SCOPE_READ);
+               self::checkAllowedScope(self::SCOPE_READ);
                $uid = self::getCurrentUserID();
 
                if (empty($parameters['id'])) {

diff --git a/src/Module/Api/Mastodon/Markers.php b/src/Module/Api/Mastodon/Markers.php
index dc294901758944ed6944465a34ed206c26687ca9..a3a3879e0736a83042ee5d3db25f82480c043bab 100644 (file)
--- a/src/Module/Api/Mastodon/Markers.php
+++ b/src/Module/Api/Mastodon/Markers.php
@@ -31,7 +31,7 @@ class Markers extends BaseApi
 {
        public static function post(array $parameters = [])
        {
-               self::login(self::SCOPE_WRITE);
+               self::checkAllowedScope(self::SCOPE_WRITE);
 
                self::unsupported('post');
        }
@@ -42,7 +42,7 @@ class Markers extends BaseApi
         */
        public static function rawContent(array $parameters = [])
        {
-               self::login(self::SCOPE_READ);
+               self::checkAllowedScope(self::SCOPE_READ);
 
                System::jsonExit([]);
        }

diff --git a/src/Module/Api/Mastodon/Media.php b/src/Module/Api/Mastodon/Media.php
index f232cd3d5ea76e26a8114aff0eae5c617746b5c5..b93a06288f72f695edca2e66d6029616e2777ecb 100644 (file)
--- a/src/Module/Api/Mastodon/Media.php
+++ b/src/Module/Api/Mastodon/Media.php
@@ -34,7 +34,7 @@ class Media extends BaseApi
 {
        public static function post(array $parameters = [])
        {
-               self::login(self::SCOPE_WRITE);
+               self::checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();
 
                Logger::info('Photo post', ['request' => $_REQUEST, 'files' => $_FILES]);
@@ -55,7 +55,7 @@ class Media extends BaseApi
 
        public static function put(array $parameters = [])
        {
-               self::login(self::SCOPE_WRITE);
+               self::checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();
 
                $request = self::getRequest([
@@ -85,7 +85,7 @@ class Media extends BaseApi
         */
        public static function rawContent(array $parameters = [])
        {
-               self::login(self::SCOPE_READ);
+               self::checkAllowedScope(self::SCOPE_READ);
                $uid = self::getCurrentUserID();
 
                if (empty($parameters['id'])) {

diff --git a/src/Module/Api/Mastodon/Mutes.php b/src/Module/Api/Mastodon/Mutes.php
index f0c225f1889649289806f91893f2f279ef5c0ca3..469f3e0e61262dfa4c4d28237fa563e7787d18dd 100644 (file)
--- a/src/Module/Api/Mastodon/Mutes.php
+++ b/src/Module/Api/Mastodon/Mutes.php
@@ -37,7 +37,7 @@ class Mutes extends BaseApi
         */
        public static function rawContent(array $parameters = [])
        {
-               self::login(self::SCOPE_READ);
+               self::checkAllowedScope(self::SCOPE_READ);
                $uid = self::getCurrentUserID();
 
                if (empty($parameters['id'])) {

diff --git a/src/Module/Api/Mastodon/Notifications.php b/src/Module/Api/Mastodon/Notifications.php
index 842b85352f770ab62831b13e812a66a9a054d50d..cf2a9827c2bcef7dd6872f4e34132889ea71ce6d 100644 (file)
--- a/src/Module/Api/Mastodon/Notifications.php
+++ b/src/Module/Api/Mastodon/Notifications.php
@@ -41,7 +41,7 @@ class Notifications extends BaseApi
         */
        public static function rawContent(array $parameters = [])
        {
-               self::login(self::SCOPE_READ);
+               self::checkAllowedScope(self::SCOPE_READ);
                $uid = self::getCurrentUserID();
 
                if (!empty($parameters['id'])) {

diff --git a/src/Module/Api/Mastodon/Notifications/Clear.php b/src/Module/Api/Mastodon/Notifications/Clear.php
index b6961eb5320f408b99c75d1ed4f407fc576f2e11..5471dc24e6084197d25fdafc84836a6dec6193e2 100644 (file)
--- a/src/Module/Api/Mastodon/Notifications/Clear.php
+++ b/src/Module/Api/Mastodon/Notifications/Clear.php
@@ -32,7 +32,7 @@ class Clear extends BaseApi
 {
        public static function post(array $parameters = [])
        {
-               self::login(self::SCOPE_WRITE);
+               self::checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();
 
                DBA::update('notification', ['seen' => true], ['uid' => $uid]);

diff --git a/src/Module/Api/Mastodon/Notifications/Dismiss.php b/src/Module/Api/Mastodon/Notifications/Dismiss.php
index 4c8d3deb9a1bc3b7585ea7eb42d528140c67a816..8900a2d43f9eff288595e0b76259b0583962851e 100644 (file)
--- a/src/Module/Api/Mastodon/Notifications/Dismiss.php
+++ b/src/Module/Api/Mastodon/Notifications/Dismiss.php
@@ -33,7 +33,7 @@ class Dismiss extends BaseApi
 {
        public static function post(array $parameters = [])
        {
-               self::login(self::SCOPE_WRITE);
+               self::checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();
 
                if (empty($parameters['id'])) {

diff --git a/src/Module/Api/Mastodon/Preferences.php b/src/Module/Api/Mastodon/Preferences.php
index f6eef4c79a3e39c7bc16b264b4c1b91176631138..8ac70e75996fbd0ea08bad834fe09138006ceb4c 100644 (file)
--- a/src/Module/Api/Mastodon/Preferences.php
+++ b/src/Module/Api/Mastodon/Preferences.php
@@ -37,7 +37,7 @@ class Preferences extends BaseApi
         */
        public static function rawContent(array $parameters = [])
        {
-               self::login(self::SCOPE_READ);
+               self::checkAllowedScope(self::SCOPE_READ);
                $uid = self::getCurrentUserID();
 
                $user = User::getById($uid, ['language', 'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid']);

diff --git a/src/Module/Api/Mastodon/Search.php b/src/Module/Api/Mastodon/Search.php
index 6bac5779cebfed18cac471ca9ab33d6444e8a20c..4ef4292f8b2486b614489683561ba54e7903409e 100644 (file)
--- a/src/Module/Api/Mastodon/Search.php
+++ b/src/Module/Api/Mastodon/Search.php
@@ -43,7 +43,7 @@ class Search extends BaseApi
         */
        public static function rawContent(array $parameters = [])
        {
-               self::login(self::SCOPE_READ);
+               self::checkAllowedScope(self::SCOPE_READ);
                $uid = self::getCurrentUserID();
 
                $request = self::getRequest([

diff --git a/src/Module/Api/Mastodon/Statuses.php b/src/Module/Api/Mastodon/Statuses.php
index f2ff792dbc2e133d4e536a870b7ff7a4ea344e99..77915cab27d9dbb0edd18c90c8a90c396efea24c 100644 (file)
--- a/src/Module/Api/Mastodon/Statuses.php
+++ b/src/Module/Api/Mastodon/Statuses.php
@@ -43,7 +43,7 @@ class Statuses extends BaseApi
 {
        public static function post(array $parameters = [])
        {
-               self::login(self::SCOPE_WRITE);
+               self::checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();
 
                $request = self::getRequest([
@@ -194,7 +194,7 @@ class Statuses extends BaseApi
 
        public static function delete(array $parameters = [])
        {
-               self::login(self::SCOPE_READ);
+               self::checkAllowedScope(self::SCOPE_READ);
                $uid = self::getCurrentUserID();
 
                if (empty($parameters['id'])) {

diff --git a/src/Module/Api/Mastodon/Statuses/Bookmark.php b/src/Module/Api/Mastodon/Statuses/Bookmark.php
index cd59337c38b69071fc82e67bf45ad7c22133f403..79be11a4a2dab2c302481a2e376bcc0396f44669 100644 (file)
--- a/src/Module/Api/Mastodon/Statuses/Bookmark.php
+++ b/src/Module/Api/Mastodon/Statuses/Bookmark.php
@@ -35,7 +35,7 @@ class Bookmark extends BaseApi
 {
        public static function post(array $parameters = [])
        {
-               self::login(self::SCOPE_WRITE);
+               self::checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();
 
                if (empty($parameters['id'])) {

diff --git a/src/Module/Api/Mastodon/Statuses/Favourite.php b/src/Module/Api/Mastodon/Statuses/Favourite.php
index 006e066170f4ae130eea9f9b4bc775164a6db897..a30ad0fe78e63906e20de11856d16490f34c9e95 100644 (file)
--- a/src/Module/Api/Mastodon/Statuses/Favourite.php
+++ b/src/Module/Api/Mastodon/Statuses/Favourite.php
@@ -35,7 +35,7 @@ class Favourite extends BaseApi
 {
        public static function post(array $parameters = [])
        {
-               self::login(self::SCOPE_WRITE);
+               self::checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();
 
                if (empty($parameters['id'])) {

diff --git a/src/Module/Api/Mastodon/Statuses/Mute.php b/src/Module/Api/Mastodon/Statuses/Mute.php
index ff724ed53e659f085b6f5a188fa5ac8a45ec9d9e..812daff4d4861a569d9718cc4261b12388f02fa5 100644 (file)
--- a/src/Module/Api/Mastodon/Statuses/Mute.php
+++ b/src/Module/Api/Mastodon/Statuses/Mute.php
@@ -34,7 +34,7 @@ class Mute extends BaseApi
 {
        public static function post(array $parameters = [])
        {
-               self::login(self::SCOPE_WRITE);
+               self::checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();
 
                if (empty($parameters['id'])) {

diff --git a/src/Module/Api/Mastodon/Statuses/Pin.php b/src/Module/Api/Mastodon/Statuses/Pin.php
index 43cc0e0cd4bf545c762a98e07beeba6790c54e3d..1d5498167e3ab33e3848e880a0b9f3153cc6b400 100644 (file)
--- a/src/Module/Api/Mastodon/Statuses/Pin.php
+++ b/src/Module/Api/Mastodon/Statuses/Pin.php
@@ -34,7 +34,7 @@ class Pin extends BaseApi
 {
        public static function post(array $parameters = [])
        {
-               self::login(self::SCOPE_WRITE);
+               self::checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();
 
                if (empty($parameters['id'])) {

diff --git a/src/Module/Api/Mastodon/Statuses/Reblog.php b/src/Module/Api/Mastodon/Statuses/Reblog.php
index d0194a3127d7b5559f4cb482591b1c2037e2c851..1af7efb827a7e6fb0f4c4d947f01e3aa4df4b59f 100644 (file)
--- a/src/Module/Api/Mastodon/Statuses/Reblog.php
+++ b/src/Module/Api/Mastodon/Statuses/Reblog.php
@@ -37,7 +37,7 @@ class Reblog extends BaseApi
 {
        public static function post(array $parameters = [])
        {
-               self::login(self::SCOPE_WRITE);
+               self::checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();
 
                if (empty($parameters['id'])) {

diff --git a/src/Module/Api/Mastodon/Statuses/Unbookmark.php b/src/Module/Api/Mastodon/Statuses/Unbookmark.php
index bf8a3c6e25695c408cc063b78053e023aec6192f..f65b07a345037b3862795cc5a2210ec3dcd156bb 100644 (file)
--- a/src/Module/Api/Mastodon/Statuses/Unbookmark.php
+++ b/src/Module/Api/Mastodon/Statuses/Unbookmark.php
@@ -35,7 +35,7 @@ class Unbookmark extends BaseApi
 {
        public static function post(array $parameters = [])
        {
-               self::login(self::SCOPE_WRITE);
+               self::checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();
 
                if (empty($parameters['id'])) {

diff --git a/src/Module/Api/Mastodon/Statuses/Unfavourite.php b/src/Module/Api/Mastodon/Statuses/Unfavourite.php
index 72efdc0a748d4b1e1ae4c28e005d6ea85dd4dd90..b3fee36822197be4c92fe0a6a218b48c7d597550 100644 (file)
--- a/src/Module/Api/Mastodon/Statuses/Unfavourite.php
+++ b/src/Module/Api/Mastodon/Statuses/Unfavourite.php
@@ -35,7 +35,7 @@ class Unfavourite extends BaseApi
 {
        public static function post(array $parameters = [])
        {
-               self::login(self::SCOPE_WRITE);
+               self::checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();
 
                if (empty($parameters['id'])) {

diff --git a/src/Module/Api/Mastodon/Statuses/Unmute.php b/src/Module/Api/Mastodon/Statuses/Unmute.php
index 531fe6235d6088aee67fa424c7c66a2f873341cf..ee9b85cc4b41cea7ed01a411b553da5686b4f115 100644 (file)
--- a/src/Module/Api/Mastodon/Statuses/Unmute.php
+++ b/src/Module/Api/Mastodon/Statuses/Unmute.php
@@ -34,7 +34,7 @@ class Unmute extends BaseApi
 {
        public static function post(array $parameters = [])
        {
-               self::login(self::SCOPE_WRITE);
+               self::checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();
 
                if (empty($parameters['id'])) {

diff --git a/src/Module/Api/Mastodon/Statuses/Unpin.php b/src/Module/Api/Mastodon/Statuses/Unpin.php
index 874be0cc37d10f5c0b8a50fa11572f9f02ec0fc2..1f4195cca391023140a4cdeba34caa5b6dd90916 100644 (file)
--- a/src/Module/Api/Mastodon/Statuses/Unpin.php
+++ b/src/Module/Api/Mastodon/Statuses/Unpin.php
@@ -34,7 +34,7 @@ class Unpin extends BaseApi
 {
        public static function post(array $parameters = [])
        {
-               self::login(self::SCOPE_WRITE);
+               self::checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();
 
                if (empty($parameters['id'])) {

diff --git a/src/Module/Api/Mastodon/Statuses/Unreblog.php b/src/Module/Api/Mastodon/Statuses/Unreblog.php
index 259ecfd2fc7738166bdbede46304939c1cc13dff..9450e0f4136af5888fd80bb2a8cd7179429c9e1a 100644 (file)
--- a/src/Module/Api/Mastodon/Statuses/Unreblog.php
+++ b/src/Module/Api/Mastodon/Statuses/Unreblog.php
@@ -37,7 +37,7 @@ class Unreblog extends BaseApi
 {
        public static function post(array $parameters = [])
        {
-               self::login(self::SCOPE_WRITE);
+               self::checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();
 
                if (empty($parameters['id'])) {

diff --git a/src/Module/Api/Mastodon/Suggestions.php b/src/Module/Api/Mastodon/Suggestions.php
index 27c64decdad2ac4372141b2e8d02503f5d15b43f..e0bb75b2de549a52f7a20f2771f20c26c437ecc2 100644 (file)
--- a/src/Module/Api/Mastodon/Suggestions.php
+++ b/src/Module/Api/Mastodon/Suggestions.php
@@ -37,7 +37,7 @@ class Suggestions extends BaseApi
         */
        public static function rawContent(array $parameters = [])
        {
-               self::login(self::SCOPE_READ);
+               self::checkAllowedScope(self::SCOPE_READ);
                $uid = self::getCurrentUserID();
 
                $request = self::getRequest([

diff --git a/src/Module/Api/Mastodon/Timelines/Direct.php b/src/Module/Api/Mastodon/Timelines/Direct.php
index 050bcbf478cab84336cfc44c6caa796fd19b6536..adf677c72f0adb9d8484460540711f45f8a583b8 100644 (file)
--- a/src/Module/Api/Mastodon/Timelines/Direct.php
+++ b/src/Module/Api/Mastodon/Timelines/Direct.php
@@ -38,7 +38,7 @@ class Direct extends BaseApi
         */
        public static function rawContent(array $parameters = [])
        {
-               self::login(self::SCOPE_READ);
+               self::checkAllowedScope(self::SCOPE_READ);
                $uid = self::getCurrentUserID();
 
                $request = self::getRequest([

diff --git a/src/Module/Api/Mastodon/Timelines/Home.php b/src/Module/Api/Mastodon/Timelines/Home.php
index 0c955b1c7e30bd87fd1cc28f0f8d83aab4b04b21..63d40e8440ad899e36058c6b8cb256e3e9ea305e 100644 (file)
--- a/src/Module/Api/Mastodon/Timelines/Home.php
+++ b/src/Module/Api/Mastodon/Timelines/Home.php
@@ -39,7 +39,7 @@ class Home extends BaseApi
         */
        public static function rawContent(array $parameters = [])
        {
-               self::login(self::SCOPE_READ);
+               self::checkAllowedScope(self::SCOPE_READ);
                $uid = self::getCurrentUserID();
 
                $request = self::getRequest([

diff --git a/src/Module/Api/Mastodon/Timelines/ListTimeline.php b/src/Module/Api/Mastodon/Timelines/ListTimeline.php
index e5bf9d76f12f4ab044edf5240e951216d2737efc..22b2be3bc806c891dad21cab1fb6574f3bf300fd 100644 (file)
--- a/src/Module/Api/Mastodon/Timelines/ListTimeline.php
+++ b/src/Module/Api/Mastodon/Timelines/ListTimeline.php
@@ -39,7 +39,7 @@ class ListTimeline extends BaseApi
         */
        public static function rawContent(array $parameters = [])
        {
-               self::login(self::SCOPE_READ);
+               self::checkAllowedScope(self::SCOPE_READ);
                $uid = self::getCurrentUserID();
 
                if (empty($parameters['id'])) {

diff --git a/src/Module/Api/Mastodon/Timelines/Tag.php b/src/Module/Api/Mastodon/Timelines/Tag.php
index 74a5bb90141774970bc44ba1c005f337a2d69dc6..56697f2f586f43dcaeb252561ab7625cae68e081 100644 (file)
--- a/src/Module/Api/Mastodon/Timelines/Tag.php
+++ b/src/Module/Api/Mastodon/Timelines/Tag.php
@@ -40,7 +40,7 @@ class Tag extends BaseApi
         */
        public static function rawContent(array $parameters = [])
        {
-               self::login(self::SCOPE_READ);
+               self::checkAllowedScope(self::SCOPE_READ);
                $uid = self::getCurrentUserID();
 
                if (empty($parameters['hashtag'])) {

diff --git a/src/Module/Api/Twitter/ContactEndpoint.php b/src/Module/Api/Twitter/ContactEndpoint.php
index b184aa53f49789fcaac47963826d5c090b4c84e9..4641bf813f12221ce099c0338107588699a8af90 100644 (file)
--- a/src/Module/Api/Twitter/ContactEndpoint.php
+++ b/src/Module/Api/Twitter/ContactEndpoint.php
@@ -39,7 +39,7 @@ abstract class ContactEndpoint extends BaseApi
        {
                parent::init($parameters);
 
-               self::login(self::SCOPE_READ);
+               self::checkAllowedScope(self::SCOPE_READ);
        }
 
        /**

diff --git a/src/Module/BaseApi.php b/src/Module/BaseApi.php
index 505969361899e9a9d7cab9d05750a978642054d9..adad7636a775ed5ce8bbc2fdd5bafbc85e5f5e7a 100644 (file)
--- a/src/Module/BaseApi.php
+++ b/src/Module/BaseApi.php
@@ -168,17 +168,6 @@ class BaseApi extends BaseModule
                return $request;
        }
 
-       /**
-        * @deprecated Use checkAllowedScope instead
-        * Log in user via OAuth or Basic HTTP Auth.
-        *
-        * @param string $scope the requested scope (read, write, follow)
-        */
-       protected static function login(string $scope)
-       {
-               self::checkAllowedScope($scope);
-       }
-
        /**
         * Get current application token
         *