Merge pull request #1150 from serlo/refactor-authorization

chore(authorization): Remove dependency of @serlo/api
serlo · Nov 30, 2023 · 8e417ea · 8e417ea
2 parents 5a678ef + d25d265
commit 8e417ea
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to this project will be documented in this file.
 
+## [v0.59.1](https://github.com/serlo/api.serlo.org/compare/v0.59.0..v0.59.1) - November 30, 2023
+
+### Internal
+
+- `@serlo/authorization`: Remove dependency of `@ſerlo/api`
+
 ## [v0.59.0](https://github.com/serlo/api.serlo.org/compare/v0.58.1..v0.59.0) - November 30, 2023
 
 ### Breaking Changes

diff --git a/lerna.json b/lerna.json
@@ -3,6 +3,6 @@
     "packages/*"
   ],
   "npmClient": "yarn",
-  "version": "0.59.0",
+  "version": "0.59.1",
   "$schema": "node_modules/lerna/schemas/lerna-schema.json"
 }
diff --git a/packages/authorization/package.json b/packages/authorization/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@serlo/authorization",
-  "version": "0.59.0",
+  "version": "0.59.1",
   "repository": "serlo/api.serlo.org",
   "license": "Apache-2.0",
   "author": "Serlo Education e.V.",
@@ -10,9 +10,6 @@
   "scripts": {
     "build": "tsdx build --tsconfig tsconfig.prod.json"
   },
-  "dependencies": {
-    "@serlo/api": "^0.59.0"
-  },
   "publishConfig": {
     "access": "public"
   }

diff --git a/packages/authorization/src/index.ts b/packages/authorization/src/index.ts
@@ -1,5 +1,3 @@
-import { Instance } from '@serlo/api'
-
 export enum Scope {
   Serlo = 'serlo.org',
   Serlo_De = 'serlo.org:de',
@@ -10,6 +8,15 @@ export enum Scope {
   Serlo_Ta = 'serlo.org:ta',
 }
 
+enum Instance {
+  De = 'de',
+  En = 'en',
+  Es = 'es',
+  Fr = 'fr',
+  Hi = 'hi',
+  Ta = 'ta',
+}
+
 export function formatScope(scope: string): Scope {
   if (scope === 'Serlo') return Scope.Serlo
   const scopeIdentifier = scope.split('_')[1].toLowerCase()

diff --git a/packages/server/package.json b/packages/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@serlo/api.serlo.org",
-  "version": "0.59.0",
+  "version": "0.59.1",
   "private": true,
   "repository": "serlo/api.serlo.org",
   "license": "Apache-2.0",
@@ -32,7 +32,7 @@
     "@nmshd/connector-sdk": "^2.2.4",
     "@ory/client": "^1.4.3",
     "@sentry/node": "^7.82.0",
-    "@serlo/authorization": "^0.59.0",
+    "@serlo/authorization": "^0.59.1",
     "@types/basic-auth": "^1.1.6",
     "@types/bull-arena": "^3.0.10",
     "@types/graphql-modules": "^0.59.0",

diff --git a/scripts/changelog.ts b/scripts/changelog.ts
@@ -1645,6 +1645,11 @@ async function exec(): Promise<void> {
           'Use esbuild for the docker container',
         ],
       },
+      {
+        tagName: 'v0.59.1',
+        date: '2023-11-30',
+        internal: ['`@serlo/authorization`: Remove dependency of `@ſerlo/api`'],
+      },
     ],
   })
 

diff --git a/yarn.lock b/yarn.lock
@@ -4096,7 +4096,7 @@ __metadata:
     "@nmshd/connector-sdk": ^2.2.4
     "@ory/client": ^1.4.3
     "@sentry/node": ^7.82.0
-    "@serlo/authorization": ^0.59.0
+    "@serlo/authorization": ^0.59.1
     "@types/basic-auth": ^1.1.6
     "@types/bull-arena": ^3.0.10
     "@types/graphql-modules": ^0.59.0
@@ -4138,7 +4138,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@serlo/api@^0.59.0, @serlo/api@workspace:packages/types":
+"@serlo/api@workspace:packages/types":
   version: 0.0.0-use.local
   resolution: "@serlo/api@workspace:packages/types"
   dependencies:
@@ -4149,11 +4149,9 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@serlo/authorization@^0.59.0, @serlo/authorization@workspace:packages/authorization":
+"@serlo/authorization@^0.59.1, @serlo/authorization@workspace:packages/authorization":
   version: 0.0.0-use.local
   resolution: "@serlo/authorization@workspace:packages/authorization"
-  dependencies:
-    "@serlo/api": ^0.59.0
   languageName: unknown
   linkType: soft