Skip to content

Commit 06a244f

Browse files
author
Matt Humphrey
committed
User tests
1 parent 2da864d commit 06a244f

File tree

2 files changed

+447
-3
lines changed

2 files changed

+447
-3
lines changed

lib/Gitlab/Api/Users.php

Lines changed: 57 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,18 +77,29 @@ public function remove($id)
7777
}
7878

7979
/**
80-
* @param string $email
80+
* @param string $emailOrUsername
8181
* @param string $password
8282
* @return mixed
8383
*/
84-
public function session($email, $password)
84+
public function session($emailOrUsername, $password)
8585
{
8686
return $this->post('session', array(
87-
'email' => $email,
87+
'login' => $emailOrUsername,
88+
'email' => $emailOrUsername,
8889
'password' => $password
8990
));
9091
}
9192

93+
/**
94+
* @param string $email
95+
* @param string $password
96+
* @return mixed
97+
*/
98+
public function login($email, $password)
99+
{
100+
return $this->session($email, $password);
101+
}
102+
92103
/**
93104
* @return mixed
94105
*/
@@ -135,4 +146,47 @@ public function removeKey($id)
135146
{
136147
return $this->delete('user/keys/'.urlencode($id));
137148
}
149+
150+
/**
151+
* @param int $user_id
152+
* @return mixed
153+
*/
154+
public function userKeys($user_id)
155+
{
156+
return $this->get('users/'.urlencode($user_id).'/keys');
157+
}
158+
159+
/*
160+
* @param int $user_id
161+
* @param int $key_id
162+
* @return mixed
163+
*/
164+
public function userKey($user_id, $key_id)
165+
{
166+
return $this->get('users/'.urlencode($user_id).'/keys/'.urlencode($key_id));
167+
}
168+
169+
/**
170+
* @param int $user_id
171+
* @param string $title
172+
* @param string $key
173+
* @return mixed
174+
*/
175+
public function createKeyForUser($user_id, $title, $key)
176+
{
177+
return $this->post('users/'.urlencode($user_id).'/keys', array(
178+
'title' => $title,
179+
'key' => $key
180+
));
181+
}
182+
183+
/**
184+
* @param int $user_id
185+
* @param int $key_id
186+
* @return mixed
187+
*/
188+
public function removeUserKey($user_id, $key_id)
189+
{
190+
return $this->delete('users/'.urlencode($user_id).'/keys/'.urlencode($key_id));
191+
}
138192
}

0 commit comments

Comments
 (0)