Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
medal
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
39
Issues
39
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
bwinf
medal
Commits
435bbd50
Commit
435bbd50
authored
Jun 22, 2020
by
Robert Czechowski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
OAuth: Set and update sex on OAuth login. Fixes
#92
parent
a38da699
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
30 additions
and
25 deletions
+30
-25
src/core.rs
src/core.rs
+8
-3
src/db_conn.base.rs
src/db_conn.base.rs
+5
-5
src/db_conn.rs
src/db_conn.rs
+1
-1
src/db_conn_postgres.rs
src/db_conn_postgres.rs
+5
-5
src/db_conn_sqlite_new.rs
src/db_conn_sqlite_new.rs
+5
-5
src/webfw_iron.rs
src/webfw_iron.rs
+6
-6
No files found.
src/core.rs
View file @
435bbd50
...
...
@@ -1231,7 +1231,7 @@ pub enum UserType {
Admin
,
}
pub
enum
User
Gender
{
pub
enum
User
Sex
{
Female
,
Male
,
Unknown
,
...
...
@@ -1240,7 +1240,7 @@ pub enum UserGender {
pub
struct
ForeignUserData
{
pub
foreign_id
:
String
,
pub
foreign_type
:
UserType
,
pub
gender
:
UserGender
,
pub
sex
:
UserSex
,
pub
firstname
:
String
,
pub
lastname
:
String
,
}
...
...
@@ -1252,7 +1252,12 @@ pub fn login_oauth<T: MedalConnection>(conn: &T, user_data: ForeignUserData, oau
&
user_data
.foreign_id
,
user_data
.foreign_type
!=
UserType
::
User
,
&
user_data
.firstname
,
&
user_data
.lastname
)
&
user_data
.lastname
,
match
user_data
.sex
{
UserSex
::
Male
=>
Some
(
1
),
UserSex
::
Female
=>
Some
(
2
),
UserSex
::
Unknown
=>
Some
(
0
),
})
{
Ok
(
session_token
)
=>
Ok
(
session_token
),
Err
(())
=>
{
...
...
src/db_conn.base.rs
View file @
435bbd50
...
...
@@ -442,7 +442,7 @@ impl MedalConnection for Connection {
//TODO: use session
fn
login_foreign
(
&
self
,
_
session
:
Option
<&
str
>
,
provider_id
:
&
str
,
foreign_id
:
&
str
,
is_teacher
:
bool
,
firstname
:
&
str
,
lastname
:
&
str
)
firstname
:
&
str
,
lastname
:
&
str
,
sex
:
Option
<
i32
>
)
->
Result
<
String
,
()
>
{
let
session_token
=
helpers
::
make_session_token
();
...
...
@@ -457,9 +457,9 @@ impl MedalConnection for Connection {
Ok
(
Some
(
id
))
=>
{
let
query
=
"UPDATE session
SET session_token = $1, csrf_token = $2, last_login = $3, last_activity = $3,
is_teacher = $4, firstname = $5, lastname = $6
WHERE id = $
7
"
;
self
.execute
(
query
,
&
[
&
session_token
,
&
csrf_token
,
&
now
,
&
is_teacher
,
&
firstname
,
&
lastname
,
&
id
])
.unwrap
();
is_teacher = $4, firstname = $5, lastname = $6
, sex = $7
WHERE id = $
8
"
;
self
.execute
(
query
,
&
[
&
session_token
,
&
csrf_token
,
&
now
,
&
is_teacher
,
&
firstname
,
&
lastname
,
&
sex
,
&
id
])
.unwrap
();
Ok
(
session_token
)
}
...
...
@@ -475,7 +475,7 @@ impl MedalConnection for Connection {
&
now
,
&
false
,
&
(
if
is_teacher
{
255
}
else
{
0
}),
&
None
::
<
i32
>
,
&
sex
,
&
is_teacher
,
&
foreign_id
,
&
provider_id
,
...
...
src/db_conn.rs
View file @
435bbd50
...
...
@@ -33,7 +33,7 @@ pub trait MedalConnection {
fn
login
(
&
self
,
session
:
Option
<&
str
>
,
username
:
&
str
,
password
:
&
str
)
->
Result
<
String
,
()
>
;
fn
login_with_code
(
&
self
,
session
:
Option
<&
str
>
,
logincode
:
&
str
)
->
Result
<
String
,
()
>
;
fn
login_foreign
(
&
self
,
session
:
Option
<&
str
>
,
provider_id
:
&
str
,
foreign_id
:
&
str
,
is_teacher
:
bool
,
firstname
:
&
str
,
lastname
:
&
str
)
firstname
:
&
str
,
lastname
:
&
str
,
sex
:
Option
<
i32
>
)
->
Result
<
String
,
()
>
;
fn
create_user_with_groupcode
(
&
self
,
session
:
Option
<&
str
>
,
groupcode
:
&
str
)
->
Result
<
String
,
()
>
;
fn
create_group_with_users
(
&
self
,
group
:
Group
);
...
...
src/db_conn_postgres.rs
View file @
435bbd50
...
...
@@ -552,7 +552,7 @@ impl MedalConnection for Connection {
//TODO: use session
fn
login_foreign
(
&
self
,
_
session
:
Option
<&
str
>
,
provider_id
:
&
str
,
foreign_id
:
&
str
,
is_teacher
:
bool
,
firstname
:
&
str
,
lastname
:
&
str
)
firstname
:
&
str
,
lastname
:
&
str
,
sex
:
Option
<
i32
>
)
->
Result
<
String
,
()
>
{
let
session_token
=
helpers
::
make_session_token
();
...
...
@@ -567,9 +567,9 @@ impl MedalConnection for Connection {
Ok
(
Some
(
id
))
=>
{
let
query
=
"UPDATE session
SET session_token = $1, csrf_token = $2, last_login = $3, last_activity = $3,
is_teacher = $4, firstname = $5, lastname = $6
WHERE id = $
7
"
;
self
.execute
(
query
,
&
[
&
session_token
,
&
csrf_token
,
&
now
,
&
is_teacher
,
&
firstname
,
&
lastname
,
&
id
])
.unwrap
();
is_teacher = $4, firstname = $5, lastname = $6
, sex = $7
WHERE id = $
8
"
;
self
.execute
(
query
,
&
[
&
session_token
,
&
csrf_token
,
&
now
,
&
is_teacher
,
&
firstname
,
&
lastname
,
&
sex
,
&
id
])
.unwrap
();
Ok
(
session_token
)
}
...
...
@@ -585,7 +585,7 @@ impl MedalConnection for Connection {
&
now
,
&
false
,
&
(
if
is_teacher
{
255
}
else
{
0
}),
&
None
::
<
i32
>
,
&
sex
,
&
is_teacher
,
&
foreign_id
,
&
provider_id
,
...
...
src/db_conn_sqlite_new.rs
View file @
435bbd50
...
...
@@ -552,7 +552,7 @@ impl MedalConnection for Connection {
//TODO: use session
fn
login_foreign
(
&
self
,
_
session
:
Option
<&
str
>
,
provider_id
:
&
str
,
foreign_id
:
&
str
,
is_teacher
:
bool
,
firstname
:
&
str
,
lastname
:
&
str
)
firstname
:
&
str
,
lastname
:
&
str
,
sex
:
Option
<
i32
>
)
->
Result
<
String
,
()
>
{
let
session_token
=
helpers
::
make_session_token
();
...
...
@@ -567,9 +567,9 @@ impl MedalConnection for Connection {
Ok
(
Some
(
id
))
=>
{
let
query
=
"UPDATE session
SET session_token = ?1, csrf_token = ?2, last_login = ?3, last_activity = ?3,
is_teacher = ?4, firstname = ?5, lastname = ?6
WHERE id = ?
7
"
;
self
.execute
(
query
,
&
[
&
session_token
,
&
csrf_token
,
&
now
,
&
is_teacher
,
&
firstname
,
&
lastname
,
&
id
])
.unwrap
();
is_teacher = ?4, firstname = ?5, lastname = ?6
, sex = ?7
WHERE id = ?
8
"
;
self
.execute
(
query
,
&
[
&
session_token
,
&
csrf_token
,
&
now
,
&
is_teacher
,
&
firstname
,
&
lastname
,
&
sex
,
&
id
])
.unwrap
();
Ok
(
session_token
)
}
...
...
@@ -585,7 +585,7 @@ impl MedalConnection for Connection {
&
now
,
&
false
,
&
(
if
is_teacher
{
255
}
else
{
0
}),
&
None
::
<
i32
>
,
&
sex
,
&
is_teacher
,
&
foreign_id
,
&
provider_id
,
...
...
src/webfw_iron.rs
View file @
435bbd50
...
...
@@ -1085,7 +1085,7 @@ fn oauth<C>(req: &mut Request) -> IronResult<Response>
user_data
.userId_int
=
Some
(
id
);
}
use
core
::{
User
Gender
,
UserType
};
use
core
::{
User
Sex
,
UserType
};
let
user_data
=
core
::
ForeignUserData
{
foreign_id
:
user_data
.userId_int
.unwrap
(),
// todo: don't unwrap here
foreign_type
:
match
user_data
.userType
.as_ref
()
{
...
...
@@ -1094,11 +1094,11 @@ fn oauth<C>(req: &mut Request) -> IronResult<Response>
"s"
|
"S"
=>
UserType
::
User
,
_
=>
UserType
::
User
,
},
gender
:
match
user_data
.gender
.as_ref
()
{
"m"
|
"M"
=>
User
Gender
::
Male
,
"f"
|
"F"
|
"w"
|
"W"
=>
User
Gender
::
Female
,
"?"
=>
User
Gender
::
Unknown
,
_
=>
User
Gender
::
Unknown
,
sex
:
match
user_data
.gender
.as_ref
()
{
"m"
|
"M"
=>
User
Sex
::
Male
,
"f"
|
"F"
|
"w"
|
"W"
=>
User
Sex
::
Female
,
"?"
=>
User
Sex
::
Unknown
,
_
=>
User
Sex
::
Unknown
,
},
firstname
:
user_data
.firstName
,
lastname
:
user_data
.lastName
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment