Auth: Add OrgRole to ID token (#100383)

* Changes for Users and ServiceAccounts

* Align tests

pkg/services/user/userimpl/verifier_test.go

@@ -21,7 +21,7 @@ func TestVerifier_Start(t *testing.T) {
 	ts := &tempusertest.FakeTempUserService{}
 	us := &usertest.FakeUserService{}
 	ns := notifications.MockNotificationService()
-	is := &idtest.MockService{}
+	is := &idtest.FakeService{}
 
 	type calls struct {
 		expireCalled bool
@@ -116,7 +116,7 @@ func TestVerifier_Complete(t *testing.T) {
 	ts := &tempusertest.FakeTempUserService{}
 	us := &usertest.FakeUserService{}
 	ns := notifications.MockNotificationService()
-	is := &idtest.MockService{}
+	is := &idtest.FakeService{}
 
 	type calls struct {
 		updateCalled       bool