| 
								
								
									 Ivan Tashkinov | 10ff01acd9 | [#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP. | 2019-10-16 21:59:21 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 06b3bb54c5 | Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes # Conflicts:
#	CHANGELOG.md
#	lib/pleroma/web/mastodon_api/controllers/account_controller.ex
#	lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
#	lib/pleroma/web/router.ex | 2019-10-06 11:43:49 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 64095961fe | [#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes # Conflicts:
#	CHANGELOG.md
#	lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
#	lib/pleroma/web/router.ex | 2019-10-02 20:42:40 +03:00 |  | 
				
					
						| 
								
								
									 Maxim Filippov | 0f9c2c8b87 | Send an identifier alongside with error message in OAuthController | 2019-10-01 18:10:04 +03:00 |  | 
				
					
						| 
								
								
									 Maksim Pechnikov | 3d722dc200 | Merge branch 'develop' into tests/mastodon_api_controller.ex | 2019-09-26 16:16:30 +03:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 209395c7e6 | Add User.change_info/2 and User.update_info/2 | 2019-09-24 19:50:07 +07:00 |  | 
				
					
						| 
								
								
									 Maksim Pechnikov | d75d0ae134 | Merge branch 'develop' into tests/mastodon_api_controller.ex | 2019-09-24 08:06:04 +03:00 |  | 
				
					
						| 
								
								
									 Maksim Pechnikov | 179fa32dd5 | Merge branch 'develop' into tests/mastodon_api_controller.ex | 2019-09-23 21:41:57 +03:00 |  | 
				
					
						| 
								
								
									 Maxim Filippov | 6f25668215 | Admin API: Add ability to force user's password reset | 2019-09-22 16:08:07 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 6f67aed3ac | [#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes # Conflicts:
#	lib/pleroma/web/admin_api/admin_api_controller.ex | 2019-09-19 10:59:09 +03:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 447514dfa2 | Bump copyright years of files changed in 2019 Done via the following command:
git diff 1e6c102bfc--stat --name-only | cat - | xargs sed -i 's/2017-2018 Pleroma Authors/2017-2019 Pleroma Authors/' | 2019-09-18 23:21:11 +02:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | e6f43a831b | [#1234] Permissions-related fixes / new functionality (Masto 2.4.3 scopes). | 2019-09-15 18:22:08 +03:00 |  | 
				
					
						| 
								
								
									 Maksim Pechnikov | ab2f21e470 | tests for mastodon_api_controller.ex | 2019-09-06 21:50:00 +03:00 |  | 
				
					
						| 
								
								
									 Maksim | a320358703 | added test helpers to clear config after tests | 2019-08-19 15:34:29 +00:00 |  | 
				
					
						| 
								
								
									 Sergey Suprunenko | 05b5af8075 | Add tests for users tasks and PleromaAuthenticator | 2019-07-22 02:43:15 +00:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 9f45f93949 | Added more redirect_urichecks to prevent redirect to not explicitly listed URI. | 2019-06-18 17:00:49 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 4b2c29016c | [#963] No redirect on OOB OAuth authorize request with existing authorization. OAuth-related refactoring. | 2019-06-12 21:30:06 +03:00 |  | 
				
					
						| 
								
								
									 Maksim | 620908a2db | [#699] add worker to clean expired oauth tokens | 2019-05-22 15:44:50 +00:00 |  | 
				
					
						| 
								
								
									 Maksim | 52297920e7 | Refactoring  oauth response. | 2019-05-14 14:49:45 +00:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | a2be420f94 | differences_in_mastoapi_responses.md: fullname & bio are optionnal [ci skip] | 2019-05-13 18:35:45 +00:00 |  | 
				
					
						| 
								
								
									 Maksim | 1040caf096 | fix format Modified-by: Maksim Pechnikov <parallel588@gmail.com> | 2019-05-06 17:51:03 +00:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 9256d2d4b4 | [#923] Refactored OAuthController#authorize definitions, added test. | 2019-04-21 10:51:32 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | c3f12cf3c3 | [#923] OAuth consumer params handling refactoring. Registration and authorization-related params are wrapped in "authorization" in order to reduce edge cases number and simplify handling logic. | 2019-04-10 21:40:38 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | bffddf5e31 | [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth # Conflicts:
#	docs/config.md
#	test/support/factory.ex | 2019-04-08 12:20:26 +03:00 |  | 
				
					
						| 
								
								
									 eugenijm | 7aa53d52bd | Return 403 on oauth token exchange for a deactivated user | 2019-04-06 23:27:55 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 47a236f753 | [#923] OAuth consumer mode refactoring, new tests, tests adjustments, readme. | 2019-04-05 15:12:02 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 3e7f2bfc2f | [#923] OAuthController#callback adjustments (with tests). | 2019-04-05 09:19:17 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | f7cd9131d4 | [#923] OAuth consumer controller tests. Misc. improvements. | 2019-04-04 22:41:03 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 15ce710460 | Added "GET /oauth/authorize" tests. | 2019-04-02 13:43:33 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 263ca3dea2 | Mastodon-based auth error messages. Defaulted User#auth_active?/1 to true. | 2019-03-26 15:09:06 +03:00 |  | 
				
					
						| 
								
								
									 link0ff | f858df819b | Skip tests in LDAPAuthorizationTest if :eldap module is unavailable | 2019-03-21 12:31:16 +02:00 |  | 
				
					
						| 
								
								
									 lambda | 28df397454 | Merge branch 'feature/oauth-me' into 'develop' oauth: add me property to token responses
See merge request pleroma/pleroma!942 | 2019-03-16 08:44:02 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 40134598a8 | test: fix defective ldap setup/teardown | 2019-03-16 04:05:19 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | e0edc706cf | oauth: add me property to token responses | 2019-03-16 01:12:50 +00:00 |  | 
				
					
						| 
								
								
									 link0ff | a070dd4a83 | Add tests for LDAP authorization | 2019-03-15 16:28:46 +02:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | a3a9cec483 | [Credo] fix Credo.Check.Readability.AliasOrder | 2019-03-13 04:26:54 +01:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | bb9e40968a | Web.OAuth.OAuthControllerTest: Add test against token formatting | 2019-03-02 04:10:57 +01:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 04ee877a20 | [#468] Added OAuth scopes-specific tests. | 2019-02-19 22:28:21 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | bc4f77b10b | [#468] Merged upstream/develop, resolved conflicts. | 2019-02-17 14:07:04 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 063baca5e4 | [#468] User UI for OAuth permissions restriction. Standardized storage format for scopesfields, updated usages. | 2019-02-14 00:29:29 +03:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 8bb7e19b38 | test: de-group alias/es | 2019-02-11 03:44:15 +01:00 |  | 
				
					
						| 
								
								
									 lain | 1825118fd4 | Correctly handle invalid credentials on auth login. Closes #407 | 2019-01-28 11:41:47 +01:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 3c08d229db | tests: add legal boilerplate | 2018-12-23 20:57:10 +00:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 851db74f1c | [#114] Fixed test. | 2018-12-20 15:23:16 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 968d7490b6 | [#114] User.Info: renamed confirmation_updatetoconfirmation_changeset. | 2018-12-19 16:31:03 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 59fc5d15df | [#114] User.Info: renamed confirmation_updatetoconfirmation_change. | 2018-12-19 16:27:16 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | b096e30cff | [#114] Added email confirmation resend action. Added tests for registration, authentication, email confirmation, confirmation resending.
Made admin methods create confirmed users. | 2018-12-18 17:22:46 +03:00 |  | 
				
					
						| 
								
								
									 Maksim Pechnikov | 89b3729afa | fix warnings | 2018-12-12 09:09:19 +03:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | eacab0fb05 | Delete Tokens and Authorizations on password change Closes: https://git.pleroma.social/pleroma/pleroma/issues/320 | 2018-10-14 02:14:54 +02:00 |  | 
				
					
						| 
								
								
									 D Anzorge | 2cebaa7d3a | Add OAuth controller tests Tests for Pleroma.Web.OAuth.OAuthController | 2018-06-06 03:18:11 +02:00 |  |