Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove accessToken from authentication #113

Merged
merged 5 commits into from
Nov 25, 2024
Merged

Remove accessToken from authentication #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fede6ce
Update to Java 21
wjglerum Oct 7, 2024
ae60c30
Update sbt to 1.10.3 (#108)
lunatech-scala-steward[bot] Oct 21, 2024
8b84a9b
Update sbt to 1.10.4 (#109)
lunatech-scala-steward[bot] Oct 29, 2024
ecb9aa4
Update sbt to 1.10.5 (#110)
lunatech-scala-steward[bot] Nov 4, 2024
126b7fa
Remove accessToken from authentication (#111) (#112)
vanny96 Nov 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 10 additions & 12 deletions .github/workflows/scala.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,15 @@ on:

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- name: Set up JDK 11
uses: actions/setup-java@v4
with:
java-version: '11'
distribution: 'adopt'
- name: Run tests
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: sbt test
- uses: actions/checkout@v4
- name: Set up JDK
uses: actions/setup-java@v4
with:
java-version: '21'
distribution: 'temurin'
- name: Run tests
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: sbt test
3 changes: 1 addition & 2 deletions app/controllers/HomeController.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ class HomeController @Inject()(
cache: SyncCacheApi
) extends AbstractController(cc) {

private val accessToken = configuration.get[String]("accessToken")
private val organization = configuration.get[String]("githubOrganisation")
private val repository = configuration.get[String]("githubRepository")
private val branch = configuration.get[String]("githubBranch")
Expand Down Expand Up @@ -123,7 +122,7 @@ class HomeController @Inject()(
} else {
cache.get(post.authorName) match {
case None =>
val getUser = Github(Option(accessToken)).users.get(post.authorName).execFuture[HttpResponse[String]]()
val getUser = Github().users.get(post.authorName).execFuture[HttpResponse[String]]()
getUser.map {
case Left(_) => Ok(views.html.post(post))
case Right(re) =>
Expand Down
5 changes: 2 additions & 3 deletions app/modules/ApplicationStart.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,11 @@ class ApplicationStart @Inject()(
cache: SyncCacheApi
) {

private val accessToken = configuration.get[String]("accessToken")
private val organization = configuration.get[String]("githubOrganisation")
private val repository = configuration.get[String]("githubRepository")
private val branch = configuration.get[String]("githubBranch")

private def getContents = Github(Option(accessToken)).repos.getContents(organization, repository, "posts", Option(branch)).execFuture[HttpResponse[String]]()
private def getContents = Github().repos.getContents(organization, repository, "posts", Option(branch)).execFuture[HttpResponse[String]]()

{
// Parse all and put into cache
Expand Down Expand Up @@ -108,7 +107,7 @@ class ApplicationStart @Inject()(
val authorName = post.authorName
cache.get(authorName) match {
case None =>
val getUser = Github(Option(accessToken)).users.get(authorName).execFuture[HttpResponse[String]]()
val getUser = Github().users.get(authorName).execFuture[HttpResponse[String]]()
val postWithAuthor = getUser.map {
case Left(_) => p
case Right(rUser) =>
Expand Down
1 change: 0 additions & 1 deletion conf/application.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# https://www.playframework.com/documentation/latest/Configuration

# Github configuration
accessToken = ${?access_token}
githubOrganisation = lunatech-labs
githubOrganisation = ${?github_organisation}
githubRepository = lunatech-blog
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.10.2
sbt.version=1.10.5