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
342d0718
Commit
342d0718
authored
Nov 11, 2020
by
Robert Czechowski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add new database field 'account_created' in session
parent
a7ec45a7
Pipeline
#902
passed with stage
in 4 minutes
Changes
7
Pipelines
1
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
79 additions
and
66 deletions
+79
-66
.gitignore
.gitignore
+0
-1
migrations/postgres/0002_alter_session_user_add_account_created.sql
.../postgres/0002_alter_session_user_add_account_created.sql
+1
-0
migrations/sqlite_v2/0002_alter_session_user_add_account_created.sql
...sqlite_v2/0002_alter_session_user_add_account_created.sql
+1
-0
src/db_conn.base.rs
src/db_conn.base.rs
+24
-20
src/db_conn_postgres.rs
src/db_conn_postgres.rs
+24
-20
src/db_conn_sqlite_new.rs
src/db_conn_sqlite_new.rs
+24
-20
src/db_objects.rs
src/db_objects.rs
+5
-5
No files found.
.gitignore
View file @
342d0718
...
...
@@ -13,7 +13,6 @@ config.json
*.pdf
*.json
*.yaml
*.sql
*.sqlite
*.csv
/bulma
migrations/postgres/0002_alter_session_user_add_account_created.sql
0 → 100644
View file @
342d0718
ALTER
TABLE
session
ADD
COLUMN
account_created
TIMESTAMP
;
migrations/sqlite_v2/0002_alter_session_user_add_account_created.sql
0 → 100644
View file @
342d0718
ALTER
TABLE
session
ADD
COLUMN
account_created
TEXT
;
src/db_conn.base.rs
View file @
342d0718
This diff is collapsed.
Click to expand it.
src/db_conn_postgres.rs
View file @
342d0718
This diff is collapsed.
Click to expand it.
src/db_conn_sqlite_new.rs
View file @
342d0718
This diff is collapsed.
Click to expand it.
src/db_objects.rs
View file @
342d0718
...
...
@@ -23,7 +23,7 @@ pub struct SessionUser {
pub
csrf_token
:
String
,
pub
last_login
:
Option
<
Timespec
>
,
pub
last_activity
:
Option
<
Timespec
>
,
pub
permanent_login
:
bool
,
pub
account_created
:
Option
<
Timespec
>
,
pub
username
:
Option
<
String
>
,
pub
password
:
Option
<
String
>
,
...
...
@@ -198,9 +198,9 @@ impl SessionUser {
session_token
:
Some
(
session_token
),
csrf_token
,
last_login
:
None
,
last_activity
:
None
,
// now?
last_activity
:
None
,
account_created
:
None
,
// müssen die überhaupt außerhalb der datenbankabstraktion sichtbar sein?
permanent_login
:
false
,
username
:
None
,
password
:
None
,
...
...
@@ -238,7 +238,7 @@ impl SessionUser {
csrf_token
:
""
.to_string
(),
last_login
:
None
,
last_activity
:
None
,
permanent_login
:
fals
e
,
account_created
:
Non
e
,
username
:
None
,
password
:
None
,
...
...
@@ -266,7 +266,7 @@ impl SessionUser {
}
pub
fn
is_alive
(
&
self
)
->
bool
{
let
duration
=
if
self
.permanent_login
{
Duration
::
days
(
90
)
}
else
{
Duration
::
hours
(
9
)
};
let
duration
=
Duration
::
hours
(
9
);
// TODO: hardcoded value, should be moved into constant or sth
let
now
=
time
::
get_time
();
if
let
Some
(
last_activity
)
=
self
.last_activity
{
now
-
last_activity
<
duration
...
...
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