-
Notifications
You must be signed in to change notification settings - Fork 27
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add multi Auth integration #206 #226
Merged
Merged
Changes from all commits
Commits
Show all changes
46 commits
Select commit
Hold shift + click to select a range
b3066c9
mailer
yuklia df5545c
hybrid auth
yuklia 3652a36
hotfix
yuklia ab80d90
test
yuklia 765927b
hotfix
yuklia 0ddedd8
test
3e259b6
sign in via twitter
yuklia fc2566a
hotfix
yuklia 6b18359
facebook/google
yuklia 49d9069
config modified
yuklia 38056ee
change prov
yuklia 74e47a7
auth providers
yuklia 3fa4666
auth providers
yuklia eb565be
unused classes were removed
yuklia c211394
hotfix
yuklia 5f5f397
enpoint fix
yuklia 1632ce6
hotfix
yuklia 5dec51a
hotfix
yuklia d5c248d
provider cheking
yuklia 2fd9b28
hotfix
yuklia ebf4a1f
hotfix
yuklia b81e5c0
tests
yuklia 46c9078
hybrid auth outside
yuklia fe83121
test
yuklia 719964b
linked to test
dedae84
fix
69124b7
tests
yuklia deebdbd
hotfix
yuklia 96dc8dd
old functionality
yuklia ae3b702
mailer config was restored
yuklia 36bc319
phpunit.xml was added to .gitignore/hybridauth.php was restored
yuklia c984180
hybridauth/hybridauth was replaced to require section
yuklia 67e220b
hotfix
yuklia 0a44eaa
hotfix
yuklia 4d8fdeb
controller index.php was restored
yuklia c303055
unused attribute data-provider was removed from profile.phtml
yuklia 6f0b893
hotfix
yuklia 05983a4
single blank line for mailer.php
yuklia aaf0e5c
psr2
yuklia dbdaada
psr2
yuklia 49daa81
test testUserNotLinkedTo was fixed
yuklia d68cd71
old facebook/controlles was remowed
yuklia e0ad5ce
hotfix
yuklia 98fec4c
psr2
yuklia 0c8465f
guzzle, google,twitter,facebook libs were removed
yuklia d0b34db
.gitignore was added to public
yuklia File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,3 +8,4 @@ nbproject | |
composer.lock | ||
composer.phar | ||
/vendor/* | ||
phpunit.xml |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
<?php | ||
/** | ||
* Created by PhpStorm. | ||
* User: yuklia | ||
* Date: 05.05.15 | ||
* Time: 14:04 | ||
*/ | ||
|
||
/** | ||
* @link http://hybridauth.sourceforge.net/userguide/Configuration.html | ||
*/ | ||
return array( | ||
//"base_url" the url that point to HybridAuth Endpoint (where index.php and config.php are found) | ||
"base_url" => "%%domain%%/auth/endpoint", | ||
|
||
"providers" => array( | ||
"Google" => array( // 'id' is your google client id | ||
"enabled" => true, | ||
"wrapper" => array( "path" => "Providers/Google.php", "class" => "Hybrid_Providers_Google" ), | ||
"keys" => array("id" => "%%client_id%%", | ||
"secret" => "%%client_secret%%"), | ||
"scope" => "https://www.googleapis.com/auth/userinfo.profile ". // optional | ||
"https://www.googleapis.com/auth/userinfo.email" , // optional | ||
"access_type" => "offline", // optional | ||
"approval_prompt" => "force", // optional | ||
), | ||
|
||
"Facebook" => array( // 'id' is your facebook application id | ||
"enabled" => true, | ||
"wrapper" => array( "path" => "Providers/Facebook.php", "class" => "Hybrid_Providers_Facebook" ), | ||
"keys" => array("id" => "%%appId%%", "secret" => "%%secret%%"), | ||
"scope" => "email, user_about_me, user_birthday, user_hometown, publish_actions", // optional | ||
), | ||
|
||
"Twitter" => array( // 'key' is your twitter application consumer key | ||
"enabled" => true, | ||
"wrapper" => array( "path" => "Providers/Twitter.php", "class" => "Hybrid_Providers_Twitter" ), | ||
"keys" => array("key" => "%%consumerKey%%", "secret" => "%%consumerSecret%%") | ||
) | ||
), | ||
|
||
"debug_mode" => false, | ||
|
||
// to enable logging, set 'debug_mode' to true, then provide here a path of a writable file | ||
"debug_file" =>'' | ||
); |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
<?php | ||
/** | ||
* Created by PhpStorm. | ||
* User: yuklia | ||
* Date: 06.05.15 | ||
* Time: 18:41 | ||
*/ | ||
namespace Application\Auth; | ||
|
||
/** | ||
* Interface AuthInterface | ||
* @package Application\Auth | ||
*/ | ||
interface AuthInterface | ||
{ | ||
/** | ||
* @param array $data | ||
* @param \Application\Users\Row $user | ||
* @return void | ||
*/ | ||
public function registration($data, $user); | ||
|
||
/** | ||
* @return void | ||
*/ | ||
public function authProcess(); | ||
|
||
/** | ||
* @return array | ||
* @throws \Application\Exception | ||
*/ | ||
public function getOptions(); | ||
|
||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Придираюсь, но перевод строки лишний :) |
||
/** | ||
* @param \Application\Auth\Row $auth | ||
* @return mixed | ||
*/ | ||
public function alreadyRegisteredLogic($auth); | ||
|
||
/** | ||
* @return array | ||
*/ | ||
public function getProfile(); | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Пора бы на что-нить более стандартное поменять