@@ -51,7 +51,7 @@ discard block |
||
| 51 | 51 | {
|
| 52 | 52 | $userId = $manager->getAuth()->params['userId']; |
| 53 | 53 | |
| 54 | - return DeviceToken::where('user_id',$userId)->get();
|
|
| 54 | + return DeviceToken::where('user_id', $userId)->get();
|
|
| 55 | 55 | } |
| 56 | 56 | |
| 57 | 57 | /** |
@@ -64,8 +64,8 @@ discard block |
||
| 64 | 64 | return DeviceToken::where(function($query) use($token) {
|
| 65 | 65 | |
| 66 | 66 | //where query for token |
| 67 | - $query->where('token_integer',crc32(md5($token)));
|
|
| 68 | - $query->where('device_agent_integer',crc32(md5($_SERVER['HTTP_USER_AGENT'])));
|
|
| 67 | + $query->where('token_integer', crc32(md5($token)));
|
|
| 68 | + $query->where('device_agent_integer', crc32(md5($_SERVER['HTTP_USER_AGENT'])));
|
|
| 69 | 69 | }); |
| 70 | 70 | } |
| 71 | 71 | |
@@ -79,8 +79,8 @@ discard block |
||
| 79 | 79 | return DeviceToken::where(function($query) use($token) {
|
| 80 | 80 | |
| 81 | 81 | //where query for token |
| 82 | - $query->where('token_integer',crc32(md5($token)));
|
|
| 83 | - $query->where('device_agent_integer',crc32(md5($_SERVER['HTTP_USER_AGENT'])));
|
|
| 82 | + $query->where('token_integer', crc32(md5($token)));
|
|
| 83 | + $query->where('device_agent_integer', crc32(md5($_SERVER['HTTP_USER_AGENT'])));
|
|
| 84 | 84 | |
| 85 | 85 | }); |
| 86 | 86 | } |
@@ -91,23 +91,23 @@ discard block |
||
| 91 | 91 | * @param null|object $query |
| 92 | 92 | * @return mixed |
| 93 | 93 | */ |
| 94 | - protected function checkPasswordVerify($query=null) |
|
| 94 | + protected function checkPasswordVerify($query = null) |
|
| 95 | 95 | {
|
| 96 | - if(is_null($query) && isset($this->credentials['password'])){
|
|
| 97 | - if(!is_null($password = $this->auth->provider('password'))
|
|
| 98 | - && $password($this->credentials['password'])=='verify'){
|
|
| 96 | + if (is_null($query) && isset($this->credentials['password'])) {
|
|
| 97 | + if (!is_null($password = $this->auth->provider('password'))
|
|
| 98 | + && $password($this->credentials['password'])=='verify') {
|
|
| 99 | 99 | |
| 100 | 100 | $this->password = $this->credentials['password']; |
| 101 | 101 | $this->passwordVerify = true; |
| 102 | - $this->credentials = Arr::removeKey($this->credentials,['password']); |
|
| 102 | + $this->credentials = Arr::removeKey($this->credentials, ['password']); |
|
| 103 | 103 | |
| 104 | 104 | return null; |
| 105 | 105 | } |
| 106 | 106 | } |
| 107 | 107 | |
| 108 | - if(is_object($query) && $query->count()){
|
|
| 108 | + if (is_object($query) && $query->count()) {
|
|
| 109 | 109 | $password = $query->first()->password; |
| 110 | - if(password_verify($this->password,$password)){
|
|
| 110 | + if (password_verify($this->password, $password)) {
|
|
| 111 | 111 | return $query; |
| 112 | 112 | } |
| 113 | 113 | } |
@@ -137,24 +137,24 @@ discard block |
||
| 137 | 137 | |
| 138 | 138 | // with the callback method (eloquent model) |
| 139 | 139 | // we write the where clause. |
| 140 | - foreach ($this->credentials as $credential=>$credentialValue){
|
|
| 140 | + foreach ($this->credentials as $credential=>$credentialValue) {
|
|
| 141 | 141 | |
| 142 | - if(!is_null($provider = $this->auth->provider($credential))){
|
|
| 143 | - $query->where($credential,$provider($credentialValue)); |
|
| 142 | + if (!is_null($provider = $this->auth->provider($credential))) {
|
|
| 143 | + $query->where($credential, $provider($credentialValue)); |
|
| 144 | 144 | } |
| 145 | - else{
|
|
| 146 | - $query->where($credential,$credentialValue); |
|
| 145 | + else {
|
|
| 146 | + $query->where($credential, $credentialValue); |
|
| 147 | 147 | } |
| 148 | 148 | } |
| 149 | 149 | |
| 150 | 150 | // for the authenticate query, |
| 151 | 151 | // the user can add additional queries by the service provider. |
| 152 | - if(!is_null($addQuery = $this->auth->provider('addQuery'))){
|
|
| 152 | + if (!is_null($addQuery = $this->auth->provider('addQuery'))) {
|
|
| 153 | 153 | $addQuery($query); |
| 154 | 154 | } |
| 155 | 155 | }); |
| 156 | 156 | |
| 157 | - if(false === $this->passwordVerify){
|
|
| 157 | + if (false===$this->passwordVerify) {
|
|
| 158 | 158 | return $query; |
| 159 | 159 | } |
| 160 | 160 | |
@@ -164,10 +164,10 @@ discard block |
||
| 164 | 164 | /** |
| 165 | 165 | * @return void|mixed |
| 166 | 166 | */ |
| 167 | - protected function updateToken($token=null) |
|
| 167 | + protected function updateToken($token = null) |
|
| 168 | 168 | {
|
| 169 | 169 | //if query status value is true |
| 170 | - if($this->auth->params['status']){
|
|
| 170 | + if ($this->auth->params['status']) {
|
|
| 171 | 171 | |
| 172 | 172 | // we go to the method that produces |
| 173 | 173 | // the classical token value and get the token value. |
@@ -177,13 +177,13 @@ discard block |
||
| 177 | 177 | // if there is no update, we reset the status value to 0. |
| 178 | 178 | $update = $this->auth->params['builder']->update(['token'=>$this->auth->params['token']]); |
| 179 | 179 | |
| 180 | - if(!$update){
|
|
| 180 | + if (!$update) {
|
|
| 181 | 181 | $this->auth->params['status'] = 0; |
| 182 | 182 | $this->auth->params['exception'] = 'update'; |
| 183 | 183 | } |
| 184 | - else{
|
|
| 185 | - if(!is_null($after = $this->auth->provider('after'))){
|
|
| 186 | - if(false === $after($this->auth->params['builder']->first())){
|
|
| 184 | + else {
|
|
| 185 | + if (!is_null($after = $this->auth->provider('after'))) {
|
|
| 186 | + if (false===$after($this->auth->params['builder']->first())) {
|
|
| 187 | 187 | $this->auth->params['status'] = 0; |
| 188 | 188 | $this->auth->params['exception'] = 'update'; |
| 189 | 189 | } |
@@ -203,14 +203,14 @@ discard block |
||
| 203 | 203 | {
|
| 204 | 204 | $token_integer = null; |
| 205 | 205 | |
| 206 | - if(isset($this->auth->params['token'])){
|
|
| 206 | + if (isset($this->auth->params['token'])) {
|
|
| 207 | 207 | $token_integer = crc32(md5($this->auth->params['token'])); |
| 208 | 208 | } |
| 209 | 209 | |
| 210 | - if(!is_null($token_integer)){
|
|
| 210 | + if (!is_null($token_integer)) {
|
|
| 211 | 211 | |
| 212 | - if(DeviceToken::where('user_id',$this->auth->params['authId'])
|
|
| 213 | - ->where('device_agent_integer',crc32(md5($_SERVER['HTTP_USER_AGENT'])))->count()==0){
|
|
| 212 | + if (DeviceToken::where('user_id', $this->auth->params['authId'])
|
|
| 213 | + ->where('device_agent_integer', crc32(md5($_SERVER['HTTP_USER_AGENT'])))->count()==0) {
|
|
| 214 | 214 | |
| 215 | 215 | return DeviceToken::create([ |
| 216 | 216 | 'user_id' => $this->auth->params['authId'], |
@@ -221,10 +221,10 @@ discard block |
||
| 221 | 221 | 'expire' => $this->auth->getExpire(), |
| 222 | 222 | ]); |
| 223 | 223 | } |
| 224 | - else{
|
|
| 224 | + else {
|
|
| 225 | 225 | |
| 226 | - return DeviceToken::where('user_id',$this->auth->params['authId'])
|
|
| 227 | - ->where('device_agent_integer',crc32(md5($_SERVER['HTTP_USER_AGENT'])))
|
|
| 226 | + return DeviceToken::where('user_id', $this->auth->params['authId'])
|
|
| 227 | + ->where('device_agent_integer', crc32(md5($_SERVER['HTTP_USER_AGENT'])))
|
|
| 228 | 228 | ->update([ |
| 229 | 229 | 'token' => $this->auth->params['token'], |
| 230 | 230 | 'token_integer' => $token_integer |
@@ -244,11 +244,11 @@ discard block |
||
| 244 | 244 | {
|
| 245 | 245 | $token_integer = crc32(md5($this->auth->getTokenSentByUser())); |
| 246 | 246 | |
| 247 | - if(!is_null($token_integer)){
|
|
| 247 | + if (!is_null($token_integer)) {
|
|
| 248 | 248 | |
| 249 | - DeviceToken::where('token_integer',$token_integer)->delete();
|
|
| 249 | + DeviceToken::where('token_integer', $token_integer)->delete();
|
|
| 250 | 250 | |
| 251 | - return (DeviceToken::where('token_integer',$token_integer)->count()) ? false : true;
|
|
| 251 | + return (DeviceToken::where('token_integer', $token_integer)->count()) ? false : true;
|
|
| 252 | 252 | } |
| 253 | 253 | |
| 254 | 254 | } |