@pgpm/jwt-claims 0.14.0 → 0.15.0

package/Makefile

@@ -1,5 +1,5 @@
-EXTENSION = launchql-jwt-claims
-DATA = sql/launchql-jwt-claims--0.9.0.sql
+EXTENSION = pgpm-jwt-claims
+DATA = sql/pgpm-jwt-claims--0.14.0.sql
 
 PG_CONFIG = pg_config
 PGXS := $(shell $(PG_CONFIG) --pgxs)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pgpm/jwt-claims",
-  "version": "0.14.0",
+  "version": "0.15.0",
   "description": "JWT claim handling and validation functions",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "contributors": [
@@ -24,8 +24,8 @@
     "pgpm": "^1.0.0"
   },
   "dependencies": {
-    "@pgpm/types": "0.14.0",
-    "@pgpm/verify": "0.14.0"
+    "@pgpm/types": "0.15.0",
+    "@pgpm/verify": "0.15.0"
   },
   "repository": {
     "type": "git",
@@ -35,5 +35,5 @@
   "bugs": {
     "url": "https://github.com/constructive-io/pgpm-modules/issues"
   },
-  "gitHead": "7369638ab084da95b0cb00ec63ad236637f6ebe5"
+  "gitHead": "118ac6f810720378fa954e9620abf2516293c148"
 }

package/pgpm-jwt-claims.control

@@ -0,0 +1,8 @@
+# pgpm-jwt-claims extension
+comment = 'pgpm-jwt-claims extension'
+default_version = '0.14.0'
+module_pathname = '$libdir/pgpm-jwt-claims'
+requires = 'plpgsql,uuid-ossp,pgpm-types,pgpm-verify'
+relocatable = false
+superuser = false
+  

package/pgpm.plan

@@ -1,6 +1,6 @@
 %syntax-version=1.0.0
-%project=launchql-jwt-claims
-%uri=launchql-jwt-claims
+%project=pgpm-jwt-claims
+%uri=pgpm-jwt-claims
   
 schemas/ctx/schema 2017-08-11T08:11:51Z skitch <skitch@5b0c196eeb62> # add schemas/ctx/schema
 schemas/ctx/procedures/ip_address [schemas/ctx/schema] 2017-08-11T08:11:51Z skitch <skitch@5b0c196eeb62> # add schemas/ctx/procedures/ip_address

package/sql/{launchql-jwt-claims--0.9.0.sql → pgpm-jwt-claims--0.14.0.sql}

@@ -1,4 +1,4 @@
-\echo Use "CREATE EXTENSION launchql-jwt-claims" to load this file. \quit
+\echo Use "CREATE EXTENSION pgpm-jwt-claims" to load this file. \quit
 CREATE SCHEMA ctx;
 
 GRANT USAGE ON SCHEMA ctx TO authenticated, anonymous;
@@ -6,20 +6,6 @@ GRANT USAGE ON SCHEMA ctx TO authenticated, anonymous;
 ALTER DEFAULT PRIVILEGES IN SCHEMA ctx
   GRANT EXECUTE ON FUNCTIONS TO authenticated;
 
-CREATE SCHEMA jwt_public;
-
-GRANT USAGE ON SCHEMA jwt_public TO authenticated, anonymous;
-
-ALTER DEFAULT PRIVILEGES IN SCHEMA jwt_public
-  GRANT EXECUTE ON FUNCTIONS TO authenticated;
-
-CREATE SCHEMA jwt_private;
-
-GRANT USAGE ON SCHEMA jwt_private TO authenticated, anonymous;
-
-ALTER DEFAULT PRIVILEGES IN SCHEMA jwt_private
-  GRANT EXECUTE ON FUNCTIONS TO authenticated;
-
 CREATE FUNCTION ctx.ip_address() RETURNS inet AS $EOFCODE$
   SELECT nullif(current_setting('jwt.claims.ip_address', true), '')::inet;
 $EOFCODE$ LANGUAGE sql STABLE;
@@ -36,7 +22,7 @@ CREATE FUNCTION ctx.user_id() RETURNS uuid AS $EOFCODE$
   SELECT nullif(current_setting('jwt.claims.user_id', true), '')::uuid;
 $EOFCODE$ LANGUAGE sql STABLE;
 
