Updating intercom functionality #1734
Conversation
| $di->set('site.intercomAppToken', function() use ($di) { | ||
| return Kohana::$config->load('site.intercomAppToken'); | ||
| $di->set('thirdparty.intercomAppToken', function() use ($di) { | ||
| return Kohana::$config->load('thirdparty.intercomAppToken'); |
There was a problem hiding this comment.
I'd suggest just calling getenv() here rather than using Kohana config
| public function handle(EventInterface $event, $user = null) | ||
| { | ||
|
|
||
| $config = service('repository.config')->get('thirdparty'); |
There was a problem hiding this comment.
I don't think you need to use the repo here, just service('thirdparty.intercomapptoken')
The repo is only really necessary for things that are use editable
| { | ||
|
|
||
| $config = service('repository.config')->get('thirdparty'); | ||
| $domain = Kohana::$config->load('site.client_url'); |
There was a problem hiding this comment.
You might be able to use service('site') here. I think it'll give you domain.ushahidi.io or similar. But relies on HOST being set or an actual HTTP request
There was a problem hiding this comment.
What will that do in a non .io setup, it seems to be unset if not multisite
|
|
||
| try { | ||
| // Create company with current date if it does not already exist | ||
| if (!$config->intercomCompanyId) { |
There was a problem hiding this comment.
When would this happen? ie. why wouldn't we have created the company already?
| @@ -64,7 +64,11 @@ public function create(Entity $entity) | |||
| 'created' => time(), | |||
| 'password' => $this->hasher->hash($entity->password), | |||
| ]; | |||
| return parent::create($entity->setState($state)); | |||
| $entity->setState($state); | |||
| if ($entity->role === 'admin') { | |||
There was a problem hiding this comment.
Ideally this check happens in the listener too. Then the event is reusable for future integrations that might want all users.
There was a problem hiding this comment.
Yep that's changed
| $client = new IntercomClient($intercomAppToken, null); | ||
|
|
||
| try { | ||
| $client->users->update([ |
| { | ||
| if($user && $user->role === 'admin') { | ||
| $intercomAppToken = getenv('INTERCOM_APP_TOKEN'); | ||
| $domain = service('site'); |
There was a problem hiding this comment.
This should return quakemap.api.ushahidi.io or just an empty string if we're not on an ushahidi.io deployment ... was that what you expected?
There was a problem hiding this comment.
Since this is intended to track .io I think that's ok, I'll test it with a blank string to make that it behaves as expected.
| { | ||
| $intercomAppToken = service('site.intercomAppToken'); | ||
| $this->config_repo = $config_repo; |
application/config/thirdparty.php
Outdated
| @@ -0,0 +1,30 @@ | |||
| <?php defined('SYSPATH') OR die('No direct access allowed.'); | |||
There was a problem hiding this comment.
Not sure we need this file at all anymore?
| @@ -64,7 +64,11 @@ public function create(Entity $entity) | |||
| 'created' => time(), | |||
| 'password' => $this->hasher->hash($entity->password), | |||
| ]; | |||
| return parent::create($entity->setState($state)); | |||
| $entity->setState($state); | |||
| if ($entity->role === 'admin') { | |||
This change is