Use google client id and secret env variables

[airbundle] / Repository / UserRepository.php

diff --git a/Repository/UserRepository.php b/Repository/UserRepository.php
index 5f5dd50960ef524d5d5264d0ec1e6904bdac4892..4e7dae86cd8c3043418ac2972a89bf4980639c20 100644 (file)
--- a/Repository/UserRepository.php
+++ b/Repository/UserRepository.php
@@ -13,8 +13,11 @@ namespace Rapsys\AirBundle\Repository;
 
 use Doctrine\ORM\AbstractQuery;
 use Doctrine\ORM\Query\ResultSetMapping;
+
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 
+use Rapsys\AirBundle\Repository;
+
 /**
  * UserRepository
  */
@@ -38,9 +41,9 @@ FROM (
                u.pseudonym,
                g.id AS g_id,
                g.title AS g_title
-       FROM RapsysAirBundle:User AS u
-       JOIN RapsysAirBundle:UserGroup AS gu ON (gu.user_id = u.id)
-       JOIN RapsysAirBundle:Group AS g ON (g.id = gu.group_id)
+       FROM Rapsys\AirBundle\Entity\User AS u
+       JOIN Rapsys\AirBundle\Entity\UserGroup AS gu ON (gu.user_id = u.id)
+       JOIN Rapsys\AirBundle\Entity\Group AS g ON (g.id = gu.group_id)
        WHERE g.title <> 'User'
        ORDER BY g.id DESC, u.pseudonym ASC
        LIMIT 0, :limit
@@ -113,8 +116,8 @@ SELECT
 FROM (
        SELECT
                u.id
-       FROM RapsysAirBundle:User AS u
-       LEFT JOIN RapsysAirBundle:UserGroup AS gu ON (gu.user_id = u.id)
+       FROM Rapsys\AirBundle\Entity\User AS u
+       LEFT JOIN Rapsys\AirBundle\Entity\UserGroup AS gu ON (gu.user_id = u.id)
        WHERE u.pseudonym IN (:pseudonym)
        ORDER BY gu.group_id DESC, u.pseudonym ASC
        LIMIT 0, :limit
@@ -153,8 +156,8 @@ SQL;
                //Set the request
                $req =<<<SQL
 SELECT u.id, u.pseudonym
-FROM RapsysAirBundle:Application AS a
-JOIN RapsysAirBundle:User AS u ON (u.id = a.user_id)
+FROM Rapsys\AirBundle\Entity\Application AS a
+JOIN Rapsys\AirBundle\Entity\User AS u ON (u.id = a.user_id)
 WHERE a.session_id = :id
 SQL;
 
@@ -218,11 +221,11 @@ SELECT
        GROUP_CONCAT(g.id ORDER BY g.id SEPARATOR "\\n") AS ids,
        GROUP_CONCAT(g.title ORDER BY g.id SEPARATOR "\\n") AS titles,
        GREATEST(COALESCE(u.updated, 0), COALESCE(c.updated, 0), COALESCE(o.updated, 0)) AS modified
-FROM RapsysAirBundle:User AS u
-LEFT JOIN RapsysAirBundle:Civility AS c ON (c.id = u.civility_id)
-LEFT JOIN RapsysAirBundle:Country AS o ON (o.id = u.country_id)
-LEFT JOIN RapsysAirBundle:UserGroup AS gu ON (gu.user_id = u.id)
-LEFT JOIN RapsysAirBundle:Group AS g ON (g.id = gu.group_id)
+FROM Rapsys\AirBundle\Entity\User AS u
+LEFT JOIN Rapsys\AirBundle\Entity\Civility AS c ON (c.id = u.civility_id)
+LEFT JOIN Rapsys\AirBundle\Entity\Country AS o ON (o.id = u.country_id)
+LEFT JOIN Rapsys\AirBundle\Entity\UserGroup AS gu ON (gu.user_id = u.id)
+LEFT JOIN Rapsys\AirBundle\Entity\Group AS g ON (g.id = gu.group_id)
 WHERE u.id = :id
 SQL;
 
@@ -272,7 +275,7 @@ SQL;
                $result['alternates'] = [];
 
                //Set route
-               $route = 'rapsys_air_user_view';
+               $route = 'rapsysair_user_view';
 
                //Set route params
                $routeParams = ['id' => $id, 'user' => $this->slugger->slug($result['pseudonym'])];
@@ -280,7 +283,7 @@ SQL;
                //Milonga Raphaël exception
                if ($routeParams['id'] == 1 && $routeParams['user'] == 'milonga-raphael') {
                        //Set route
-                       $route = 'rapsys_air_user_milongaraphael';
+                       $route = 'rapsysair_user_milongaraphael';
                        //Set route params
                        $routeParams = [];
                }
@@ -323,7 +326,8 @@ SQL;
                //Iterate on each location
                foreach(explode("\n", $result['ids']) as $k => $id) {
                        //Add role
-                       $roles[$role = 'ROLE_'.strtoupper($titles[$k])] = $role;
+                       //XXX: roles are keyes by id
+                       $roles[$id] = 'ROLE_'.strtoupper($titles[$k]);
 
                        //Add group
                        $groups[$id] = $this->translator->trans($titles[$k]);
@@ -399,14 +403,14 @@ FROM (
                        u.pseudonym,
                        g.id AS g_id,
                        g.title AS g_title
-               FROM RapsysAirBundle:User AS u
-               JOIN RapsysAirBundle:UserGroup AS gu ON (gu.user_id = u.id)
-               JOIN RapsysAirBundle:Group AS g ON (g.id = gu.group_id)
+               FROM Rapsys\AirBundle\Entity\User AS u
+               JOIN Rapsys\AirBundle\Entity\UserGroup AS gu ON (gu.user_id = u.id)
+               JOIN Rapsys\AirBundle\Entity\Group AS g ON (g.id = gu.group_id)
                ORDER BY NULL
                LIMIT 0, :limit
        ) AS c
-       LEFT JOIN RapsysAirBundle:Application AS a ON (a.user_id = c.id)
-       LEFT JOIN RapsysAirBundle:Dance AS d ON (d.id = a.dance_id)
+       LEFT JOIN Rapsys\AirBundle\Entity\Application AS a ON (a.user_id = c.id)
+       LEFT JOIN Rapsys\AirBundle\Entity\Dance AS d ON (d.id = a.dance_id)
        GROUP BY d.id
        ORDER BY NULL
        LIMIT 0, :limit
@@ -469,8 +473,8 @@ SQL;
                                'dances' => [],
                                'slug' => $slug = $this->slugger->slug($data['pseudonym']),
                                //Milonga Raphaël exception
-                               'link' => $data['id'] == 1 && $slug == 'milonga-raphael' ? $this->router->generate('rapsys_air_user_milongaraphael', []) : $this->router->generate('rapsys_air_user_view', ['id' => $data['id'], 'user' => $slug]),
-                               'edit' => $this->router->generate('rapsys_user_edit', ['mail' => $short = $this->slugger->short($data['mail']), 'hash' => $this->slugger->hash($short)])
+                               'link' => $data['id'] == 1 && $slug == 'milonga-raphael' ? $this->router->generate('rapsysair_user_milongaraphael', []) : $this->router->generate('rapsysair_user_view', ['id' => $data['id'], 'user' => $slug]),
+                               'edit' => $this->router->generate('rapsysuser_edit', ['mail' => $short = $this->slugger->short($data['mail']), 'hash' => $this->slugger->hash($short)])
                        ];
 
                        //With dances
@@ -486,13 +490,13 @@ SQL;
                                        //Init dance when missing
                                        if (!isset($ret[$group][$data['id']]['dances'][$name = $this->translator->trans($names[$k])])) {
                                                $ret[$group][$data['id']]['dances'][$name] = [
-                                                       'link' => $this->router->generate('rapsys_air_dance_name', ['name' => $this->slugger->short($names[$k]), 'dance' => $this->slugger->slug($name)]),
+                                                       'link' => $this->router->generate('rapsysair_dance_name', ['name' => $this->slugger->short($names[$k]), 'dance' => $this->slugger->slug($name)]),
                                                        'types' => []
                                                ];
                                        }
 
                                        //Set type
-                                       $ret[$group][$data['id']]['dances'][$name]['types'][$type = $this->translator->trans($types[$k])] = $this->router->generate('rapsys_air_dance_view', ['id' => $id, 'name' => $this->slugger->slug($name), 'type' => $this->slugger->slug($type)]);
+                                       $ret[$group][$data['id']]['dances'][$name]['types'][$type = $this->translator->trans($types[$k])] = $this->router->generate('rapsysair_dance_view', ['id' => $id, 'name' => $this->slugger->slug($name), 'type' => $this->slugger->slug($type)]);
                                }
                        }
                }