-DO $LQLMIGRATION$
+DO $EOFCODE$
   DECLARE
   BEGIN
     EXECUTE format('CREATE FUNCTION ctx.security_definer() returns text as $FUNC$
@@ -48,11 +34,19 @@ LANGUAGE ''sql'';', current_user);
 $FUNC$
 LANGUAGE ''sql'';', current_user);
   END;
-$LQLMIGRATION$;
+$EOFCODE$;
 
 GRANT EXECUTE ON FUNCTION ctx.security_definer() TO PUBLIC;
+
 GRANT EXECUTE ON FUNCTION ctx.is_security_definer() TO PUBLIC;
 
+CREATE SCHEMA jwt_public;
+
+GRANT USAGE ON SCHEMA jwt_public TO authenticated, anonymous;
+
+ALTER DEFAULT PRIVILEGES IN SCHEMA jwt_public
+  GRANT EXECUTE ON FUNCTIONS TO authenticated;
+
 CREATE FUNCTION jwt_public.current_user_id() RETURNS uuid AS $EOFCODE$
 DECLARE
   v_identifier_id uuid;
@@ -93,10 +87,6 @@ BEGIN
 END;
 $EOFCODE$ LANGUAGE plpgsql STABLE;
 
-CREATE FUNCTION jwt_public.current_origin() RETURNS origin AS $EOFCODE$
-  SELECT nullif(current_setting('jwt.claims.origin', TRUE), '')::origin;
-$EOFCODE$ LANGUAGE sql STABLE;
-
 CREATE FUNCTION jwt_public.current_user_agent() RETURNS text AS $EOFCODE$
 DECLARE
   v_uagent text;
@@ -117,46 +107,57 @@ BEGIN
 END;
 $EOFCODE$ LANGUAGE plpgsql STABLE;
 
-CREATE FUNCTION jwt_private.current_database_id() RETURNS uuid AS $EOFCODE$
+CREATE FUNCTION jwt_public.current_origin() RETURNS origin AS $EOFCODE$
+  SELECT nullif(current_setting('jwt.claims.origin', true), '')::origin;
+$EOFCODE$ LANGUAGE sql STABLE;
+
+CREATE FUNCTION jwt_public.current_group_ids() RETURNS uuid[] AS $EOFCODE$
 DECLARE
-  v_identifier_id uuid;
+  v_identifier_ids uuid[];
 BEGIN
-  IF current_setting('jwt.claims.database_id', TRUE)
+  IF current_setting('jwt.claims.group_ids', TRUE)
     IS NOT NULL THEN
     BEGIN
-      v_identifier_id = current_setting('jwt.claims.database_id', TRUE)::uuid;
+      v_identifier_ids = current_setting('jwt.claims.group_ids', TRUE)::uuid[];
     EXCEPTION
       WHEN OTHERS THEN
       RAISE NOTICE 'Invalid UUID value';
-    RETURN NULL;
+    RETURN ARRAY[]::uuid[];
     END;
-    RETURN v_identifier_id;
+    RETURN v_identifier_ids;
   ELSE
-    RETURN NULL;
+    RETURN ARRAY[]::uuid[];
   END IF;
 END;
 $EOFCODE$ LANGUAGE plpgsql STABLE;
 
-CREATE FUNCTION jwt_private.current_token_id() RETURNS uuid AS $EOFCODE$
-  SELECT nullif(current_setting('jwt.claims.token_id', TRUE), '')::uuid;
-$EOFCODE$ LANGUAGE sql STABLE;
+CREATE SCHEMA jwt_private;
 
-CREATE FUNCTION jwt_public.current_group_ids() RETURNS uuid[] AS $EOFCODE$
+GRANT USAGE ON SCHEMA jwt_private TO authenticated, anonymous;
+
+ALTER DEFAULT PRIVILEGES IN SCHEMA jwt_private
+  GRANT EXECUTE ON FUNCTIONS TO authenticated;
+
+CREATE FUNCTION jwt_private.current_database_id() RETURNS uuid AS $EOFCODE$
 DECLARE
-  v_identifier_ids uuid[];
+  v_identifier_id uuid;
 BEGIN
-  IF current_setting('jwt.claims.group_ids', TRUE)
+  IF current_setting('jwt.claims.database_id', TRUE)
     IS NOT NULL THEN
     BEGIN
-      v_identifier_ids = current_setting('jwt.claims.group_ids', TRUE)::uuid[];
+      v_identifier_id = current_setting('jwt.claims.database_id', TRUE)::uuid;
     EXCEPTION
       WHEN OTHERS THEN
       RAISE NOTICE 'Invalid UUID value';
-    RETURN ARRAY[]::uuid[];
+    RETURN NULL;
     END;
-    RETURN v_identifier_ids;
+    RETURN v_identifier_id;
   ELSE
-    RETURN ARRAY[]::uuid[];
+    RETURN NULL;
   END IF;
 END;
 $EOFCODE$ LANGUAGE plpgsql STABLE;
+
+CREATE FUNCTION jwt_private.current_token_id() RETURNS uuid AS $EOFCODE$
+  SELECT nullif(current_setting('jwt.claims.token_id', true), '')::uuid;
+$EOFCODE$ LANGUAGE sql STABLE;

package/launchql-jwt-claims.control

@@ -1,8 +0,0 @@
-# launchql-jwt-claims extension
-comment = 'launchql-jwt-claims extension'
-default_version = '0.9.0'
-module_pathname = '$libdir/launchql-jwt-claims'
-requires = 'plpgsql,uuid-ossp,launchql-types,launchql-verify'
-relocatable = false
-superuser = false
-