Fix User.from_omniauth to provide organisations

We need to call
`User.temporarily_add_organisations_until_the_profile_app_is_updated`
from `User.from_auth` like we do from `User.from_userinfo` &
`User.from_token` so that the `organisations` attribute gets populated.

Author: floehopper

app/models/user.rb

@@ -89,6 +89,9 @@ def self.from_auth(auth)
     args = auth.extra.raw_info.to_h.slice(*ATTRIBUTES)
     args['id'] = auth.uid
 
+    # TODO: remove once the OmniAuth info returns the 'organisations' key.
+    temporarily_add_organisations_until_the_profile_app_is_updated(args)
+
     new(args)
   end
 

spec/models/user_spec.rb

@@ -152,14 +152,15 @@
     subject(:auth_subject) { described_class.from_omniauth(auth) }
 
     let(:id) { 'f80ba5b2-2eee-457d-9f75-872b5c09be84' }
-    let(:info) do
+    let(:info_without_organisations) do
       {
         'id' => id,
         'email' => '[email protected]',
         'name' => 'John Doe',
         'roles' => 'school-student'
       }
     end
+    let(:info) { info_without_organisations }
     let(:user) { described_class.new(info) }
 
     let(:auth) do
@@ -190,6 +191,18 @@
       expect(user.email).to eq '[email protected]'
     end
 
+    it 'returns a user with the correct organisations' do
+      expect(auth_subject.organisations).to eq(organisation_id => 'school-student')
+    end
+
+    context 'when info includes organisations' do
+      let(:info) { info_without_organisations.merge!('organisations' => { 'c78ab987-5fa8-482e-a9cf-a5e93513349b' => 'school-student' }) }
+
+      it 'returns a user with the supplied organisations' do
+        expect(auth_subject.organisations).to eq('c78ab987-5fa8-482e-a9cf-a5e93513349b' => 'school-student')
+      end
+    end
+
     context 'with unusual keys in info' do
       let(:info) { { foo: :bar, flibble: :woo } }