myslozbrodnia

.github/workflows/docker-image.yml

@@ -0,0 +1,72 @@
+name: Create and publish Docker images
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
+
+jobs:
+  build-and-push-image:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Log in to the Container registry
+        uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@f2a1d5e99d037542a71f64918e516c093c6f3fc4
+        with:
+          context: .
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+
+  build-and-push-postgres-hstore:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Log in to the Container registry
+        uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract metadata (tags, labels) for Docker (Postgres-hstore)
+        id: postgres-meta
+        uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/postgres-hstore
+
+      - name: Build and push Docker image (Postgres-hstore)
+        uses: docker/build-push-action@f2a1d5e99d037542a71f64918e516c093c6f3fc4
+        with:
+          context: postgres-hstore  # Change the context to the postgres-hstore directory
+          push: true
+          tags: ${{ steps.postgres-meta.outputs.tags }}
+          labels: ${{ steps.postgres-meta.outputs.labels }}

auth/backend.py

@@ -7,8 +7,8 @@ class HSWawOAuth2(BaseOAuth2):
 
     name = "hswaw"
     ID_KEY = "username"
-    AUTHORIZATION_URL = "https://sso.hackerspace.pl/oauth/authorize"
-    ACCESS_TOKEN_URL = "https://sso.hackerspace.pl/oauth/token"
+    AUTHORIZATION_URL = "https://auth.apps.hskrk.pl/application/o/authorize"
+    ACCESS_TOKEN_URL = "https://auth.apps.hskrk.pl/application/o/token"
     DEFAULT_SCOPE = ["profile:read"]
     REDIRECT_STATE = False
     SCOPE_SEPARATOR = ","
@@ -28,10 +28,9 @@ def get_user_details(self, response):
 
     def user_data(self, access_token, *args, **kwargs):
         """Loads user data from service"""
-        url = "https://sso.hackerspace.pl/api/1/profile"
+        url = "https://auth.apps.hskrk.pl/application/o/userinfo"
         headers = {"Authorization": "Bearer {}".format(access_token)}
         return self.get_json(url, headers=headers)
-
     def auth_url(self):
         """Return redirect url"""
         state = self.get_or_create_state()