diff --git a/models/auth/token_scope.go b/models/auth/token_scope.go
index 790b10d1e3..ef939cba43 100644
--- a/models/auth/token_scope.go
+++ b/models/auth/token_scope.go
@@ -91,6 +91,33 @@ func (s AccessTokenScope) Parse() (AccessTokenScopeBitmap, error) {
 			return 0, fmt.Errorf("invalid access token scope: %s", v)
 		}
 		bitmap |= 1 << uint(idx)
+
+		// take care of child scopes
+		switch v {
+		case AccessTokenScopeRepo:
+			bitmap |= 1 << uint(sliceIndex(AllAccessTokenScopes, AccessTokenScopeRepoStatus))
+			bitmap |= 1 << uint(sliceIndex(AllAccessTokenScopes, AccessTokenScopePublicRepo))
+		case AccessTokenScopeAdminOrg:
+			bitmap |= 1 << uint(sliceIndex(AllAccessTokenScopes, AccessTokenScopeWriteOrg))
+			bitmap |= 1 << uint(sliceIndex(AllAccessTokenScopes, AccessTokenScopeReadOrg))
+		case AccessTokenScopeAdminPublicKey:
+			bitmap |= 1 << uint(sliceIndex(AllAccessTokenScopes, AccessTokenScopeWritePublicKey))
+			bitmap |= 1 << uint(sliceIndex(AllAccessTokenScopes, AccessTokenScopeReadPublicKey))
+		case AccessTokenScopeAdminRepoHook:
+			bitmap |= 1 << uint(sliceIndex(AllAccessTokenScopes, AccessTokenScopeWriteRepoHook))
+			bitmap |= 1 << uint(sliceIndex(AllAccessTokenScopes, AccessTokenScopeReadRepoHook))
+		case AccessTokenScopeUser:
+			bitmap |= 1 << uint(sliceIndex(AllAccessTokenScopes, AccessTokenScopeReadUser))
+			bitmap |= 1 << uint(sliceIndex(AllAccessTokenScopes, AccessTokenScopeUserEmail))
+			bitmap |= 1 << uint(sliceIndex(AllAccessTokenScopes, AccessTokenScopeUserFollow))
+		case AccessTokenScopePackage:
+			bitmap |= 1 << uint(sliceIndex(AllAccessTokenScopes, AccessTokenScopeWritePackage))
+			bitmap |= 1 << uint(sliceIndex(AllAccessTokenScopes, AccessTokenScopeReadPackage))
+			bitmap |= 1 << uint(sliceIndex(AllAccessTokenScopes, AccessTokenScopeDeletePackage))
+		case AccessTokenScopeAdminGPGKey:
+			bitmap |= 1 << uint(sliceIndex(AllAccessTokenScopes, AccessTokenScopeWriteGPGKey))
+			bitmap |= 1 << uint(sliceIndex(AllAccessTokenScopes, AccessTokenScopeReadGPGKey))
+		}
 	}
 	return bitmap, nil
 }
@@ -105,6 +132,21 @@ func (s AccessTokenScope) Normalize() (AccessTokenScope, error) {
 	return bitmap.ToScope(), nil
 }
 
+// HasScope returns true if the string has the given scope
+func (s AccessTokenScope) HasScope(scope string) (bool, error) {
+	index := sliceIndex(AllAccessTokenScopes, scope)
+	if index == -1 {
+		return false, fmt.Errorf("invalid access token scope: %s", scope)
+	}
+
+	bitmap, err := s.Parse()
+	if err != nil {
+		return false, err
+	}
+
+	return bitmap&(1<<uint(index)) != 0, nil
+}
+
 // ToScope returns a normalized scope string without any duplicates.
 func (bitmap AccessTokenScopeBitmap) ToScope() AccessTokenScope {
 	var scopes []string
@@ -159,6 +201,7 @@ func (bitmap AccessTokenScopeBitmap) ToScope() AccessTokenScope {
 	return scope
 }
 
+// sliceIndex returns the index of the first instance of str in slice, or -1 if str is not present in slice.
 func sliceIndex(slice []string, element string) int {
 	for i, v := range slice {
 		if v == element {
diff --git a/models/auth/token_scope_test.go b/models/auth/token_scope_test.go
index a42347a184..80cf7d9145 100644
--- a/models/auth/token_scope_test.go
+++ b/models/auth/token_scope_test.go
@@ -46,3 +46,33 @@ func TestAccessTokenScope_Normalize(t *testing.T) {
 		})
 	}
 }
+
+func TestAccessTokenScope__HasScope(t *testing.T) {
+	tests := []struct {
+		in    AccessTokenScope
+		scope string
+		out   bool
+		err   error
+	}{
+		{"repo", "repo", true, nil},
+		{"repo", "repo:status", true, nil},
+		{"repo", "public_repo", true, nil},
+		{"repo", "admin:org", false, nil},
+		{"repo", "admin:public_key", false, nil},
+		{"repo:status", "repo", false, nil},
+		{"repo:status", "public_repo", false, nil},
+		{"admin:org", "write:org", true, nil},
+		{"admin:org", "read:org", true, nil},
+		{"admin:org", "admin:org", true, nil},
+		{"user", "read:user", true, nil},
+		{"package", "write:package", true, nil},
+	}
+
+	for _, test := range tests {
+		t.Run(string(test.in), func(t *testing.T) {
+			scope, err := test.in.HasScope(test.scope)
+			assert.Equal(t, test.out, scope)
+			assert.Equal(t, test.err, err)
+		})
+	}
+}