Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
cicer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Quique
cicer
Commits
cef0b3c9
Unverified
Commit
cef0b3c9
authored
4 years ago
by
meskio
Browse files
Options
Downloads
Patches
Plain Diff
Refresh role when fetching token
* Closes: #17
parent
81b85a8d
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
api/auth.go
+16
-6
16 additions, 6 deletions
api/auth.go
src/App.js
+19
-31
19 additions, 31 deletions
src/App.js
with
35 additions
and
37 deletions
api/auth.go
+
16
−
6
View file @
cef0b3c9
...
...
@@ -69,28 +69,38 @@ func (a *api) GetToken(w http.ResponseWriter, req *http.Request) {
w
.
WriteHeader
(
http
.
StatusUnauthorized
)
return
}
num
,
ok
:=
claims
[
"num"
]
.
(
float64
)
num
Float
,
ok
:=
claims
[
"num"
]
.
(
float64
)
if
!
ok
{
w
.
WriteHeader
(
http
.
StatusUnauthorized
)
return
}
role
,
ok
:=
claims
[
"role"
]
.
(
string
)
if
!
ok
{
w
.
WriteHeader
(
http
.
StatusUnauthorized
)
num
:=
int
(
numFloat
)
member
,
err
:=
a
.
db
.
GetMember
(
num
)
if
err
!=
nil
{
if
errors
.
Is
(
err
,
db
.
ErrorNotFound
)
{
w
.
WriteHeader
(
http
.
StatusUnauthorized
)
}
else
{
log
.
Printf
(
"Can't get the member %d: %v"
,
num
,
err
)
w
.
WriteHeader
(
http
.
StatusInternalServerError
)
}
return
}
role
:=
member
.
Role
w
.
Header
()
.
Set
(
"Content-Type"
,
"application/json"
)
w
.
WriteHeader
(
http
.
StatusOK
)
token
,
err
:=
a
.
newToken
(
int
(
num
),
role
,
true
)
_
,
expires
:=
claims
[
"exp"
]
newToken
,
err
:=
a
.
newToken
(
int
(
num
),
role
,
expires
)
if
err
!=
nil
{
log
.
Printf
(
"Can't create a token: %v"
,
err
)
w
.
WriteHeader
(
http
.
StatusInternalServerError
)
return
}
err
=
json
.
NewEncoder
(
w
)
.
Encode
(
map
[
string
]
interface
{}{
"token"
:
token
,
"token"
:
newToken
,
"role"
:
role
,
})
if
err
!=
nil
{
log
.
Printf
(
"Can't encode token: %v"
,
err
)
...
...
This diff is collapsed.
Click to expand it.
src/App.js
+
19
−
31
View file @
cef0b3c9
import
React
,
{
useEffect
,
useState
}
from
"
react
"
;
import
React
,
{
useEffect
}
from
"
react
"
;
import
{
useStorageItem
}
from
"
@capacitor-community/react-hooks/storage
"
;
import
Panel
from
"
./Panel
"
;
import
AuthContext
from
"
./AuthContext
"
;
...
...
@@ -9,27 +9,30 @@ function App() {
const
[
num
,
setNum
]
=
useStorageItem
(
"
num
"
);
const
[
role
,
setRole
]
=
useStorageItem
(
"
role
"
);
const
[
token
,
setToken
]
=
useStorageItem
(
"
token
"
);
const
[
timerID
,
setTimerID
]
=
useState
(
null
);
useEffect
(()
=>
{
if
(
!
timerID
)
{
startRenew
(
token
,
setToken
,
setTimerID
);
}
return
()
=>
stopRenew
(
timerID
);
},
[
token
,
setToken
,
timerID
,
setTimerID
]);
const
setTokenData
=
(
data
)
=>
{
setToken
(
data
.
token
);
setRole
(
data
.
role
);
};
const
timerID
=
window
.
setInterval
(
()
=>
renewToken
(
token
,
setTokenData
),
60000
// every minute
);
return
()
=>
window
.
clearInterval
(
timerID
);
},
[
token
,
setToken
,
setRole
]);
const
login
=
(
newToken
,
member
)
=>
{
setNum
(
member
.
num
);
setRole
(
member
.
role
);
setToken
(
newToken
);
startRenew
(
newToken
,
setToken
,
setTimerID
);
};
const
logout
=
()
=>
{
setNum
(
""
);
setRole
(
""
);
setToken
(
""
);
stopRenew
(
timerID
);
};
const
value
=
{
num
,
role
,
token
};
...
...
@@ -55,7 +58,11 @@ function getClaims(token) {
return
JSON
.
parse
(
jsonPayload
);
}
function
renewToken
(
oldToken
,
setToken
)
{
function
renewToken
(
oldToken
,
setTokenData
)
{
if
(
!
oldToken
)
{
return
;
}
fetch
(
url
(
"
/api/token
"
),
{
headers
:
{
"
x-authentication
"
:
oldToken
},
})
...
...
@@ -65,35 +72,16 @@ function renewToken(oldToken, setToken) {
}
return
response
.
json
();
})
.
then
((
data
)
=>
{
const
token
=
data
.
token
;
setToken
(
token
);
})
.
then
(
setTokenData
)
.
catch
((
error
)
=>
{
if
(
error
instanceof
ResponseError
&&
error
.
response
.
status
===
401
)
{
setToken
(
""
);
setToken
Data
({
token
:
""
,
role
:
""
}
);
}
else
{
console
.
log
(
"
Error renewing token:
"
+
error
.
message
);
}
});
}
function
startRenew
(
token
,
setToken
,
setTimerID
)
{
if
(
token
&&
getClaims
(
token
)[
"
exp
"
]
!==
undefined
)
{
const
timerID
=
setInterval
(
()
=>
renewToken
(
token
,
setToken
),
60000
// every minute
);
setTimerID
(
timerID
);
}
}
function
stopRenew
(
timerID
)
{
if
(
timerID
)
{
clearInterval
(
timerID
);
}
}
function
isLoggedIn
(
token
)
{
if
(
!
token
)
{
return
false
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment